Message ID | 1395328213-19206-19-git-send-email-clg@fr.ibm.com (mailing list archive) |
---|---|
State | Changes Requested |
Headers | show |
On Thu, 2014-03-20 at 16:10 +0100, Cédric Le Goater wrote: > The previous patch broke compatibility for 64bit big endian kernel. > > This patch adds a config option to compile the boot wrapper in 64bit > only when CPU_LITTLE_ENDIAN is selected. It restores 32bit compilation > and linking for the big endian kernel. So I originally applied all 3 last patches of the series as one (collapsed them in git) in order to not break bisection. However, I had to take the series out in the end due to it causing this error on some of my test configs: powerpc64-linux-ld: cannot find arch/powerpc/boot/pseries-head.o: No such file or directory I haven't had a chance to investigate yet, but sadly it looks like this series might have to wait for the next round. Ben. > Signed-off-by: Cédric Le Goater <clg@fr.ibm.com> > --- > arch/powerpc/boot/Makefile | 2 +- > arch/powerpc/boot/wrapper | 2 +- > arch/powerpc/boot/zImage.lds.S | 8 ++++---- > arch/powerpc/platforms/Kconfig.cputype | 5 +++++ > 4 files changed, 11 insertions(+), 6 deletions(-) > > diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile > index b7e640028711..35189540b699 100644 > --- a/arch/powerpc/boot/Makefile > +++ b/arch/powerpc/boot/Makefile > @@ -23,7 +23,7 @@ BOOTCFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ > -fno-strict-aliasing -Os -msoft-float -pipe \ > -fomit-frame-pointer -fno-builtin -fPIC -nostdinc \ > -isystem $(shell $(CROSS32CC) -print-file-name=include) > -ifdef CONFIG_PPC64 > +ifdef CONFIG_PPC64_BOOT_WRAPPER > BOOTCFLAGS += -m64 > endif > ifdef CONFIG_CPU_BIG_ENDIAN > diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper > index 3270e2a5c901..1948cf8b8a40 100755 > --- a/arch/powerpc/boot/wrapper > +++ b/arch/powerpc/boot/wrapper > @@ -140,7 +140,7 @@ fi > elfformat="`${CROSS}objdump -p "$kernel" | grep 'file format' | awk '{print $4}'`" > case "$elfformat" in > elf64-powerpcle) format=elf64lppc ;; > - elf64-powerpc) format=elf64ppc ;; > + elf64-powerpc) format=elf32ppc ;; > elf32-powerpc) format=elf32ppc ;; > esac > > diff --git a/arch/powerpc/boot/zImage.lds.S b/arch/powerpc/boot/zImage.lds.S > index afecab0aff5c..861e72109df2 100644 > --- a/arch/powerpc/boot/zImage.lds.S > +++ b/arch/powerpc/boot/zImage.lds.S > @@ -1,6 +1,6 @@ > #include <asm-generic/vmlinux.lds.h> > > -#ifdef CONFIG_PPC64 > +#ifdef CONFIG_PPC64_BOOT_WRAPPER > OUTPUT_ARCH(powerpc:common64) > #else > OUTPUT_ARCH(powerpc:common) > @@ -22,7 +22,7 @@ SECTIONS > *(.rodata*) > *(.data*) > *(.sdata*) > -#ifdef CONFIG_PPC32 > +#ifndef CONFIG_PPC64_BOOT_WRAPPER > *(.got2) > #endif > } > @@ -37,7 +37,7 @@ SECTIONS > .interp : { *(.interp) } > .rela.dyn : > { > -#ifdef CONFIG_PPC64 > +#ifdef CONFIG_PPC64_BOOT_WRAPPER > __rela_dyn_start = .; > #endif > *(.rela*) > @@ -67,7 +67,7 @@ SECTIONS > _initrd_end = .; > } > > -#ifdef CONFIG_PPC64 > +#ifdef CONFIG_PPC64_BOOT_WRAPPER > .got : > { > __toc_start = .; > diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype > index 434fda39bf8b..a4aadb091a1e 100644 > --- a/arch/powerpc/platforms/Kconfig.cputype > +++ b/arch/powerpc/platforms/Kconfig.cputype > @@ -421,6 +421,7 @@ config CPU_BIG_ENDIAN > > config CPU_LITTLE_ENDIAN > bool "Build little endian kernel" > + select PPC64_BOOT_WRAPPER > help > Build a little endian kernel. > > @@ -429,3 +430,7 @@ config CPU_LITTLE_ENDIAN > little endian powerpc. > > endchoice > + > +config PPC64_BOOT_WRAPPER > + def_bool n > + depends on CPU_LITTLE_ENDIAN
Hi Benjamin, > So I originally applied all 3 last patches of the series as one > (collapsed them in git) in order to not break bisection. > > However, I had to take the series out in the end due to it > causing this error on some of my test configs: > > powerpc64-linux-ld: cannot find arch/powerpc/boot/pseries-head.o: No such file or directory > > I haven't had a chance to investigate yet, but sadly it looks like > this series might have to wait for the next round. OK. I will take a look. Thanks, C.
On Mon, 2014-03-24 at 09:38 +0100, Cedric Le Goater wrote: > Hi Benjamin, > > > So I originally applied all 3 last patches of the series as one > > (collapsed them in git) in order to not break bisection. > > > > However, I had to take the series out in the end due to it > > causing this error on some of my test configs: > > > > powerpc64-linux-ld: cannot find arch/powerpc/boot/pseries-head.o: No such file or directory > > > > I haven't had a chance to investigate yet, but sadly it looks like > > this series might have to wait for the next round. > > OK. I will take a look. Specifically it was my cell and bimini configs, I'll get you the actual config files (they are not defconfigs) separately. Cheers, Ben.
Hi, The following patchset adds support for 64bit little endian boot wrapper. It is based on original code from Andrew Tauferner. The first patches provide fixes for 64bit support. I also changed the prom code to make it converge with the prom_init kernel code. They have a lot in common and they could probably be merged. powerpc/boot: fix do_div for 64bit wrapper powerpc/boot: use a common prom_args struct in oflib powerpc/boot: use prom_arg_t in oflib powerpc/boot: add byteswapping routines in oflib powerpc/boot: add PROM_ERROR define in oflib powerpc/boot: rework of_claim() to make it 64bit friendly powerpc/boot: define typedef ihandle as u32 powerpc/boot: fix compile warning in 64bit These are for little endian only: powerpc/boot: define byteswapping routines for little endian powerpc/boot: add 64bit and little endian support to addnote powerpc/boot: add little endian support to elf utils and finally, these add support for the 64bit little endian boot wrapper : powerpc/boot: define a routine to enter prom powerpc/boot: modify entry point for 64bit powerpc/boot: add a global entry point for pseries powerpc/boot: add support for 64bit little endian wrapper Here are some topics to discuss : - to compile in 64bit, -m64 is added to the cross32 compiler. - There are still some compile warnings due to 64bit, in addnote and in the device tree library. - the wrapper is compiled as a position independent executable. This patchset is based on a 3.15-rc1 and was tested on qemu with the -kernel option, yaboot and grub for little and big endian guests. Tests were also done to check that the PowerVM stack was not broken by these changes. It is also available from : https://github.com/legoater/linux zimagev2 Cheers, C. Changes since v1 : - Fixed Makefile for platforms generating a zImage.pseries - used PROM_ERROR (-1u) to test return addr when claiming memory - removed patch modifying the call to the kernel entry point - merged last 3 patches to preserve bisectability Cédric Le Goater (15): powerpc/boot: fix do_div for 64bit wrapper powerpc/boot: use a common prom_args struct in oflib powerpc/boot: use prom_arg_t in oflib powerpc/boot: add byteswapping routines in oflib powerpc/boot: add PROM_ERROR define in oflib powerpc/boot: rework of_claim() to make it 64bit friendly powerpc/boot: define typedef ihandle as u32 powerpc/boot: fix compile warning in 64bit powerpc/boot: define byteswapping routines for little endian powerpc/boot: add 64bit and little endian support to addnote powerpc/boot: add little endian support to elf utils powerpc/boot: define a routine to enter prom powerpc/boot: modify entry point for 64bit powerpc/boot: add a global entry point for pseries powerpc/boot: add support for 64bit little endian wrapper arch/powerpc/boot/Makefile | 21 +++- arch/powerpc/boot/addnote.c | 128 +++++++++++++++-------- arch/powerpc/boot/crt0.S | 180 +++++++++++++++++++++++++++++++- arch/powerpc/boot/elf_util.c | 4 + arch/powerpc/boot/of.c | 4 +- arch/powerpc/boot/of.h | 19 +++- arch/powerpc/boot/ofconsole.c | 6 +- arch/powerpc/boot/oflib.c | 92 ++++++++-------- arch/powerpc/boot/ppc_asm.h | 12 +++ arch/powerpc/boot/pseries-head.S | 8 ++ arch/powerpc/boot/stdio.c | 14 +++ arch/powerpc/boot/swab.h | 29 +++++ arch/powerpc/boot/wrapper | 17 ++- arch/powerpc/boot/zImage.lds.S | 25 ++++- arch/powerpc/platforms/Kconfig.cputype | 5 + 15 files changed, 464 insertions(+), 100 deletions(-) create mode 100644 arch/powerpc/boot/pseries-head.S create mode 100644 arch/powerpc/boot/swab.h
Hi, The following patchset adds support for 64bit little endian boot wrapper. It is based on original code from Andrew Tauferner. The first patches provide fixes for 64bit support. I also changed the prom code to make it converge with the prom_init kernel code. They have a lot in common and they could probably be merged. powerpc/boot: fix do_div for 64bit wrapper powerpc/boot: use a common prom_args struct in oflib powerpc/boot: use prom_arg_t in oflib powerpc/boot: add byteswapping routines in oflib powerpc/boot: add PROM_ERROR define in oflib powerpc/boot: rework of_claim() to make it 64bit friendly powerpc/boot: define typedef ihandle as u32 powerpc/boot: fix compile warning in 64bit These are for little endian only: powerpc/boot: define byteswapping routines for little endian powerpc/boot: add 64bit and little endian support to addnote powerpc/boot: add little endian support to elf utils and finally, these add support for the 64bit little endian boot wrapper : powerpc/boot: define a routine to enter prom powerpc/boot: modify entry point for 64bit powerpc/boot: add a global entry point for pseries powerpc/boot: add support for 64bit little endian wrapper Here are some topics to discuss : - to compile in 64bit, -m64 is added to the cross32 compiler. - There are still some compile warnings due to 64bit, in addnote and in the device tree library. - the wrapper is compiled as a position independent executable. This patchset is based on a 3.15-rc2 and was tested on qemu with the -kernel option, yaboot and grub for little and big endian guests. Tests were also done to check that the PowerVM stack was not broken by these changes. It is also available from : https://github.com/legoater/linux v3.15-rc2-zimagev2 Cheers, C. Changes since v1 : - Fixed Makefile for platforms generating a zImage.pseries - used PROM_ERROR (-1u) to test return addr when claiming memory - removed patch modifying the call to the kernel entry point - merged last 3 patches to preserve bisectability Cédric Le Goater (15): powerpc/boot: fix do_div for 64bit wrapper powerpc/boot: use a common prom_args struct in oflib powerpc/boot: use prom_arg_t in oflib powerpc/boot: add byteswapping routines in oflib powerpc/boot: add PROM_ERROR define in oflib powerpc/boot: rework of_claim() to make it 64bit friendly powerpc/boot: define typedef ihandle as u32 powerpc/boot: fix compile warning in 64bit powerpc/boot: define byteswapping routines for little endian powerpc/boot: add 64bit and little endian support to addnote powerpc/boot: add little endian support to elf utils powerpc/boot: define a routine to enter prom powerpc/boot: modify entry point for 64bit powerpc/boot: add a global entry point for pseries powerpc/boot: add support for 64bit little endian wrapper arch/powerpc/boot/Makefile | 21 +++- arch/powerpc/boot/addnote.c | 128 +++++++++++++++-------- arch/powerpc/boot/crt0.S | 180 +++++++++++++++++++++++++++++++- arch/powerpc/boot/elf_util.c | 4 + arch/powerpc/boot/of.c | 4 +- arch/powerpc/boot/of.h | 19 +++- arch/powerpc/boot/ofconsole.c | 6 +- arch/powerpc/boot/oflib.c | 92 ++++++++-------- arch/powerpc/boot/ppc_asm.h | 12 +++ arch/powerpc/boot/pseries-head.S | 8 ++ arch/powerpc/boot/stdio.c | 14 +++ arch/powerpc/boot/swab.h | 29 +++++ arch/powerpc/boot/wrapper | 17 ++- arch/powerpc/boot/zImage.lds.S | 25 ++++- arch/powerpc/platforms/Kconfig.cputype | 5 + 15 files changed, 464 insertions(+), 100 deletions(-) create mode 100644 arch/powerpc/boot/pseries-head.S create mode 100644 arch/powerpc/boot/swab.h
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index b7e640028711..35189540b699 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile @@ -23,7 +23,7 @@ BOOTCFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ -fno-strict-aliasing -Os -msoft-float -pipe \ -fomit-frame-pointer -fno-builtin -fPIC -nostdinc \ -isystem $(shell $(CROSS32CC) -print-file-name=include) -ifdef CONFIG_PPC64 +ifdef CONFIG_PPC64_BOOT_WRAPPER BOOTCFLAGS += -m64 endif ifdef CONFIG_CPU_BIG_ENDIAN diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper index 3270e2a5c901..1948cf8b8a40 100755 --- a/arch/powerpc/boot/wrapper +++ b/arch/powerpc/boot/wrapper @@ -140,7 +140,7 @@ fi elfformat="`${CROSS}objdump -p "$kernel" | grep 'file format' | awk '{print $4}'`" case "$elfformat" in elf64-powerpcle) format=elf64lppc ;; - elf64-powerpc) format=elf64ppc ;; + elf64-powerpc) format=elf32ppc ;; elf32-powerpc) format=elf32ppc ;; esac diff --git a/arch/powerpc/boot/zImage.lds.S b/arch/powerpc/boot/zImage.lds.S index afecab0aff5c..861e72109df2 100644 --- a/arch/powerpc/boot/zImage.lds.S +++ b/arch/powerpc/boot/zImage.lds.S @@ -1,6 +1,6 @@ #include <asm-generic/vmlinux.lds.h> -#ifdef CONFIG_PPC64 +#ifdef CONFIG_PPC64_BOOT_WRAPPER OUTPUT_ARCH(powerpc:common64) #else OUTPUT_ARCH(powerpc:common) @@ -22,7 +22,7 @@ SECTIONS *(.rodata*) *(.data*) *(.sdata*) -#ifdef CONFIG_PPC32 +#ifndef CONFIG_PPC64_BOOT_WRAPPER *(.got2) #endif } @@ -37,7 +37,7 @@ SECTIONS .interp : { *(.interp) } .rela.dyn : { -#ifdef CONFIG_PPC64 +#ifdef CONFIG_PPC64_BOOT_WRAPPER __rela_dyn_start = .; #endif *(.rela*) @@ -67,7 +67,7 @@ SECTIONS _initrd_end = .; } -#ifdef CONFIG_PPC64 +#ifdef CONFIG_PPC64_BOOT_WRAPPER .got : { __toc_start = .; diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype index 434fda39bf8b..a4aadb091a1e 100644 --- a/arch/powerpc/platforms/Kconfig.cputype +++ b/arch/powerpc/platforms/Kconfig.cputype @@ -421,6 +421,7 @@ config CPU_BIG_ENDIAN config CPU_LITTLE_ENDIAN bool "Build little endian kernel" + select PPC64_BOOT_WRAPPER help Build a little endian kernel. @@ -429,3 +430,7 @@ config CPU_LITTLE_ENDIAN little endian powerpc. endchoice + +config PPC64_BOOT_WRAPPER + def_bool n + depends on CPU_LITTLE_ENDIAN
The previous patch broke compatibility for 64bit big endian kernel. This patch adds a config option to compile the boot wrapper in 64bit only when CPU_LITTLE_ENDIAN is selected. It restores 32bit compilation and linking for the big endian kernel. Signed-off-by: Cédric Le Goater <clg@fr.ibm.com> --- arch/powerpc/boot/Makefile | 2 +- arch/powerpc/boot/wrapper | 2 +- arch/powerpc/boot/zImage.lds.S | 8 ++++---- arch/powerpc/platforms/Kconfig.cputype | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-)