[PATCH v2 1/2] kernel: cobalt: Remove header file for newer kernels

[PATCH v2 1/2] kernel: cobalt: Remove header file for newer kernels

[Greg Gallagher]

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

[PATCH v2 2/2] kernel: cobalt: Fix up elf_hwcap

[Greg Gallagher]

Update to use ELF_HWCAP instead of elf_hwcap directly.

Signen-off-by: Greg Gallagher <greg@embeddedgreg.com>
---
 kernel/cobalt/arch/arm/include/asm/xenomai/fptest.h   | 2 +-
 kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/cobalt/arch/arm/include/asm/xenomai/fptest.h b/kernel/cobalt/arch/arm/include/asm/xenomai/fptest.h
index a76f1e6bb..b8c627bed 100644
--- a/kernel/cobalt/arch/arm/include/asm/xenomai/fptest.h
+++ b/kernel/cobalt/arch/arm/include/asm/xenomai/fptest.h
@@ -23,7 +23,7 @@
 #include <asm/hwcap.h>
 
 #ifdef CONFIG_VFP
-#define have_vfp (elf_hwcap & HWCAP_VFP)
+#define have_vfp (ELF_HWCAP & HWCAP_VFP)
 #else /* !CONFIG_VFP */
 #define have_vfp 0
 #endif /* !CONFIG_VFP */
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

Re: [PATCH v2 1/2] kernel: cobalt: Remove header file for newer kernels

[Jan Kiszka]

On 03.02.21 08:01, 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>
> 

There is still arch/arm64/include/asm/compiler.h in today's master.

What error exactly are you fixing? That we should rather including
linux/compiler.h? Or is that header obsolete for us now, for all kernels?

Jan

-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux

Re: [PATCH v2 2/2] kernel: cobalt: Fix up elf_hwcap

[Jan Kiszka]

On 03.02.21 08:01, Greg Gallagher via Xenomai wrote:
> Update to use ELF_HWCAP instead of elf_hwcap directly.
> 
> Signen-off-by: Greg Gallagher <greg@embeddedgreg.com>
> ---
>  kernel/cobalt/arch/arm/include/asm/xenomai/fptest.h   | 2 +-
>  kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/kernel/cobalt/arch/arm/include/asm/xenomai/fptest.h b/kernel/cobalt/arch/arm/include/asm/xenomai/fptest.h
> index a76f1e6bb..b8c627bed 100644
> --- a/kernel/cobalt/arch/arm/include/asm/xenomai/fptest.h
> +++ b/kernel/cobalt/arch/arm/include/asm/xenomai/fptest.h
> @@ -23,7 +23,7 @@
>  #include <asm/hwcap.h>
>  
>  #ifdef CONFIG_VFP
> -#define have_vfp (elf_hwcap & HWCAP_VFP)
> +#define have_vfp (ELF_HWCAP & HWCAP_VFP)
>  #else /* !CONFIG_VFP */
>  #define have_vfp 0
>  #endif /* !CONFIG_VFP */
> 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)
>  {
> 

Rebased and applied (and "signed-off" typo fixed).

Thanks,
Jan

-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux

Re: [PATCH v2 1/2] kernel: cobalt: Remove header file for newer kernels

[Jan Kiszka]

On 03.02.21 10:50, Jan Kiszka via Xenomai wrote:
> On 03.02.21 08:01, 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>
>>
> 
> There is still arch/arm64/include/asm/compiler.h in today's master.
> 
> What error exactly are you fixing? That we should rather including
> linux/compiler.h? Or is that header obsolete for us now, for all kernels?
> 

OK, that file vanished in 4.20 and resurrected in 5.7. Given that we do
not head for ipipe over > 5.4, I will just merge this (ported to next).

Jan

-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux

Re: [PATCH v2 1/2] kernel: cobalt: Remove header file for newer kernels

[Greg Gallagher]

On Fri, Feb 5, 2021 at 9:45 AM Jan Kiszka <jan.kiszka@siemens.com> wrote:

> On 03.02.21 10:50, Jan Kiszka via Xenomai wrote:
> > On 03.02.21 08:01, 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>
> >>
> >
> > There is still arch/arm64/include/asm/compiler.h in today's master.
> >
> > What error exactly are you fixing? That we should rather including
> > linux/compiler.h? Or is that header obsolete for us now, for all kernels?
> >
>
> OK, that file vanished in 4.20 and resurrected in 5.7. Given that we do
> not head for ipipe over > 5.4, I will just merge this (ported to next).
>
> Jan
>
> --
> Siemens AG, T RDA IOT
> Corporate Competence Center Embedded Linux


Sorry, I meant to look into that. I’m assuming this won’t impact the port
to dovetail? We could always add it back for kernels greater then 5.6 and
remove for 4.20 and above?

Greg

>
>

Re: [PATCH v2 1/2] kernel: cobalt: Remove header file for newer kernels

[Jan Kiszka]

On 05.02.21 15:47, Greg Gallagher wrote:
> 
> 
> On Fri, Feb 5, 2021 at 9:45 AM Jan Kiszka <jan.kiszka@siemens.com
> <mailto:jan.kiszka@siemens.com>> wrote:
> 
>     On 03.02.21 10:50, Jan Kiszka via Xenomai wrote:
>     > On 03.02.21 08:01, 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
>     <mailto: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>
>     >>
>     >
>     > There is still arch/arm64/include/asm/compiler.h in today's master.
>     >
>     > What error exactly are you fixing? That we should rather including
>     > linux/compiler.h? Or is that header obsolete for us now, for all
>     kernels?
>     >
> 
>     OK, that file vanished in 4.20 and resurrected in 5.7. Given that we do
>     not head for ipipe over > 5.4, I will just merge this (ported to next).
> 
>     Jan
> 
>     -- 
>     Siemens AG, T RDA IOT
>     Corporate Competence Center Embedded Linux
> 
> 
> Sorry, I meant to look into that. I’m assuming this won’t impact the
> port to dovetail? We could always add it back for kernels greater then
> 5.6 and remove for 4.20 and above?
> 

Yes, 5.4 is EOL for that machine.h, thus we can ignore the
reintroduction later on. I left an according remark in the commit.

Jan

-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux