Skip to contentSkip to conversation

powerpc/zImage: Remove #ifdef in opal.c

PATCH Applied Oliver O'Halloran 4 participants 12 messages Mar 19, 2018 – Dec 23, 2018 PowerPC

lore
Share & tools
lore

Oliver O'Halloran

author
#0 lore raw

PATCH 1/5 powerpc/zImage: Remove #ifdef in opal.c

This file is only ever compiled if CONFIG_PPC64_BOOT_WRAPPER is set so this check is unnecessary.

Signed-off-by Oliver O'Halloran <[email protected]>
---
 arch/powerpc/boot/opal.c | 8 --------
 1 file changed, 8 deletions(-)
arch/powerpc/boot/opal.c +0 -8
index 0272570d02de..dfb199ef5b94 100644
@@ -13,8 +13,6 @@
 #include <libfdt.h>
 #include "../include/asm/opal-api.h"
 
-#ifdef CONFIG_PPC64_BOOT_WRAPPER
-
 /* Global OPAL struct used by opal-call.S */
 struct opal {
 	u64 base;

@@ -101,9 +99,3 @@ int opal_console_init(void *devp, struct serial_console_data *scdp)
 
 	return 0;
 }
-#else
-int opal_console_init(void *devp, struct serial_console_data *scdp)
-{
-	return -1;
-}
-#endif /* __powerpc64__ */
Signature · 1 line
2.9.5
author
#1 lore raw

PATCH 2/5 powerpc/zImage: Don't build zlib object files

The required source files are directly #include`ed into decompress.c when using gzip compression. Building the separate .o files for the zlib sources isn't required and can cause linker errors due to the symbols being defined in decompress.o and the zlib .o files.

Signed-off-by Oliver O'Halloran <[email protected]>

---
You can stop throwing up now

---
 arch/powerpc/boot/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/boot/Makefile +1 -1
index 26d5d2a5b8e9..f66b9dba99fd 100644
@@ -108,7 +108,7 @@ $(addprefix $(obj)/,$(libfdt) libfdt-wrapper.o simpleboot.o epapr.o opal.o \
 src-wlib-y := string.S crt0.S stdio.c decompress.c main.c \
 		$(libfdt) libfdt-wrapper.c \
 		ns16550.c serial.c simple_alloc.c div64.S util.S \
-		elf_util.c $(zlib-y) devtree.c stdlib.c \
+		elf_util.c devtree.c stdlib.c \
 		oflib.c ofconsole.c cuboot.c
 
 src-wlib-$(CONFIG_PPC_MPC52XX) += mpc52xx-psc.c
Signature · 1 line
2.9.5
author
#2 lore raw

PATCH 3/5 powerpc/zImage: Check compatible at driver init

In reply to Oliver O'Halloran

Have each driver's init function check the compatible string of the node given by the stdout path. This gives the drivers a more traditional probe-also-inits structure.

Signed-off-by Oliver O'Halloran <[email protected]>
---
 arch/powerpc/boot/cpm-serial.c  | 2 ++
 arch/powerpc/boot/mpc52xx-psc.c | 3 +++
 arch/powerpc/boot/mpsc.c        | 3 +++
 arch/powerpc/boot/ns16550.c     | 4 ++++
 arch/powerpc/boot/opal.c        | 3 +++
 arch/powerpc/boot/uartlite.c    | 5 +++++
 6 files changed, 20 insertions(+)
arch/powerpc/boot/cpm-serial.c +2 -0
index dfb56829cace..f6b1cf23946e 100644
@@ -212,6 +212,8 @@ int cpm_console_init(void *devp, struct serial_console_data *scdp)
 	} else if (dt_is_compatible(devp, "fsl,cpm2-smc-uart")) {
 		is_cpm2 = 1;
 		is_smc = 1;
+	} else if (!dt_is_compatible(devp, "fsl,cpm1-scc-uart")) {
+		return 1; /* not compatible */
 	}
 
 	if (is_smc) {
arch/powerpc/boot/mpc52xx-psc.c +3 -0
index c2c08633ee35..75470936e661 100644
@@ -52,6 +52,9 @@ static unsigned char psc_getc(void)
 
 int mpc5200_psc_console_init(void *devp, struct serial_console_data *scdp)
 {
+	if (!dt_is_compatible(devp, "fsl,mpc5200-psc-uart"))
+		return 1;
+
 	/* Get the base address of the psc registers */
 	if (dt_get_virtual_reg(devp, &psc, 1) < 1)
 		return -1;
arch/powerpc/boot/mpsc.c +3 -0
index 425ad88cce8d..59e23e886440 100644
@@ -128,6 +128,9 @@ int mpsc_console_init(void *devp, struct serial_console_data *scdp)
 	int n, reg_set;
 	volatile char *sdma_base;
 
+	if (!dt_is_compatible(devp, "marvell,mv64360-mpsc"))
+		return 1;
+
 	n = getprop(devp, "virtual-reg", &v, sizeof(v));
 	if (n != sizeof(v))
 		goto err_out;
arch/powerpc/boot/ns16550.c +4 -0
index b0da4466d419..0e7bd5284255 100644
@@ -58,6 +58,10 @@ int ns16550_console_init(void *devp, struct serial_console_data *scdp)
 	int n;
 	u32 reg_offset;
 
+	if (!dt_is_compatible(devp, "ns16550") &&
+	    !dt_is_compatible(devp, "pnpPNP,501"))
+		return 1;
+
 	if (dt_get_virtual_reg(devp, (void **)&reg_base, 1) < 1)
 		return -1;
arch/powerpc/boot/opal.c +3 -0
index dfb199ef5b94..0e92537536b9 100644
@@ -83,6 +83,9 @@ static void opal_init(void)
 
 int opal_console_init(void *devp, struct serial_console_data *scdp)
 {
+	if (!dt_is_compatible(devp, "ibm,opal-console-raw"))
+		return 1;
+
 	opal_init();
 
 	if (devp) {
arch/powerpc/boot/uartlite.c +5 -0
index 46bed69b4169..fc66a5fcea66 100644
@@ -62,6 +62,11 @@ int uartlite_console_init(void *devp, struct serial_console_data *scdp)
 	int n;
 	unsigned long reg_phys;
 
+
+	if (!dt_is_compatible(devp, "xlnx,opb-uartlite-1.00.b") &&
+	    !dt_is_compatible(devp, "xlnx,xps-uartlite-1.00.a"))
+		return 1;
+
 	n = getprop(devp, "virtual-reg", &reg_base, sizeof(reg_base));
 	if (n != sizeof(reg_base)) {
 		if (!dt_xlate_reg(devp, 0, &reg_phys, NULL))
Signature · 1 line
2.9.5
reviewer
#3 lore raw

Re: [PATCH 3/5] powerpc/zImage: Check compatible at driver init

arch/powerpc/boot/mpc52xx-psc.c static unsigned char psc_getc(void) · line 56

Quoted 10 lines · Oliver O'Halloran
arch/powerpc/boot/mpc52xx-psc.c +2 -0
index c2c08633ee35..75470936e661 100644
@@ -52,6 +52,9 @@ static unsigned char psc_getc(void)
 
 int mpc5200_psc_console_init(void *devp, struct serial_console_data *scdp)
 {
+	if (!dt_is_compatible(devp, "fsl,mpc5200-psc-uart"))
+		return 1;

Returning 1 raises the question of whether this is a bool-style function that returns 1 on success and 0 on failure - or a UNIX style function that returns 0 for sucesss and 1 on failure.

Can we return ENODEV, or just -1 instead to make it clearer?

cheers

author
#4 lore raw

Re: [PATCH 3/5] powerpc/zImage: Check compatible at driver init

Quoted 16 lines · Michael Ellerman

arch/powerpc/boot/mpc52xx-psc.c static unsigned char psc_getc(void) · line 56

Quoted 10 lines · Oliver O'Halloran
arch/powerpc/boot/mpc52xx-psc.c +2 -0
index c2c08633ee35..75470936e661 100644
@@ -52,6 +52,9 @@ static unsigned char psc_getc(void)
 
 int mpc5200_psc_console_init(void *devp, struct serial_console_data *scdp)
 {
+     if (!dt_is_compatible(devp, "fsl,mpc5200-psc-uart"))
+             return 1;

Returning 1 raises the question of whether this is a bool-style function that returns 1 on success and 0 on failure - or a UNIX style function that returns 0 for sucesss and 1 on failure.

Quoted 1 line

Can we return ENODEV, or just -1 instead to make it clearer?

I figured we would want to differentiate between a mis-matched driver and any other error type. There's no existing definition of ENODEV and friends in the wrapper so I just used positive 1 as a half-assed workaround. I don't have particularly strong feelings about it so adding an explicit ENODEV would make things a bit cleaner. I'll fix it on the respin.

Quoted 2 lines

cheers

author
#5 lore raw

PATCH 4/5 powerpc/zImage: Rework serial driver probing

In reply to Oliver O'Halloran

Rather than checking the compatible string in serial_driver_init() we call into the driver's init function and wait for a driver to inidicate it bound to the device by returning zero.

The pointers to each driver probe functions are stored in the ".serialdrv" section of the zImage, similar to how initcalls and whatnot are handled inside Linux. This structure allows us to conditionally compile specific driver files based on the KConfig settings. This is needed because we don't have access to the KConfig #defines in the zImage source files (it's a giant #include headache) so conditional compilation is the only way to eliminate unnecessary code.

Signed-off-by Oliver O'Halloran <[email protected]>
---
 arch/powerpc/boot/cpm-serial.c      |  1 +
 arch/powerpc/boot/mpc52xx-psc.c     |  1 +
 arch/powerpc/boot/mpsc.c            |  1 +
 arch/powerpc/boot/ns16550.c         |  2 ++
 arch/powerpc/boot/opal.c            |  1 +
 arch/powerpc/boot/ops.h             | 16 +++++++++------
 arch/powerpc/boot/serial.c          | 41 +++++++++++--------------------------
 arch/powerpc/boot/uartlite.c        |  1 +
 arch/powerpc/boot/wrapper           |  2 +-
 arch/powerpc/boot/zImage.coff.lds.S |  4 ++++
 arch/powerpc/boot/zImage.lds.S      |  8 ++++++++
 11 files changed, 42 insertions(+), 36 deletions(-)
arch/powerpc/boot/cpm-serial.c +1 -0
index f6b1cf23946e..5ebf3dfd810a 100644
@@ -295,3 +295,4 @@ int cpm_console_init(void *devp, struct serial_console_data *scdp)
 
 	return 0;
 }
+SERIAL_DRIVER(cpm_console_init);
arch/powerpc/boot/mpc52xx-psc.c +1 -0
index 75470936e661..c09e82eaf006 100644
@@ -66,3 +66,4 @@ int mpc5200_psc_console_init(void *devp, struct serial_console_data *scdp)
 
 	return 0;
 }
+SERIAL_DRIVER(mpc5200_psc_console_init);
arch/powerpc/boot/mpsc.c +1 -0
index 59e23e886440..2d0a72522b3c 100644
@@ -170,3 +170,4 @@ int mpsc_console_init(void *devp, struct serial_console_data *scdp)
 err_out:
 	return -1;
 }
+SERIAL_DRIVER(mpsc_console_init);
arch/powerpc/boot/ns16550.c +2 -0
index 0e7bd5284255..49e8c299b829 100644
@@ -81,3 +81,5 @@ int ns16550_console_init(void *devp, struct serial_console_data *scdp)
 
 	return 0;
 }
+
+SERIAL_DRIVER(ns16550_console_init);
arch/powerpc/boot/opal.c +1 -0
index 0e92537536b9..dc345ff63422 100644
@@ -102,3 +102,4 @@ int opal_console_init(void *devp, struct serial_console_data *scdp)
 
 	return 0;
 }
+SERIAL_DRIVER(opal_console_init);
arch/powerpc/boot/ops.h +10 -6
index fad1862f4b2d..06151ecb2f45 100644
@@ -84,13 +84,17 @@ extern struct loader_info loader_info;
 
 void start(void);
 void fdt_init(void *blob);
+
+struct driver_ptr {
+	int (*ptr)(void *node, struct serial_console_data *scdp);
+};
+
+#define SERIAL_DRIVER(init_function) static const struct driver_ptr \
+	__attribute__((__section__(".serialdrv"))) __attribute__((used)) \
+	init_function##_ptr = { .ptr = &init_function, }
+
 int serial_console_init(void);
-int ns16550_console_init(void *devp, struct serial_console_data *scdp);
-int mpsc_console_init(void *devp, struct serial_console_data *scdp);
-int cpm_console_init(void *devp, struct serial_console_data *scdp);
-int mpc5200_psc_console_init(void *devp, struct serial_console_data *scdp);
-int uartlite_console_init(void *devp, struct serial_console_data *scdp);
-int opal_console_init(void *devp, struct serial_console_data *scdp);
+
 void *simple_alloc_init(char *base, unsigned long heap_size,
 			unsigned long granularity, unsigned long max_allocs);
 extern void flush_cache(void *, unsigned long);
arch/powerpc/boot/serial.c +12 -29

58 lines not on this page · raw message

arch/powerpc/boot/uartlite.c +1 -0
index fc66a5fcea66..92d4f00bf626 100644
@@ -82,3 +82,4 @@ int uartlite_console_init(void *devp, struct serial_console_data *scdp)
 	scdp->close = NULL;
 	return 0;
 }
+SERIAL_DRIVER(uartlite_console_init);
arch/powerpc/boot/wrapper +1 -1
index 76fe3ccfd381..b5c887ae729d 100755
@@ -469,7 +469,7 @@ if [ "$platform" != "miboot" ]; then
     fi
 #link everything
     ${CROSS}ld -m $format -T $lds $text_start $pie $nodl -o "$ofile" \
-	$platformo $tmp $object/wrapper.a
+	$platformo $tmp --whole-archive $object/wrapper.a
     rm $tmp
 fi
arch/powerpc/boot/zImage.coff.lds.S +4 -0
index 117951295117..d667fe3f5999 100644
@@ -20,6 +20,10 @@ SECTIONS
     *(.sdata*)
     *(.got2)
 
+    _serial_drv_start = .;
+    *(.serialdrv)
+    _serial_drv_end = .;
+
     _dtb_start = .;
     *(.kernel:dtb)
     _dtb_end = .;
arch/powerpc/boot/zImage.lds.S +8 -0
index 4ac1e36edfe7..9dda24bcee00 100644
@@ -45,6 +45,14 @@ SECTIONS
   }
 
   . = ALIGN(8);
+  .serialdrv :
+  {
+    _serial_drv_start = .;
+    KEEP(*(.serialdrv));
+    _serial_drv_end = .;
+  }
+
+  . = ALIGN(8);
   .kernel:dtb :
   {
     _dtb_start = .;
Signature · 1 line
2.9.5
build bot
#6 lore raw

Re: [PATCH 4/5] powerpc/zImage: Rework serial driver probing

Thank you for the patch! Yet something to improve:

Hi Oliver,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on v4.16-rc4]
[also build test ERROR on next-20180319]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url: https://github.com/0day-ci/linux/commits/Oliver-O-Halloran/powerpc-zImage-Remove-ifdef-in-opal-c/20180320-023705
config: powerpc64-alldefconfig (attached as .config)
compiler: powerpc-linux-gnu-gcc (Debian 7.2.0-11) 7.2.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=powerpc64

All errors (new ones prefixed by >>):

arch/powerpc/boot/wrapper.a(crt0.o): In function `_zimage_start_opd':

>> (.text+0x0): multiple definition of `_zimage_start_opd'
   arch/powerpc/boot/crt0.o:(.text+0x0): first defined here
   arch/powerpc/boot/wrapper.a(crt0.o): In function `_zimage_start':
>> (.text+0x24): multiple definition of `_zimage_start_lib'

arch/powerpc/boot/crt0.o:(.text+0x24): first defined here

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation

build bot
#7 lore raw

Re: [PATCH 4/5] powerpc/zImage: Rework serial driver probing

In reply to Oliver O'Halloran
Thank you for the patch! Yet something to improve:

Hi Oliver,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on v4.16-rc4]
[also build test ERROR on next-20180319]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url: https://github.com/0day-ci/linux/commits/Oliver-O-Halloran/powerpc-zImage-Remove-ifdef-in-opal-c/20180320-023705
config: powerpc-ppc64_defconfig (attached as .config)
compiler: powerpc64-linux-gnu-gcc (Debian 7.2.0-11) 7.2.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=powerpc

All errors (new ones prefixed by >>):

>> arch/powerpc/boot/wrapper.a(serial.o):(.got2+0x1c): undefined reference to `_serial_drv_start'
>> arch/powerpc/boot/wrapper.a(serial.o):(.got2+0x24): undefined reference to `_serial_drv_end'

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation

reviewer
#8 lore raw

Re: [PATCH 4/5] powerpc/zImage: Rework serial driver probing

In reply to Oliver O'Halloran
Quoted 4 lines · Oliver O'Halloran

Rather than checking the compatible string in serial_driver_init() we call into the driver's init function and wait for a driver to inidicate it bound to the device by returning zero.

Quoted 8 lines

The pointers to each driver probe functions are stored in the ".serialdrv" section of the zImage, similar to how initcalls and whatnot are handled inside Linux. This structure allows us to conditionally compile specific driver files based on the KConfig settings. This is needed because we don't have access to the KConfig #defines in the zImage source files (it's a giant #include headache) so conditional compilation is the only way to eliminate unnecessary code.

Did you actually get the config.h include working? Or was it such a big headache that it doesn't even work?

I'm pretty happy with this patch regardless, but it would be simpler and less bug prone if the CONFIG_ symbols were usable in the boot code.

cheers

author
#9 lore raw

Re: [PATCH 4/5] powerpc/zImage: Rework serial driver probing

Quoted 15 lines · Michael Ellerman
Quoted 4 lines · Oliver O'Halloran

Rather than checking the compatible string in serial_driver_init() we call into the driver's init function and wait for a driver to inidicate it bound to the device by returning zero.

Quoted 8 lines

The pointers to each driver probe functions are stored in the ".serialdrv" section of the zImage, similar to how initcalls and whatnot are handled inside Linux. This structure allows us to conditionally compile specific driver files based on the KConfig settings. This is needed because we don't have access to the KConfig #defines in the zImage source files (it's a giant #include headache) so conditional compilation is the only way to eliminate unnecessary code.

Quoted 2 lines

Did you actually get the config.h include working? Or was it such a big headache that it doesn't even work?

I had a half-hearted go at it and ran into some problems with include paths. The usual workaround for that is copying the files into the build directory and using sed scripts to replace the <> include with a "" include, so I said screw it and went with this instead. I'm not too suprised about there being a few linker errors. I tested a few different defconfigs before posting, but I figured either your CI or the 0day bot would catch the rest ;)

Quoted 4 lines

I'm pretty happy with this patch regardless, but it would be simpler and less bug prone if the CONFIG_ symbols were usable in the boot code.

cheers

author
#10 lore raw

PATCH 5/5 powerpc/zImage: Also check for stdout-path

In reply to Oliver O'Halloran

The /chosen/linux,stdout-path is "deprecated" in favour of /chosen/stdout-path so we should be checking for both.

Signed-off-by Oliver O'Halloran <[email protected]>
---
 arch/powerpc/boot/serial.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
arch/powerpc/boot/serial.c +2 -1
index a7f9ac9a27b5..9ef1ed35ae62 100644
@@ -92,7 +92,8 @@ static void *serial_get_stdout_devp(void)
 	if (devp == NULL)
 		goto err_out;
 
-	if (getprop(devp, "linux,stdout-path", path, MAX_PATH_LEN) > 0) {
+	if (getprop(devp, "linux,stdout-path", path, MAX_PATH_LEN) > 0 ||
+		getprop(devp, "stdout-path", path, MAX_PATH_LEN) > 0) {
 		devp = finddevice(path);
 		if (devp == NULL)
 			goto err_out;
Signature · 1 line
2.9.5