From: Oliver <oohall@gmail.com>
To: Christophe LEROY <christophe.leroy@c-s.fr>
Cc: Joel Stanley <joel@jms.id.au>,
Krzysztof Kozlowski <krzk@kernel.org>,
linuxppc-dev <linuxppc-dev@lists.ozlabs.org>,
Herbert Xu <herbert@gondor.apana.org.au>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] lib/xz: Fix powerpc build with KERNEL_XZ
Date: Wed, 19 Sep 2018 16:44:39 +1000 [thread overview]
Message-ID: <CAOSf1CG3bFHNWS8hQVy-VrpfnwjLWBHSrr-c52AMQbsBRqeyZA@mail.gmail.com> (raw)
In-Reply-To: <a3a97ebf-9a40-db6e-8225-7b9ccf9cfb4b@c-s.fr>
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;
>>
>
next prev parent reply other threads:[~2018-09-19 6:44 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2018-09-19 6:52 ` Christophe LEROY
2018-09-19 6:39 ` Krzysztof Kozlowski
2018-09-21 2:30 ` Joel Stanley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAOSf1CG3bFHNWS8hQVy-VrpfnwjLWBHSrr-c52AMQbsBRqeyZA@mail.gmail.com \
--to=oohall@gmail.com \
--cc=christophe.leroy@c-s.fr \
--cc=herbert@gondor.apana.org.au \
--cc=joel@jms.id.au \
--cc=krzk@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).