Patchwork [v2] linux-libc-headers 2.6.24: backport arm/asm/hwcap.h from recent kernels

login
register
mail settings
Submitter Steffen Sledz
Date Sept. 12, 2011, 3:26 p.m.
Message ID <1315841184-4706-1-git-send-email-sledz@dresearch-fe.de>
Download mbox | patch
Permalink /patch/11307/
State Superseded
Headers show

Comments

Steffen Sledz - Sept. 12, 2011, 3:26 p.m.
This patch is similar to the one in linux-libc-headers 2.6.23 [1] and
enables building of OpenJDK which uses HWCAP_THUMBEE which normally
are not present in 2.6.24 headers.

[1] commit 41cd62ffbac7d272d46a4b39faf8a97c0850dd10

Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
---
 .../arm-hwcap-add-new-entries.patch                |   21 ++++++++++++++++++++
 .../linux-libc-headers_2.6.24.bb                   |    5 ++-
 2 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 recipes/linux-libc-headers/linux-libc-headers-2.6.24/arm-hwcap-add-new-entries.patch
Paul Menzel - Sept. 13, 2011, 9:45 a.m.
Dear Steffen,


Am Montag, den 12.09.2011, 17:26 +0200 schrieb Steffen Sledz:
> This patch is similar to the one in linux-libc-headers 2.6.23 [1] and
> enables building of OpenJDK which uses HWCAP_THUMBEE which normally
> are not present in 2.6.24 headers.
> 
> [1] commit 41cd62ffbac7d272d46a4b39faf8a97c0850dd10

thank you for updating the patch and the commit message.

> Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
> ---
>  .../arm-hwcap-add-new-entries.patch                |   21 ++++++++++++++++++++
>  .../linux-libc-headers_2.6.24.bb                   |    5 ++-
>  2 files changed, 24 insertions(+), 2 deletions(-)
>  create mode 100644 recipes/linux-libc-headers/linux-libc-headers-2.6.24/arm-hwcap-add-new-entries.patch
> 
> diff --git a/recipes/linux-libc-headers/linux-libc-headers-2.6.24/arm-hwcap-add-new-entries.patch b/recipes/linux-libc-headers/linux-libc-headers-2.6.24/arm-hwcap-add-new-entries.patch
> new file mode 100644
> index 0000000..6975317
> --- /dev/null
> +++ b/recipes/linux-libc-headers/linux-libc-headers-2.6.24/arm-hwcap-add-new-entries.patch
> @@ -0,0 +1,21 @@

I am not sure about the policy in oe.dev, but could you add a patch
header, please [1].

Upstream-Status: Backport [2.6.(which one?)]

> +---
> + include/asm-arm/hwcap.h |    4 ++++
> + 1 file changed, 4 insertions(+)
> +
> +--- linux-2.6.24.orig/include/asm-arm/hwcap.h
> ++++ linux-2.6.24/include/asm-arm/hwcap.h
> +@@ -13,10 +13,14 @@
> + #define HWCAP_VFP	64
> + #define HWCAP_EDSP	128
> + #define HWCAP_JAVA	256
> + #define HWCAP_IWMMXT	512
> + #define HWCAP_CRUNCH	1024
> ++#define HWCAP_THUMBEE	2048
> ++#define HWCAP_NEON	4096
> ++#define HWCAP_VFPv3	8192
> ++#define HWCAP_VFPv3D16	16384
> + 
> + #if defined(__KERNEL__) && !defined(__ASSEMBLY__)
> + /*
> +  * This yields a mask that user programs can use to figure out what
> +  * instruction set this cpu supports.
> diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb
> index 148d03f..cec1835 100644
> --- a/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb
> +++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb
> @@ -2,13 +2,14 @@ require linux-libc-headers.inc
>  
>  INHIBIT_DEFAULT_DEPS = "1"
>  DEPENDS += "unifdef-native"
> -PR = "r7"
> +PR = "r8"
>  
>  SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
>             file://procinfo.h \
>             file://export_falloc_h.patch \
>             file://make-3.82.patch \
> -           file://unifdef.patch"
> +           file://unifdef.patch \
> +           file://arm-hwcap-add-new-entries.patch"

To keep future patches smaller could you put the »"« on the new line
please?

        ….patch \
        "
 
>  SRC_URI_append_hipox = " \
>  	file://siocoutqsnd.patch \

With these changes please add

Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>

below your Signed-off-by line.


Thanks,

Paul


[1] http://openembedded.org/index.php?title=Commit_Patch_Message_Guidelines#Patch_Header_Recommendations
Steffen Sledz - Sept. 13, 2011, 9:58 a.m.
On 13.09.2011 11:45, Paul Menzel wrote:
> Dear Steffen,
> 
> 
> Am Montag, den 12.09.2011, 17:26 +0200 schrieb Steffen Sledz:
>> This patch is similar to the one in linux-libc-headers 2.6.23 [1] and
>> enables building of OpenJDK which uses HWCAP_THUMBEE which normally
>> are not present in 2.6.24 headers.
>>
>> [1] commit 41cd62ffbac7d272d46a4b39faf8a97c0850dd10
> 
> thank you for updating the patch and the commit message.
> 
>> Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
>> ---
>>  .../arm-hwcap-add-new-entries.patch                |   21 ++++++++++++++++++++
>>  .../linux-libc-headers_2.6.24.bb                   |    5 ++-
>>  2 files changed, 24 insertions(+), 2 deletions(-)
>>  create mode 100644 recipes/linux-libc-headers/linux-libc-headers-2.6.24/arm-hwcap-add-new-entries.patch
>>
>> diff --git a/recipes/linux-libc-headers/linux-libc-headers-2.6.24/arm-hwcap-add-new-entries.patch b/recipes/linux-libc-headers/linux-libc-headers-2.6.24/arm-hwcap-add-new-entries.patch
>> new file mode 100644
>> index 0000000..6975317
>> --- /dev/null
>> +++ b/recipes/linux-libc-headers/linux-libc-headers-2.6.24/arm-hwcap-add-new-entries.patch
>> @@ -0,0 +1,21 @@
> 
> I am not sure about the policy in oe.dev, but could you add a patch
> header, please [1].
> 
> Upstream-Status: Backport [2.6.(which one?)]

Marcin, can you write something to this? I just adapted your patch to the 2.6.24 headers.

>> +---
>> + include/asm-arm/hwcap.h |    4 ++++
>> + 1 file changed, 4 insertions(+)
>> +
>> +--- linux-2.6.24.orig/include/asm-arm/hwcap.h
>> ++++ linux-2.6.24/include/asm-arm/hwcap.h
>> +@@ -13,10 +13,14 @@
>> + #define HWCAP_VFP	64
>> + #define HWCAP_EDSP	128
>> + #define HWCAP_JAVA	256
>> + #define HWCAP_IWMMXT	512
>> + #define HWCAP_CRUNCH	1024
>> ++#define HWCAP_THUMBEE	2048
>> ++#define HWCAP_NEON	4096
>> ++#define HWCAP_VFPv3	8192
>> ++#define HWCAP_VFPv3D16	16384
>> + 
>> + #if defined(__KERNEL__) && !defined(__ASSEMBLY__)
>> + /*
>> +  * This yields a mask that user programs can use to figure out what
>> +  * instruction set this cpu supports.
>> diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb
>> index 148d03f..cec1835 100644
>> --- a/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb
>> +++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb
>> @@ -2,13 +2,14 @@ require linux-libc-headers.inc
>>  
>>  INHIBIT_DEFAULT_DEPS = "1"
>>  DEPENDS += "unifdef-native"
>> -PR = "r7"
>> +PR = "r8"
>>  
>>  SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
>>             file://procinfo.h \
>>             file://export_falloc_h.patch \
>>             file://make-3.82.patch \
>> -           file://unifdef.patch"
>> +           file://unifdef.patch \
>> +           file://arm-hwcap-add-new-entries.patch"
> 
> To keep future patches smaller could you put the »"« on the new line
> please?
> 
>         ….patch \
>         "

Yepp. No problem.

>>  SRC_URI_append_hipox = " \
>>  	file://siocoutqsnd.patch \
> 
> With these changes please add
> 
> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
> 
> below your Signed-off-by line.
> 
> 
> Thanks,
> 
> Paul
> 
> 
> [1] http://openembedded.org/index.php?title=Commit_Patch_Message_Guidelines#Patch_Header_Recommendations
> 
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Marcin Juszkiewicz - Sept. 13, 2011, 10:37 a.m.
W dniu 13.09.2011 11:58, Steffen Sledz pisze:
>> > I am not sure about the policy in oe.dev, but could you add a patch
>> > header, please [1].
>> > 
>> > Upstream-Status: Backport [2.6.(which one?)]
> Marcin, can you write something to this? I just adapted your patch to the 2.6.24 headers.

In BugLabs we used Poky 'pinky' and then switched to OpenEmbedded
2009-stable tree. At that time we used 2.6.2x linux-libc-headers as this
was present in both trees and selected by default.

When BUG 2.0 prototypes started working we started move from phoneme to
openjdk as java-vm provider. To build openjdk newer linux-libc-headers
were needed due to lack of HWCAP_THUMBEE define in 2.6.2x ones. Patching
default version was better solution then switching to newer one as it
gave us smaller chance of build failures.

And that's whole story of it.
Paul Menzel - Sept. 13, 2011, 11:28 a.m.
Dear Steffen, dear Marcin,


Am Dienstag, den 13.09.2011, 11:45 +0200 schrieb Paul Menzel:

> Am Montag, den 12.09.2011, 17:26 +0200 schrieb Steffen Sledz:
> > This patch is similar to the one in linux-libc-headers 2.6.23 [1] and
> > enables building of OpenJDK which uses HWCAP_THUMBEE which normally
> > are not present in 2.6.24 headers.
> > 
> > [1] commit 41cd62ffbac7d272d46a4b39faf8a97c0850dd10
> 
> thank you for updating the patch and the commit message.
> 
> > Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
> > ---
> >  .../arm-hwcap-add-new-entries.patch                |   21 ++++++++++++++++++++
> >  .../linux-libc-headers_2.6.24.bb                   |    5 ++-
> >  2 files changed, 24 insertions(+), 2 deletions(-)
> >  create mode 100644 recipes/linux-libc-headers/linux-libc-headers-2.6.24/arm-hwcap-add-new-entries.patch
> > 
> > diff --git a/recipes/linux-libc-headers/linux-libc-headers-2.6.24/arm-hwcap-add-new-entries.patch b/recipes/linux-libc-headers/linux-libc-headers-2.6.24/arm-hwcap-add-new-entries.patch
> > new file mode 100644
> > index 0000000..6975317
> > --- /dev/null
> > +++ b/recipes/linux-libc-headers/linux-libc-headers-2.6.24/arm-hwcap-add-new-entries.patch
> > @@ -0,0 +1,21 @@
> 
> I am not sure about the policy in oe.dev, but could you add a patch
> header, please [1].
> 
> Upstream-Status: Backport [2.6.(which one?)]

Looking at your patch and the relevant Linux kernel commits, I do not
see how this can come from mainline Linux.

> > +---
> > + include/asm-arm/hwcap.h |    4 ++++
> > + 1 file changed, 4 insertions(+)
> > +
> > +--- linux-2.6.24.orig/include/asm-arm/hwcap.h
> > ++++ linux-2.6.24/include/asm-arm/hwcap.h
> > +@@ -13,10 +13,14 @@
> > + #define HWCAP_VFP	64
> > + #define HWCAP_EDSP	128
> > + #define HWCAP_JAVA	256
> > + #define HWCAP_IWMMXT	512
> > + #define HWCAP_CRUNCH	1024
> > ++#define HWCAP_THUMBEE	2048

This is already there in the original file creation.

        commit 4baa9922430662431231ac637adedddbb0cfb2d7
        Author: Russell King <rmk@dyn-67.arm.linux.org.uk>
        Date:   Sat Aug 2 10:55:55 2008 +0100
        
            [ARM] move include/asm-arm to arch/arm/include/asm

        $ git describe --contains 4baa9922
        v2.6.27-rc2~72^2~2

> > ++#define HWCAP_NEON	4096

        commit 2bedbdf4148ebbe48c7a89449ab52e475a788f42
        Author: Catalin Marinas <catalin.marinas@arm.com>
        Date:   Thu Nov 6 13:23:07 2008 +0000
        
            Add HWCAP_NEON to the ARM hwcap.h file

        $ git describe --contains 2bedbdf4
        v2.6.29-rc1~559^2~84^2~7

> > ++#define HWCAP_VFPv3	8192
> > ++#define HWCAP_VFPv3D16	16384

        commit 7279dc3e914635ab4b288ec39383272a06c466f3
        Author: Catalin Marinas <catalin.marinas@arm.com>
        Date:   Wed Feb 11 13:13:56 2009 +0100
        
            [ARM] 5388/1: Add hwcap bits for VFPv3 and VFPv3D16

After figuring that out I would just put these commit messages excerpts
into the patch header.

By the way, the Linux kernel version the last patch was merged is
therefore 2.6.30.

        $ git describe --contains 7279dc3e
        v2.6.30-rc1~636^2~52^2~24

So the commit summary could be updated to be more specific.

> > +
> > + #if defined(__KERNEL__) && !defined(__ASSEMBLY__)
> > + /*
> > +  * This yields a mask that user programs can use to figure out what
> > +  * instruction set this cpu supports.

[…]


Thanks,

Paul

Patch

diff --git a/recipes/linux-libc-headers/linux-libc-headers-2.6.24/arm-hwcap-add-new-entries.patch b/recipes/linux-libc-headers/linux-libc-headers-2.6.24/arm-hwcap-add-new-entries.patch
new file mode 100644
index 0000000..6975317
--- /dev/null
+++ b/recipes/linux-libc-headers/linux-libc-headers-2.6.24/arm-hwcap-add-new-entries.patch
@@ -0,0 +1,21 @@ 
+---
+ include/asm-arm/hwcap.h |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- linux-2.6.24.orig/include/asm-arm/hwcap.h
++++ linux-2.6.24/include/asm-arm/hwcap.h
+@@ -13,10 +13,14 @@
+ #define HWCAP_VFP	64
+ #define HWCAP_EDSP	128
+ #define HWCAP_JAVA	256
+ #define HWCAP_IWMMXT	512
+ #define HWCAP_CRUNCH	1024
++#define HWCAP_THUMBEE	2048
++#define HWCAP_NEON	4096
++#define HWCAP_VFPv3	8192
++#define HWCAP_VFPv3D16	16384
+ 
+ #if defined(__KERNEL__) && !defined(__ASSEMBLY__)
+ /*
+  * This yields a mask that user programs can use to figure out what
+  * instruction set this cpu supports.
diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb
index 148d03f..cec1835 100644
--- a/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb
+++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb
@@ -2,13 +2,14 @@  require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://procinfo.h \
            file://export_falloc_h.patch \
            file://make-3.82.patch \
-           file://unifdef.patch"
+           file://unifdef.patch \
+           file://arm-hwcap-add-new-entries.patch"
 
 SRC_URI_append_hipox = " \
 	file://siocoutqsnd.patch \