* [PATCH 1/2] kernel: cobalt: Fix up elf_hwcap
@ 2021-01-27 5:43 Greg Gallagher
2021-01-27 5:43 ` [PATCH 2/2] kernel: cobalt: Remove header file for newer kernels Greg Gallagher
2021-01-27 6:13 ` [PATCH 1/2] kernel: cobalt: Fix up elf_hwcap Jan Kiszka
0 siblings, 2 replies; 8+ messages in thread
From: Greg Gallagher @ 2021-01-27 5:43 UTC (permalink / raw)
To: xenomai
Update elf_hwcap to ELF_HWCAP, this will work for newer 5.4 kernels
Signen-off-by: Greg Gallagher <greg@embeddedgreg.com>
---
kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
index b7e3f52f2..291c9e5f0 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
@@ -23,7 +23,7 @@
#include <asm/xenomai/uapi/fptest.h>
#include <asm/hwcap.h>
-#define have_fp (elf_hwcap & HWCAP_FP)
+#define have_fp (ELF_HWCAP & HWCAP_FP)
static inline int fp_kernel_supported(void)
{
--
2.25.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/2] kernel: cobalt: Remove header file for newer kernels
2021-01-27 5:43 [PATCH 1/2] kernel: cobalt: Fix up elf_hwcap Greg Gallagher
@ 2021-01-27 5:43 ` Greg Gallagher
2021-01-27 6:14 ` Jan Kiszka
2021-01-27 6:13 ` [PATCH 1/2] kernel: cobalt: Fix up elf_hwcap Jan Kiszka
1 sibling, 1 reply; 8+ messages in thread
From: Greg Gallagher @ 2021-01-27 5:43 UTC (permalink / raw)
To: xenomai
5.4 kernels do not have compiler.h, only include this header file for kernels older then 5.4
Signed-off-by: Greg Gallagher <greg@embeddedgreg.com>
---
kernel/cobalt/arch/arm64/include/asm/xenomai/machine.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/machine.h b/kernel/cobalt/arch/arm64/include/asm/xenomai/machine.h
index 7444cc823..17be10339 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/machine.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/machine.h
@@ -29,7 +29,11 @@
#define XNARCH_HOST_TICK_IRQ __ipipe_hrtimer_irq
#include <asm/barrier.h>
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0)
#include <asm/compiler.h>
+#endif
+
#include <asm/cmpxchg.h>
#include <asm/switch_to.h>
#include <asm/system_misc.h>
--
2.25.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] kernel: cobalt: Remove header file for newer kernels
2021-01-27 5:43 ` [PATCH 2/2] kernel: cobalt: Remove header file for newer kernels Greg Gallagher
@ 2021-01-27 6:14 ` Jan Kiszka
2021-01-27 14:26 ` Greg Gallagher
0 siblings, 1 reply; 8+ messages in thread
From: Jan Kiszka @ 2021-01-27 6:14 UTC (permalink / raw)
To: Greg Gallagher, xenomai
On 27.01.21 06:43, Greg Gallagher via Xenomai wrote:
> 5.4 kernels do not have compiler.h, only include this header file for kernels older then 5.4
>
> Signed-off-by: Greg Gallagher <greg@embeddedgreg.com>
> ---
> kernel/cobalt/arch/arm64/include/asm/xenomai/machine.h | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/machine.h b/kernel/cobalt/arch/arm64/include/asm/xenomai/machine.h
> index 7444cc823..17be10339 100644
> --- a/kernel/cobalt/arch/arm64/include/asm/xenomai/machine.h
> +++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/machine.h
> @@ -29,7 +29,11 @@
> #define XNARCH_HOST_TICK_IRQ __ipipe_hrtimer_irq
>
> #include <asm/barrier.h>
> +
> +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0)
> #include <asm/compiler.h>
> +#endif
> +
> #include <asm/cmpxchg.h>
> #include <asm/switch_to.h>
> #include <asm/system_misc.h>
>
How about fixing arm as well at this chance? Same pattern.
Jan
--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] kernel: cobalt: Remove header file for newer kernels
2021-01-27 6:14 ` Jan Kiszka
@ 2021-01-27 14:26 ` Greg Gallagher
0 siblings, 0 replies; 8+ messages in thread
From: Greg Gallagher @ 2021-01-27 14:26 UTC (permalink / raw)
To: Jan Kiszka; +Cc: Xenomai@xenomai.org
On Wed, Jan 27, 2021 at 1:14 AM Jan Kiszka <jan.kiszka@siemens.com> wrote:
> On 27.01.21 06:43, Greg Gallagher via Xenomai wrote:
> > 5.4 kernels do not have compiler.h, only include this header file for
> kernels older then 5.4
> >
> > Signed-off-by: Greg Gallagher <greg@embeddedgreg.com>
> > ---
> > kernel/cobalt/arch/arm64/include/asm/xenomai/machine.h | 4 ++++
> > 1 file changed, 4 insertions(+)
> >
> > diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/machine.h
> b/kernel/cobalt/arch/arm64/include/asm/xenomai/machine.h
> > index 7444cc823..17be10339 100644
> > --- a/kernel/cobalt/arch/arm64/include/asm/xenomai/machine.h
> > +++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/machine.h
> > @@ -29,7 +29,11 @@
> > #define XNARCH_HOST_TICK_IRQ __ipipe_hrtimer_irq
> >
> > #include <asm/barrier.h>
> > +
> > +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0)
> > #include <asm/compiler.h>
> > +#endif
> > +
> > #include <asm/cmpxchg.h>
> > #include <asm/switch_to.h>
> > #include <asm/system_misc.h>
> >
>
> How about fixing arm as well at this chance? Same pattern.
>
> Jan
>
> --
> Siemens AG, T RDA IOT
> Corporate Competence Center Embedded Linux
>
ACK, will send up another patch shortly.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] kernel: cobalt: Fix up elf_hwcap
2021-01-27 5:43 [PATCH 1/2] kernel: cobalt: Fix up elf_hwcap Greg Gallagher
2021-01-27 5:43 ` [PATCH 2/2] kernel: cobalt: Remove header file for newer kernels Greg Gallagher
@ 2021-01-27 6:13 ` Jan Kiszka
2021-01-27 6:15 ` Jan Kiszka
1 sibling, 1 reply; 8+ messages in thread
From: Jan Kiszka @ 2021-01-27 6:13 UTC (permalink / raw)
To: Greg Gallagher, xenomai
On 27.01.21 06:43, Greg Gallagher via Xenomai wrote:
> Update elf_hwcap to ELF_HWCAP, this will work for newer 5.4 kernels
>
I assume you mean "also work" - or does it break on certain older
kernels? Just asking before consulting our CI. ;)
> Signen-off-by: Greg Gallagher <greg@embeddedgreg.com>
> ---
> kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
> index b7e3f52f2..291c9e5f0 100644
> --- a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
> +++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
> @@ -23,7 +23,7 @@
> #include <asm/xenomai/uapi/fptest.h>
> #include <asm/hwcap.h>
>
> -#define have_fp (elf_hwcap & HWCAP_FP)
> +#define have_fp (ELF_HWCAP & HWCAP_FP)
>
> static inline int fp_kernel_supported(void)
> {
>
Jan
--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 1/2] kernel: cobalt: Fix up elf_hwcap
2021-01-27 6:13 ` [PATCH 1/2] kernel: cobalt: Fix up elf_hwcap Jan Kiszka
@ 2021-01-27 6:15 ` Jan Kiszka
2021-01-27 14:26 ` Greg Gallagher
0 siblings, 1 reply; 8+ messages in thread
From: Jan Kiszka @ 2021-01-27 6:15 UTC (permalink / raw)
To: Greg Gallagher, xenomai
On 27.01.21 07:13, Jan Kiszka via Xenomai wrote:
> On 27.01.21 06:43, Greg Gallagher via Xenomai wrote:
>> Update elf_hwcap to ELF_HWCAP, this will work for newer 5.4 kernels
>>
>
> I assume you mean "also work" - or does it break on certain older
> kernels? Just asking before consulting our CI. ;)
>
...and the same pattern exists on ARM.
Jan
>> Signen-off-by: Greg Gallagher <greg@embeddedgreg.com>
>> ---
>> kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
>> index b7e3f52f2..291c9e5f0 100644
>> --- a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
>> +++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
>> @@ -23,7 +23,7 @@
>> #include <asm/xenomai/uapi/fptest.h>
>> #include <asm/hwcap.h>
>>
>> -#define have_fp (elf_hwcap & HWCAP_FP)
>> +#define have_fp (ELF_HWCAP & HWCAP_FP)
>>
>> static inline int fp_kernel_supported(void)
>> {
>>
>
> Jan
>
--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 1/2] kernel: cobalt: Fix up elf_hwcap
2021-01-27 6:15 ` Jan Kiszka
@ 2021-01-27 14:26 ` Greg Gallagher
2021-02-01 19:15 ` Greg Gallagher
0 siblings, 1 reply; 8+ messages in thread
From: Greg Gallagher @ 2021-01-27 14:26 UTC (permalink / raw)
To: Jan Kiszka; +Cc: Xenomai@xenomai.org
On Wed, Jan 27, 2021 at 1:15 AM Jan Kiszka <jan.kiszka@siemens.com> wrote:
> On 27.01.21 07:13, Jan Kiszka via Xenomai wrote:
> > On 27.01.21 06:43, Greg Gallagher via Xenomai wrote:
> >> Update elf_hwcap to ELF_HWCAP, this will work for newer 5.4 kernels
> >>
> >
> > I assume you mean "also work" - or does it break on certain older
> > kernels? Just asking before consulting our CI. ;)
> >
>
> ...and the same pattern exists on ARM.
>
> Jan
>
> >> Signen-off-by: Greg Gallagher <greg@embeddedgreg.com>
> >> ---
> >> kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h | 2 +-
> >> 1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
> b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
> >> index b7e3f52f2..291c9e5f0 100644
> >> --- a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
> >> +++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
> >> @@ -23,7 +23,7 @@
> >> #include <asm/xenomai/uapi/fptest.h>
> >> #include <asm/hwcap.h>
> >>
> >> -#define have_fp (elf_hwcap & HWCAP_FP)
> >> +#define have_fp (ELF_HWCAP & HWCAP_FP)
> >>
> >> static inline int fp_kernel_supported(void)
> >> {
> >>
> >
> > Jan
> >
>
> --
> Siemens AG, T RDA IOT
> Corporate Competence Center Embedded Linux
>
No problem, ACK. I'll put a more meaningful commit message as well. I
thought I changed that before I sent the patch.
-Greg
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 1/2] kernel: cobalt: Fix up elf_hwcap
2021-01-27 14:26 ` Greg Gallagher
@ 2021-02-01 19:15 ` Greg Gallagher
0 siblings, 0 replies; 8+ messages in thread
From: Greg Gallagher @ 2021-02-01 19:15 UTC (permalink / raw)
To: Jan Kiszka; +Cc: Xenomai@xenomai.org
On Wed, Jan 27, 2021 at 9:26 AM Greg Gallagher <greg@embeddedgreg.com>
wrote:
>
>
> On Wed, Jan 27, 2021 at 1:15 AM Jan Kiszka <jan.kiszka@siemens.com> wrote:
>
>> On 27.01.21 07:13, Jan Kiszka via Xenomai wrote:
>> > On 27.01.21 06:43, Greg Gallagher via Xenomai wrote:
>> >> Update elf_hwcap to ELF_HWCAP, this will work for newer 5.4 kernels
>> >>
>> >
>> > I assume you mean "also work" - or does it break on certain older
>> > kernels? Just asking before consulting our CI. ;)
>> >
>>
>> ...and the same pattern exists on ARM.
>>
>> Jan
>>
>> >> Signen-off-by: Greg Gallagher <greg@embeddedgreg.com>
>> >> ---
>> >> kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h | 2 +-
>> >> 1 file changed, 1 insertion(+), 1 deletion(-)
>> >>
>> >> diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
>> b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
>> >> index b7e3f52f2..291c9e5f0 100644
>> >> --- a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
>> >> +++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
>> >> @@ -23,7 +23,7 @@
>> >> #include <asm/xenomai/uapi/fptest.h>
>> >> #include <asm/hwcap.h>
>> >>
>> >> -#define have_fp (elf_hwcap & HWCAP_FP)
>> >> +#define have_fp (ELF_HWCAP & HWCAP_FP)
>> >>
>> >> static inline int fp_kernel_supported(void)
>> >> {
>> >>
>> >
>> > Jan
>> >
>>
>> --
>> Siemens AG, T RDA IOT
>> Corporate Competence Center Embedded Linux
>>
>
> No problem, ACK. I'll put a more meaningful commit message as well. I
> thought I changed that before I sent the patch.
>
> -Greg
>
These don't need to be updated on the arm (aarch32) side of things. I have
that port running now and should have testing done this evening. I will
update this patch with a better commit message.
-Greg
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-02-01 19:15 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-27 5:43 [PATCH 1/2] kernel: cobalt: Fix up elf_hwcap Greg Gallagher
2021-01-27 5:43 ` [PATCH 2/2] kernel: cobalt: Remove header file for newer kernels Greg Gallagher
2021-01-27 6:14 ` Jan Kiszka
2021-01-27 14:26 ` Greg Gallagher
2021-01-27 6:13 ` [PATCH 1/2] kernel: cobalt: Fix up elf_hwcap Jan Kiszka
2021-01-27 6:15 ` Jan Kiszka
2021-01-27 14:26 ` Greg Gallagher
2021-02-01 19:15 ` Greg Gallagher
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.