* [PATCH] lib/xz: Fix powerpc build with KERNEL_XZ
@ 2018-09-18 23:07 Joel Stanley
2018-09-19 5:52 ` Christophe LEROY
2018-09-19 6:39 ` Krzysztof Kozlowski
0 siblings, 2 replies; 6+ messages in thread
From: Joel Stanley @ 2018-09-18 23:07 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Herbert Xu, linux-kernel, Michael Ellerman,
Oliver O'Halloran, linuxppc-dev
This partially reverts faa16bc404d72a5 ("lib: Use existing define with
polynomial").
The cleanup added a dependency on include/linux, which broke the PowerPC
boot wrapper/decompresser when KERNEL_XZ is enabled:
BOOTCC arch/powerpc/boot/decompress.o
In file included from arch/powerpc/boot/../../../lib/decompress_unxz.c:233,
from arch/powerpc/boot/decompress.c:42:
arch/powerpc/boot/../../../lib/xz/xz_crc32.c:18:10: fatal error:
linux/crc32poly.h: No such file or directory
#include <linux/crc32poly.h>
^~~~~~~~~~~~~~~~~~~
The powerpc decompressor is a hairy corner of the kernel. Even while building
a 64-bit kernel it needs to build a 32-bit binary and therefore avoid including
files from include/linux.
Fixes: faa16bc404d7 ("lib: Use existing define with polynomial")
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
We need to clean up the powerpc boot decompresser but that work will be
more involved than we would include in a late -rc. Please consider
merging this fix for 4.19. Thanks!
lib/xz/xz_crc32.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/xz/xz_crc32.c b/lib/xz/xz_crc32.c
index 25a5d87e2e4c..34532d14fd4c 100644
--- a/lib/xz/xz_crc32.c
+++ b/lib/xz/xz_crc32.c
@@ -15,7 +15,6 @@
* but they are bigger and use more memory for the lookup table.
*/
-#include <linux/crc32poly.h>
#include "xz_private.h"
/*
@@ -30,7 +29,7 @@ STATIC_RW_DATA uint32_t xz_crc32_table[256];
XZ_EXTERN void xz_crc32_init(void)
{
- const uint32_t poly = CRC32_POLY_LE;
+ const uint32_t poly = 0xEDB88320;
uint32_t i;
uint32_t j;
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] lib/xz: Fix powerpc build with KERNEL_XZ
2018-09-18 23:07 [PATCH] lib/xz: Fix powerpc build with KERNEL_XZ Joel Stanley
@ 2018-09-19 5:52 ` Christophe LEROY
2018-09-19 6:44 ` Oliver
2018-09-19 6:39 ` Krzysztof Kozlowski
1 sibling, 1 reply; 6+ messages in thread
From: Christophe LEROY @ 2018-09-19 5:52 UTC (permalink / raw)
To: Joel Stanley, Krzysztof Kozlowski
Cc: linuxppc-dev, Oliver O'Halloran, Herbert Xu, linux-kernel
Le 19/09/2018 à 01:07, Joel Stanley a écrit :
> This partially reverts faa16bc404d72a5 ("lib: Use existing define with
> polynomial").
>
> The cleanup added a dependency on include/linux, which broke the PowerPC
> boot wrapper/decompresser when KERNEL_XZ is enabled:
>
> BOOTCC arch/powerpc/boot/decompress.o
> In file included from arch/powerpc/boot/../../../lib/decompress_unxz.c:233,
> from arch/powerpc/boot/decompress.c:42:
> arch/powerpc/boot/../../../lib/xz/xz_crc32.c:18:10: fatal error:
> linux/crc32poly.h: No such file or directory
> #include <linux/crc32poly.h>
> ^~~~~~~~~~~~~~~~~~~
>
> The powerpc decompressor is a hairy corner of the kernel. Even while building
> a 64-bit kernel it needs to build a 32-bit binary and therefore avoid including
> files from include/linux.
>
> Fixes: faa16bc404d7 ("lib: Use existing define with polynomial")
> Signed-off-by: Joel Stanley <joel@jms.id.au>
> ---
> We need to clean up the powerpc boot decompresser but that work will be
> more involved than we would include in a late -rc. Please consider
> merging this fix for 4.19. Thanks!
>
> lib/xz/xz_crc32.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/lib/xz/xz_crc32.c b/lib/xz/xz_crc32.c
> index 25a5d87e2e4c..34532d14fd4c 100644
> --- a/lib/xz/xz_crc32.c
> +++ b/lib/xz/xz_crc32.c
> @@ -15,7 +15,6 @@
> * but they are bigger and use more memory for the lookup table.
> */
>
> -#include <linux/crc32poly.h>
> #include "xz_private.h"
>
> /*
> @@ -30,7 +29,7 @@ STATIC_RW_DATA uint32_t xz_crc32_table[256];
>
> XZ_EXTERN void xz_crc32_init(void)
> {
> - const uint32_t poly = CRC32_POLY_LE;
> + const uint32_t poly = 0xEDB88320;
Maybe avoid capital letters ?
What about adding something like the following in xz_private.h instead:
#define CRC32_POLY_LE 0xedb88320
Christophe
>
> uint32_t i;
> uint32_t j;
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] lib/xz: Fix powerpc build with KERNEL_XZ
2018-09-18 23:07 [PATCH] lib/xz: Fix powerpc build with KERNEL_XZ Joel Stanley
2018-09-19 5:52 ` Christophe LEROY
@ 2018-09-19 6:39 ` Krzysztof Kozlowski
2018-09-21 2:30 ` Joel Stanley
1 sibling, 1 reply; 6+ messages in thread
From: Krzysztof Kozlowski @ 2018-09-19 6:39 UTC (permalink / raw)
To: joel; +Cc: herbert, linux-kernel, mpe, oohall, linuxppc-dev, Christophe LEROY
On Wed, 19 Sep 2018 at 01:08, Joel Stanley <joel@jms.id.au> wrote:
>
> This partially reverts faa16bc404d72a5 ("lib: Use existing define with
> polynomial").
>
> The cleanup added a dependency on include/linux, which broke the PowerPC
> boot wrapper/decompresser when KERNEL_XZ is enabled:
>
> BOOTCC arch/powerpc/boot/decompress.o
> In file included from arch/powerpc/boot/../../../lib/decompress_unxz.c:233,
> from arch/powerpc/boot/decompress.c:42:
> arch/powerpc/boot/../../../lib/xz/xz_crc32.c:18:10: fatal error:
> linux/crc32poly.h: No such file or directory
> #include <linux/crc32poly.h>
> ^~~~~~~~~~~~~~~~~~~
>
> The powerpc decompressor is a hairy corner of the kernel. Even while building
> a 64-bit kernel it needs to build a 32-bit binary and therefore avoid including
> files from include/linux.
I fixed the build error here:
https://lkml.org/lkml/2018/8/29/179
If you choose to remove any includes from /linux, then go ahead but
please use original reported-by :)
Best regards,
Krzysztof
>
> Fixes: faa16bc404d7 ("lib: Use existing define with polynomial")
> Signed-off-by: Joel Stanley <joel@jms.id.au>
> ---
> We need to clean up the powerpc boot decompresser but that work will be
> more involved than we would include in a late -rc. Please consider
> merging this fix for 4.19. Thanks!
>
> lib/xz/xz_crc32.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/lib/xz/xz_crc32.c b/lib/xz/xz_crc32.c
> index 25a5d87e2e4c..34532d14fd4c 100644
> --- a/lib/xz/xz_crc32.c
> +++ b/lib/xz/xz_crc32.c
> @@ -15,7 +15,6 @@
> * but they are bigger and use more memory for the lookup table.
> */
>
> -#include <linux/crc32poly.h>
> #include "xz_private.h"
>
> /*
> @@ -30,7 +29,7 @@ STATIC_RW_DATA uint32_t xz_crc32_table[256];
>
> XZ_EXTERN void xz_crc32_init(void)
> {
> - const uint32_t poly = CRC32_POLY_LE;
> + const uint32_t poly = 0xEDB88320;
>
> uint32_t i;
> uint32_t j;
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] lib/xz: Fix powerpc build with KERNEL_XZ
2018-09-19 5:52 ` Christophe LEROY
@ 2018-09-19 6:44 ` Oliver
2018-09-19 6:52 ` Christophe LEROY
0 siblings, 1 reply; 6+ messages in thread
From: Oliver @ 2018-09-19 6:44 UTC (permalink / raw)
To: Christophe LEROY
Cc: Joel Stanley, Krzysztof Kozlowski, linuxppc-dev, Herbert Xu,
Linux Kernel Mailing List
On Wed, Sep 19, 2018 at 3:52 PM, Christophe LEROY
<christophe.leroy@c-s.fr> wrote:
>
>
> Le 19/09/2018 à 01:07, Joel Stanley a écrit :
>>
>> This partially reverts faa16bc404d72a5 ("lib: Use existing define with
>> polynomial").
>>
>> The cleanup added a dependency on include/linux, which broke the PowerPC
>> boot wrapper/decompresser when KERNEL_XZ is enabled:
>>
>> BOOTCC arch/powerpc/boot/decompress.o
>> In file included from
>> arch/powerpc/boot/../../../lib/decompress_unxz.c:233,
>> from arch/powerpc/boot/decompress.c:42:
>> arch/powerpc/boot/../../../lib/xz/xz_crc32.c:18:10: fatal error:
>> linux/crc32poly.h: No such file or directory
>> #include <linux/crc32poly.h>
>> ^~~~~~~~~~~~~~~~~~~
>>
>> The powerpc decompressor is a hairy corner of the kernel. Even while
>> building
>> a 64-bit kernel it needs to build a 32-bit binary and therefore avoid
>> including
>> files from include/linux.
>>
>> Fixes: faa16bc404d7 ("lib: Use existing define with polynomial")
>> Signed-off-by: Joel Stanley <joel@jms.id.au>
>> ---
>> We need to clean up the powerpc boot decompresser but that work will be
>> more involved than we would include in a late -rc. Please consider
>> merging this fix for 4.19. Thanks!
>>
>> lib/xz/xz_crc32.c | 3 +--
>> 1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/lib/xz/xz_crc32.c b/lib/xz/xz_crc32.c
>> index 25a5d87e2e4c..34532d14fd4c 100644
>> --- a/lib/xz/xz_crc32.c
>> +++ b/lib/xz/xz_crc32.c
>> @@ -15,7 +15,6 @@
>> * but they are bigger and use more memory for the lookup table.
>> */
>> -#include <linux/crc32poly.h>
>> #include "xz_private.h"
>> /*
>> @@ -30,7 +29,7 @@ STATIC_RW_DATA uint32_t xz_crc32_table[256];
>> XZ_EXTERN void xz_crc32_init(void)
>> {
>> - const uint32_t poly = CRC32_POLY_LE;
>> + const uint32_t poly = 0xEDB88320;
>
>
> Maybe avoid capital letters ?
>
> What about adding something like the following in xz_private.h instead:
>
> #define CRC32_POLY_LE 0xedb88320
The problem is that it's pulling in linux/crc32poly.h. To support old
systems with a 32bit Open Firmware we boot wrapper we build the boot
wrapper as a 32bit ELF even for a 64 bit kernel. The headers generated
by Kbuild are only valid for the 64bit kernel so we have to avoid
pulling them into the boot wrapper.
> Christophe
>
>> uint32_t i;
>> uint32_t j;
>>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] lib/xz: Fix powerpc build with KERNEL_XZ
2018-09-19 6:44 ` Oliver
@ 2018-09-19 6:52 ` Christophe LEROY
0 siblings, 0 replies; 6+ messages in thread
From: Christophe LEROY @ 2018-09-19 6:52 UTC (permalink / raw)
To: Oliver
Cc: Joel Stanley, Krzysztof Kozlowski, linuxppc-dev, Herbert Xu,
Linux Kernel Mailing List
Le 19/09/2018 à 08:44, Oliver a écrit :
> On Wed, Sep 19, 2018 at 3:52 PM, Christophe LEROY
> <christophe.leroy@c-s.fr> wrote:
>>
>>
>> Le 19/09/2018 à 01:07, Joel Stanley a écrit :
>>>
>>> This partially reverts faa16bc404d72a5 ("lib: Use existing define with
>>> polynomial").
>>>
>>> The cleanup added a dependency on include/linux, which broke the PowerPC
>>> boot wrapper/decompresser when KERNEL_XZ is enabled:
>>>
>>> BOOTCC arch/powerpc/boot/decompress.o
>>> In file included from
>>> arch/powerpc/boot/../../../lib/decompress_unxz.c:233,
>>> from arch/powerpc/boot/decompress.c:42:
>>> arch/powerpc/boot/../../../lib/xz/xz_crc32.c:18:10: fatal error:
>>> linux/crc32poly.h: No such file or directory
>>> #include <linux/crc32poly.h>
>>> ^~~~~~~~~~~~~~~~~~~
>>>
>>> The powerpc decompressor is a hairy corner of the kernel. Even while
>>> building
>>> a 64-bit kernel it needs to build a 32-bit binary and therefore avoid
>>> including
>>> files from include/linux.
>>>
>>> Fixes: faa16bc404d7 ("lib: Use existing define with polynomial")
>>> Signed-off-by: Joel Stanley <joel@jms.id.au>
>>> ---
>>> We need to clean up the powerpc boot decompresser but that work will be
>>> more involved than we would include in a late -rc. Please consider
>>> merging this fix for 4.19. Thanks!
>>>
>>> lib/xz/xz_crc32.c | 3 +--
>>> 1 file changed, 1 insertion(+), 2 deletions(-)
>>>
>>> diff --git a/lib/xz/xz_crc32.c b/lib/xz/xz_crc32.c
>>> index 25a5d87e2e4c..34532d14fd4c 100644
>>> --- a/lib/xz/xz_crc32.c
>>> +++ b/lib/xz/xz_crc32.c
>>> @@ -15,7 +15,6 @@
>>> * but they are bigger and use more memory for the lookup table.
>>> */
>>> -#include <linux/crc32poly.h>
>>> #include "xz_private.h"
>>> /*
>>> @@ -30,7 +29,7 @@ STATIC_RW_DATA uint32_t xz_crc32_table[256];
>>> XZ_EXTERN void xz_crc32_init(void)
>>> {
>>> - const uint32_t poly = CRC32_POLY_LE;
>>> + const uint32_t poly = 0xEDB88320;
>>
>>
>> Maybe avoid capital letters ?
>>
>> What about adding something like the following in xz_private.h instead:
>>
>> #define CRC32_POLY_LE 0xedb88320
>
> The problem is that it's pulling in linux/crc32poly.h. To support old
> systems with a 32bit Open Firmware we boot wrapper we build the boot
> wrapper as a 32bit ELF even for a 64 bit kernel. The headers generated
> by Kbuild are only valid for the 64bit kernel so we have to avoid
> pulling them into the boot wrapper.
Yes I understood, hence my proposal to redefine CRC32_POLY_LE in
xz_private.h instead of including linux/crc32poly.h
It avoids modifying the C code.
Christophe
>
>> Christophe
>>
>>> uint32_t i;
>>> uint32_t j;
>>>
>>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] lib/xz: Fix powerpc build with KERNEL_XZ
2018-09-19 6:39 ` Krzysztof Kozlowski
@ 2018-09-21 2:30 ` Joel Stanley
0 siblings, 0 replies; 6+ messages in thread
From: Joel Stanley @ 2018-09-21 2:30 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Herbert Xu, Linux Kernel Mailing List, Michael Ellerman,
Oliver O'Halloran, linuxppc-dev, christophe.leroy
On Wed, 19 Sep 2018 at 16:09, Krzysztof Kozlowski <krzk@kernel.org> wrote:
>
> On Wed, 19 Sep 2018 at 01:08, Joel Stanley <joel@jms.id.au> wrote:
> >
> > This partially reverts faa16bc404d72a5 ("lib: Use existing define with
> > polynomial").
> >
> > The cleanup added a dependency on include/linux, which broke the PowerPC
> > boot wrapper/decompresser when KERNEL_XZ is enabled:
> >
> > BOOTCC arch/powerpc/boot/decompress.o
> > In file included from arch/powerpc/boot/../../../lib/decompress_unxz.c:233,
> > from arch/powerpc/boot/decompress.c:42:
> > arch/powerpc/boot/../../../lib/xz/xz_crc32.c:18:10: fatal error:
> > linux/crc32poly.h: No such file or directory
> > #include <linux/crc32poly.h>
> > ^~~~~~~~~~~~~~~~~~~
> >
> > The powerpc decompressor is a hairy corner of the kernel. Even while building
> > a 64-bit kernel it needs to build a 32-bit binary and therefore avoid including
> > files from include/linux.
>
> I fixed the build error here:
> https://lkml.org/lkml/2018/8/29/179
>
> If you choose to remove any includes from /linux, then go ahead but
> please use original reported-by :)
Okay. I'll try Christophe's suggestion instead.
Cheers,
Joel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-09-21 2:30 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-18 23:07 [PATCH] lib/xz: Fix powerpc build with KERNEL_XZ Joel Stanley
2018-09-19 5:52 ` Christophe LEROY
2018-09-19 6:44 ` Oliver
2018-09-19 6:52 ` Christophe LEROY
2018-09-19 6:39 ` Krzysztof Kozlowski
2018-09-21 2:30 ` Joel Stanley
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).