MIPS: BCM63xx: Move bcm63xx_gpio_init() to bcm63xx_register_devices().

nschichan · ralfbaechle · commit 2ec459f2a77b · 2015-03-25T13:47:55.000+01:00
When called from prom init code, bcm63xx_gpio_init() will fail as it will call gpiochip_add() which relies on a working kmalloc() to alloc the gpio_desc array and kmalloc is not useable yet at prom init time. Move bcm63xx_gpio_init() to bcm63xx_register_devices() (an arch_initcall) where kmalloc works. Fixes: 14e85c0 ("gpio: remove gpio_descs global array") Signed-off-by: Nicolas Schichan <nschichan@freebox.fr> Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Cc: Alexandre Courbot <acourbot@nvidia.com> Patchwork: https://patchwork.linux-mips.org/patch/9530/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
diff --git a/arch/mips/bcm63xx/prom.c b/arch/mips/bcm63xx/prom.c
@@ -17,7 +17,6 @@
 #include <bcm63xx_cpu.h>
 #include <bcm63xx_io.h>
 #include <bcm63xx_regs.h>
-#include <bcm63xx_gpio.h>
 
 void __init prom_init(void)
 {
@@ -53,9 +52,6 @@ void __init prom_init(void)
 	reg &= ~mask;
 	bcm_perf_writel(reg, PERF_CKCTL_REG);
 
-	/* register gpiochip */
-	bcm63xx_gpio_init();
-
 	/* do low level board init */
 	board_prom_init();
 
diff --git a/arch/mips/bcm63xx/setup.c b/arch/mips/bcm63xx/setup.c
@@ -20,6 +20,7 @@
 #include <bcm63xx_cpu.h>
 #include <bcm63xx_regs.h>
 #include <bcm63xx_io.h>
+#include <bcm63xx_gpio.h>
 
 void bcm63xx_machine_halt(void)
 {
@@ -160,6 +161,9 @@ void __init plat_mem_setup(void)
 
 int __init bcm63xx_register_devices(void)
 {
+	/* register gpiochip */
+	bcm63xx_gpio_init();
+
 	return board_register_devices();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`#include <bcm63xx_cpu.h>`
`21`	`21`	`#include <bcm63xx_regs.h>`
`22`	`22`	`#include <bcm63xx_io.h>`
	`23`	`+#include <bcm63xx_gpio.h>`
`23`	`24`
`24`	`25`	`void bcm63xx_machine_halt(void)`
`25`	`26`	`{`
`@@ -160,6 +161,9 @@ void __init plat_mem_setup(void)`
`160`	`161`
`161`	`162`	`int __init bcm63xx_register_devices(void)`
`162`	`163`	`{`
	`164`	`+ /* register gpiochip */`
	`165`	`+ bcm63xx_gpio_init();`
	`166`	`+`
`163`	`167`	`return board_register_devices();`
`164`	`168`	`}`
`165`	`169`