Preparation for arch_reset changes

Add a restart hook to the machine_desc record so we don't have to populate all platforms with init_early methods to initialize the arm_pm_restart function pointer.

Signed-off-by Russell King <[email protected]>

---
 arch/arm/include/asm/mach/arch.h |    1 +
 arch/arm/kernel/setup.c          |    3 +++
 2 files changed, 4 insertions(+), 0 deletions(-)

arch/arm/include/asm/mach/arch.h +1 -0

index 7d19425..8aa397a 100644
@@ -45,6 +45,7 @@ struct machine_desc {
 #ifdef CONFIG_MULTI_IRQ_HANDLER
 	void			(*handle_irq)(struct pt_regs *);
 #endif
+	void			(*restart)(char, const char *);
 };
 
 /*

arch/arm/kernel/setup.c +0 -0

index bda0a21..d187d0a 100644

Add a restart hook to the machine_desc record so we don't have to populate all platforms with init_early methods to initialize the arm_pm_restart function pointer.

Signed-off-by Russell King <[email protected]>

Add a default restart mode to reflect the hard-coded restart mode found in these files.

Move the failure to reboot into machine_restart() to always catch this condition, even if a platform decides to hook the restarting via arm_pm_restart().

Signed-off-by Russell King <[email protected]>

setup_mm_for_reboot() doesn't make use of its argument, so remove it.

Signed-off-by Russell King <[email protected]>

We only need to set the system up for a soft-restart if we're going to be doing a soft-restart. Provide a new function (soft_restart()) which does the setup and final call for this, and make platforms use it. Eliminate the call to setup_restart() from the default handler.

This means that platforms arch_reset() function is no longer called with the page tables prepared for a soft-restart, and caches will still be enabled.

Signed-off-by Russell King <[email protected]>

---
 arch/arm/include/asm/system.h                     |    1 +
 arch/arm/kernel/process.c                         |   13 +++++++++++--
 arch/arm/mach-clps711x/include/mach/system.h      |    2 +-
 arch/arm/mach-ebsa110/include/mach/system.h       |    2 +-
 arch/arm/mach-footbridge/include/mach/system.h    |    2 +-
 arch/arm/mach-iop32x/include/mach/system.h        |    2 +-
 arch/arm/mach-iop33x/include/mach/system.h        |    2 +-
 arch/arm/mach-ixp4xx/include/mach/system.h        |    2 +-
 arch/arm/mach-ks8695/include/mach/system.h        |    2 +-
 arch/arm/mach-mmp/include/mach/system.h           |    4 ++--
 arch/arm/mach-mxs/system.c                        |    2 +-
 arch/arm/mach-pnx4008/include/mach/system.h       |    2 +-
 arch/arm/mach-pxa/reset.c                         |    2 +-
 arch/arm/mach-rpc/include/mach/system.h           |    2 +-
 arch/arm/mach-s3c2410/include/mach/system-reset.h |    4 ++--
 arch/arm/mach-s3c64xx/include/mach/system.h       |    2 +-
 arch/arm/mach-sa1100/include/mach/system.h        |    2 +-
 arch/arm/mach-shmobile/include/mach/system.h      |    2 +-
 arch/arm/mach-w90x900/include/mach/system.h       |    2 +-
 arch/arm/plat-mxc/system.c                        |    2 +-
 arch/arm/plat-spear/include/plat/system.h         |    2 +-
 21 files changed, 33 insertions(+), 23 deletions(-)

arch/arm/include/asm/system.h +1 -0

index 984014b..fe7de75 100644
@@ -101,6 +101,7 @@ extern int __pure cpu_architecture(void);
 extern void cpu_init(void);
 
 void arm_machine_restart(char mode, const char *cmd);
+void soft_restart(unsigned long);
 extern void (*arm_pm_restart)(char str, const char *cmd);
 
 #define UDBG_UNDEFINED	(1 << 0)

arch/arm/kernel/process.c +11 -2

index dca7971..52b4306 100644
@@ -92,7 +92,7 @@ static int __init hlt_setup(char *__unused)
 __setup("nohlt", nohlt_setup);
 __setup("hlt", hlt_setup);
 
-void arm_machine_restart(char mode, const char *cmd)
+void soft_restart(unsigned long addr)
 {
 	/* Disable interrupts first */
 	local_irq_disable();

@@ -114,7 +114,16 @@ void arm_machine_restart(char mode, const char *cmd)
 	/* Push out any further dirty data, and ensure cache is empty */
 	flush_cache_all();
 
-	/* Now call the architecture specific reboot code. */
+	cpu_reset(addr);
+}
+
+void arm_machine_restart(char mode, const char *cmd)
+{
+	/* Disable interrupts first */
+	local_irq_disable();
+	local_fiq_disable();
+
+	/* Call the architecture specific reboot code. */
 	arch_reset(mode, cmd);
 }
 

arch/arm/mach-clps711x/include/mach/system.h +1 -1

index f916cd7..6c11993 100644
@@ -34,7 +34,7 @@ static inline void arch_idle(void)
 
 static inline void arch_reset(char mode, const char *cmd)
 {
-	cpu_reset(0);
+	soft_restart(0);
 }
 
 #endif

arch/arm/mach-ebsa110/include/mach/system.h +1 -1

index 9a26245..0d5df72 100644
@@ -34,6 +34,6 @@ static inline void arch_idle(void)
 	asm volatile ("mcr p15, 0, ip, c15, c1, 2" : : : "cc");
 }
 
-#define arch_reset(mode, cmd)	cpu_reset(0x80000000)
+#define arch_reset(mode, cmd)	soft_restart(0x80000000)
 
 #endif

arch/arm/mach-footbridge/include/mach/system.h +1 -1

index 0b29315..249f895 100644
@@ -24,7 +24,7 @@ static inline void arch_reset(char mode, const char *cmd)
 		/*
 		 * Jump into the ROM
 		 */
-		cpu_reset(0x41000000);
+		soft_restart(0x41000000);
 	} else {
 		if (machine_is_netwinder()) {
 			/* open up the SuperIO chip

arch/arm/mach-iop32x/include/mach/system.h +1 -1

index a4b808f..4865a9b 100644
@@ -30,5 +30,5 @@ static inline void arch_reset(char mode, const char *cmd)
 	*IOP3XX_PCSR = 0x30;
 
 	/* Jump into ROM at address 0 */
-	cpu_reset(0);
+	soft_restart(0);
 }

arch/arm/mach-iop33x/include/mach/system.h +1 -1

index f192a34..86d1b20 100644
@@ -19,5 +19,5 @@ static inline void arch_reset(char mode, const char *cmd)
 	*IOP3XX_PCSR = 0x30;
 
 	/* Jump into ROM at address 0 */
-	cpu_reset(0);
+	soft_restart(0);
 }

arch/arm/mach-ixp4xx/include/mach/system.h +1 -1

index 54c0af7..24337d9 100644
@@ -26,7 +26,7 @@ static inline void arch_reset(char mode, const char *cmd)
 {
 	if ( 1 && mode == 's') {
 		/* Jump into ROM at address 0 */
-		cpu_reset(0);
+		soft_restart(0);
 	} else {
 		/* Use on-chip reset capability */
 

arch/arm/mach-ks8695/include/mach/system.h +1 -1

index fb1dda9..ceb19c9 100644
@@ -32,7 +32,7 @@ static void arch_reset(char mode, const char *cmd)
 	unsigned int reg;
 
 	if (mode == 's')
-		cpu_reset(0);
+		soft_restart(0);
 
 	/* disable timer0 */
 	reg = __raw_readl(KS8695_TMR_VA + KS8695_TMCON);

arch/arm/mach-mmp/include/mach/system.h +2 -2

index 1a8a25e..cb06379 100644
@@ -19,8 +19,8 @@ static inline void arch_idle(void)
 static inline void arch_reset(char mode, const char *cmd)
 {
 	if (cpu_is_pxa168())
-		cpu_reset(0xffff0000);
+		soft_restart(0xffff0000);
 	else
-		cpu_reset(0);
+		soft_restart(0);
 }
 #endif /* __ASM_MACH_SYSTEM_H */

arch/arm/mach-mxs/system.c +1 -1

index 20ec3bd..cab8836 100644
@@ -53,7 +53,7 @@ void arch_reset(char mode, const char *cmd)
 	mdelay(50);
 
 	/* We'll take a jump through zero as a poor second */
-	cpu_reset(0);
+	soft_restart(0);
 }
 
 static int __init mxs_arch_reset_init(void)

arch/arm/mach-pnx4008/include/mach/system.h +1 -1

index 5dda2bb..5d6384a 100644
@@ -32,7 +32,7 @@ static void arch_idle(void)
 
 static inline void arch_reset(char mode, const char *cmd)
 {
-	cpu_reset(0);
+	soft_restart(0);
 }
 
 #endif

arch/arm/mach-pxa/reset.c +1 -1

index 01e9d64..b8bcda1 100644
@@ -88,7 +88,7 @@ void arch_reset(char mode, const char *cmd)
 	switch (mode) {
 	case 's':
 		/* Jump into ROM at address 0 */
-		cpu_reset(0);
+		soft_restart(0);
 		break;
 	case 'g':
 		do_gpio_reset();

arch/arm/mach-rpc/include/mach/system.h +1 -1

index 45c7b93..a354f4d 100644
@@ -23,5 +23,5 @@ static inline void arch_reset(char mode, const char *cmd)
 	/*
 	 * Jump into the ROM
 	 */
-	cpu_reset(0);
+	soft_restart(0);
 }

arch/arm/mach-s3c2410/include/mach/system-reset.h +2 -2

index 6faadce..913893d 100644
@@ -19,7 +19,7 @@ static void
 arch_reset(char mode, const char *cmd)
 {
 	if (mode == 's') {
-		cpu_reset(0);
+		soft_restart(0);
 	}
 
 	if (s3c24xx_reset_hook)

@@ -28,5 +28,5 @@ arch_reset(char mode, const char *cmd)
 	arch_wdt_reset();
 
 	/* we'll take a jump through zero as a poor second */
-	cpu_reset(0);
+	soft_restart(0);
 }

arch/arm/mach-s3c64xx/include/mach/system.h +1 -1

index 2e58cb7..d8ca578 100644
@@ -24,7 +24,7 @@ static void arch_reset(char mode, const char *cmd)
 		arch_wdt_reset();
 
 	/* if all else fails, or mode was for soft, jump to 0 */
-	cpu_reset(0);
+	soft_restart(0);
 }
 
 #endif /* __ASM_ARCH_IRQ_H */

arch/arm/mach-sa1100/include/mach/system.h +1 -1

index ba9da9f..345d35b 100644
@@ -14,7 +14,7 @@ static inline void arch_reset(char mode, const char *cmd)
 {
 	if (mode == 's') {
 		/* Jump into ROM at address 0 */
-		cpu_reset(0);
+		soft_restart(0);
 	} else {
 		/* Use on-chip reset capability */
 		RSRR = RSRR_SWR;

arch/arm/mach-shmobile/include/mach/system.h +1 -1

index 76a687e..956ac18 100644
@@ -8,7 +8,7 @@ static inline void arch_idle(void)
 
 static inline void arch_reset(char mode, const char *cmd)
 {
-	cpu_reset(0);
+	soft_restart(0);
 }
 
 #endif

arch/arm/mach-w90x900/include/mach/system.h +1 -1

index ce228bd..68875a1 100644
@@ -33,7 +33,7 @@ static void arch_reset(char mode, const char *cmd)
 {
 	if (mode == 's') {
 		/* Jump into ROM at address 0 */
-		cpu_reset(0);
+		soft_restart(0);
 	} else {
 		__raw_writel(WTE | WTRE | WTCLK, WTCR);
 	}

arch/arm/plat-mxc/system.c +1 -1

index 9dad8dc..b1cfc6a 100644
@@ -70,7 +70,7 @@ void arch_reset(char mode, const char *cmd)
 	mdelay(50);
 
 	/* we'll take a jump through zero as a poor second */
-	cpu_reset(0);
+	soft_restart(0);
 }
 
 void mxc_arch_reset_init(void __iomem *base)

arch/arm/plat-spear/include/plat/system.h +1 -1

index a235fa0..1171f22 100644
@@ -31,7 +31,7 @@ static inline void arch_reset(char mode, const char *cmd)
 {
 	if (mode == 's') {
 		/* software reset, Jump into ROM at address 0 */
-		cpu_reset(0);
+		soft_restart(0);
 	} else {
 		/* hardware reset, Use on-chip reset capability */
 		sysctl_soft_reset((void __iomem *)VA_SPEAR_SYS_CTRL_BASE);

Signature · 7 lines

1.7.4.4


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Ack?

(If you're in the To: list I'm expecting a reply because this patch is touching something you're responsible for. Thanks.)

Quoted 334 lines

We only need to set the system up for a soft-restart if we're going to be doing a soft-restart. Provide a new function (soft_restart()) which does the setup and final call for this, and make platforms use it. Eliminate the call to setup_restart() from the default handler.

This means that platforms arch_reset() function is no longer called with the page tables prepared for a soft-restart, and caches will still be enabled.

Signed-off-by Russell King <[email protected]>

---
 arch/arm/include/asm/system.h                     |    1 +
 arch/arm/kernel/process.c                         |   13 +++++++++++--
 arch/arm/mach-clps711x/include/mach/system.h      |    2 +-
 arch/arm/mach-ebsa110/include/mach/system.h       |    2 +-
 arch/arm/mach-footbridge/include/mach/system.h    |    2 +-
 arch/arm/mach-iop32x/include/mach/system.h        |    2 +-
 arch/arm/mach-iop33x/include/mach/system.h        |    2 +-
 arch/arm/mach-ixp4xx/include/mach/system.h        |    2 +-
 arch/arm/mach-ks8695/include/mach/system.h        |    2 +-
 arch/arm/mach-mmp/include/mach/system.h           |    4 ++--
 arch/arm/mach-mxs/system.c                        |    2 +-
 arch/arm/mach-pnx4008/include/mach/system.h       |    2 +-
 arch/arm/mach-pxa/reset.c                         |    2 +-
 arch/arm/mach-rpc/include/mach/system.h           |    2 +-
 arch/arm/mach-s3c2410/include/mach/system-reset.h |    4 ++--
 arch/arm/mach-s3c64xx/include/mach/system.h       |    2 +-
 arch/arm/mach-sa1100/include/mach/system.h        |    2 +-
 arch/arm/mach-shmobile/include/mach/system.h      |    2 +-
 arch/arm/mach-w90x900/include/mach/system.h       |    2 +-
 arch/arm/plat-mxc/system.c                        |    2 +-
 arch/arm/plat-spear/include/plat/system.h         |    2 +-
 21 files changed, 33 insertions(+), 23 deletions(-)

arch/arm/include/asm/system.h +1 -0

index 984014b..fe7de75 100644
@@ -101,6 +101,7 @@ extern int __pure cpu_architecture(void);
 extern void cpu_init(void);
 
 void arm_machine_restart(char mode, const char *cmd);
+void soft_restart(unsigned long);
 extern void (*arm_pm_restart)(char str, const char *cmd);
 
 #define UDBG_UNDEFINED	(1 << 0)

arch/arm/kernel/process.c +11 -2

index dca7971..52b4306 100644
@@ -92,7 +92,7 @@ static int __init hlt_setup(char *__unused)
 __setup("nohlt", nohlt_setup);
 __setup("hlt", hlt_setup);
 
-void arm_machine_restart(char mode, const char *cmd)
+void soft_restart(unsigned long addr)
 {
 	/* Disable interrupts first */
 	local_irq_disable();

@@ -114,7 +114,16 @@ void arm_machine_restart(char mode, const char *cmd)
 	/* Push out any further dirty data, and ensure cache is empty */
 	flush_cache_all();
 
-	/* Now call the architecture specific reboot code. */
+	cpu_reset(addr);
+}
+
+void arm_machine_restart(char mode, const char *cmd)
+{
+	/* Disable interrupts first */
+	local_irq_disable();
+	local_fiq_disable();
+
+	/* Call the architecture specific reboot code. */
 	arch_reset(mode, cmd);
 }
 

arch/arm/mach-clps711x/include/mach/system.h +1 -1

index f916cd7..6c11993 100644
@@ -34,7 +34,7 @@ static inline void arch_idle(void)
 
 static inline void arch_reset(char mode, const char *cmd)
 {
-	cpu_reset(0);
+	soft_restart(0);
 }
 
 #endif

arch/arm/mach-ebsa110/include/mach/system.h +1 -1

index 9a26245..0d5df72 100644
@@ -34,6 +34,6 @@ static inline void arch_idle(void)
 	asm volatile ("mcr p15, 0, ip, c15, c1, 2" : : : "cc");
 }
 
-#define arch_reset(mode, cmd)	cpu_reset(0x80000000)
+#define arch_reset(mode, cmd)	soft_restart(0x80000000)
 
 #endif

arch/arm/mach-footbridge/include/mach/system.h +1 -1

index 0b29315..249f895 100644
@@ -24,7 +24,7 @@ static inline void arch_reset(char mode, const char *cmd)
 		/*
 		 * Jump into the ROM
 		 */
-		cpu_reset(0x41000000);
+		soft_restart(0x41000000);
 	} else {
 		if (machine_is_netwinder()) {
 			/* open up the SuperIO chip

arch/arm/mach-iop32x/include/mach/system.h +1 -1

index a4b808f..4865a9b 100644
@@ -30,5 +30,5 @@ static inline void arch_reset(char mode, const char *cmd)
 	*IOP3XX_PCSR = 0x30;
 
 	/* Jump into ROM at address 0 */
-	cpu_reset(0);
+	soft_restart(0);
 }

arch/arm/mach-iop33x/include/mach/system.h +1 -1

index f192a34..86d1b20 100644
@@ -19,5 +19,5 @@ static inline void arch_reset(char mode, const char *cmd)
 	*IOP3XX_PCSR = 0x30;
 
 	/* Jump into ROM at address 0 */
-	cpu_reset(0);
+	soft_restart(0);
 }

arch/arm/mach-ixp4xx/include/mach/system.h +1 -1

index 54c0af7..24337d9 100644
@@ -26,7 +26,7 @@ static inline void arch_reset(char mode, const char *cmd)
 {
 	if ( 1 && mode == 's') {
 		/* Jump into ROM at address 0 */
-		cpu_reset(0);
+		soft_restart(0);
 	} else {
 		/* Use on-chip reset capability */
 

arch/arm/mach-ks8695/include/mach/system.h +1 -1

index fb1dda9..ceb19c9 100644
@@ -32,7 +32,7 @@ static void arch_reset(char mode, const char *cmd)
 	unsigned int reg;
 
 	if (mode == 's')
-		cpu_reset(0);
+		soft_restart(0);
 
 	/* disable timer0 */
 	reg = __raw_readl(KS8695_TMR_VA + KS8695_TMCON);

arch/arm/mach-mmp/include/mach/system.h +2 -2

index 1a8a25e..cb06379 100644
@@ -19,8 +19,8 @@ static inline void arch_idle(void)
 static inline void arch_reset(char mode, const char *cmd)
 {
 	if (cpu_is_pxa168())
-		cpu_reset(0xffff0000);
+		soft_restart(0xffff0000);
 	else
-		cpu_reset(0);
+		soft_restart(0);
 }
 #endif /* __ASM_MACH_SYSTEM_H */

arch/arm/mach-mxs/system.c +1 -1

index 20ec3bd..cab8836 100644
@@ -53,7 +53,7 @@ void arch_reset(char mode, const char *cmd)
 	mdelay(50);
 
 	/* We'll take a jump through zero as a poor second */
-	cpu_reset(0);
+	soft_restart(0);
 }
 
 static int __init mxs_arch_reset_init(void)

arch/arm/mach-pnx4008/include/mach/system.h +1 -1

index 5dda2bb..5d6384a 100644
@@ -32,7 +32,7 @@ static void arch_idle(void)
 
 static inline void arch_reset(char mode, const char *cmd)
 {
-	cpu_reset(0);
+	soft_restart(0);
 }
 
 #endif

arch/arm/mach-pxa/reset.c +1 -1

index 01e9d64..b8bcda1 100644
@@ -88,7 +88,7 @@ void arch_reset(char mode, const char *cmd)
 	switch (mode) {
 	case 's':
 		/* Jump into ROM at address 0 */
-		cpu_reset(0);
+		soft_restart(0);
 		break;
 	case 'g':
 		do_gpio_reset();

arch/arm/mach-rpc/include/mach/system.h +1 -1

index 45c7b93..a354f4d 100644
@@ -23,5 +23,5 @@ static inline void arch_reset(char mode, const char *cmd)
 	/*
 	 * Jump into the ROM
 	 */
-	cpu_reset(0);
+	soft_restart(0);
 }

arch/arm/mach-s3c2410/include/mach/system-reset.h +2 -2

index 6faadce..913893d 100644
@@ -19,7 +19,7 @@ static void
 arch_reset(char mode, const char *cmd)
 {
 	if (mode == 's') {
-		cpu_reset(0);
+		soft_restart(0);
 	}
 
 	if (s3c24xx_reset_hook)

@@ -28,5 +28,5 @@ arch_reset(char mode, const char *cmd)
 	arch_wdt_reset();
 
 	/* we'll take a jump through zero as a poor second */
-	cpu_reset(0);
+	soft_restart(0);
 }

arch/arm/mach-s3c64xx/include/mach/system.h +1 -1

index 2e58cb7..d8ca578 100644
@@ -24,7 +24,7 @@ static void arch_reset(char mode, const char *cmd)
 		arch_wdt_reset();
 
 	/* if all else fails, or mode was for soft, jump to 0 */
-	cpu_reset(0);
+	soft_restart(0);
 }
 
 #endif /* __ASM_ARCH_IRQ_H */

arch/arm/mach-sa1100/include/mach/system.h +1 -1

index ba9da9f..345d35b 100644
@@ -14,7 +14,7 @@ static inline void arch_reset(char mode, const char *cmd)
 {
 	if (mode == 's') {
 		/* Jump into ROM at address 0 */
-		cpu_reset(0);
+		soft_restart(0);
 	} else {
 		/* Use on-chip reset capability */
 		RSRR = RSRR_SWR;

arch/arm/mach-shmobile/include/mach/system.h +1 -1

index 76a687e..956ac18 100644
@@ -8,7 +8,7 @@ static inline void arch_idle(void)
 
 static inline void arch_reset(char mode, const char *cmd)
 {
-	cpu_reset(0);
+	soft_restart(0);
 }
 
 #endif

arch/arm/mach-w90x900/include/mach/system.h +1 -1

index ce228bd..68875a1 100644
@@ -33,7 +33,7 @@ static void arch_reset(char mode, const char *cmd)
 {
 	if (mode == 's') {
 		/* Jump into ROM at address 0 */
-		cpu_reset(0);
+		soft_restart(0);
 	} else {
 		__raw_writel(WTE | WTRE | WTCLK, WTCR);
 	}

arch/arm/plat-mxc/system.c +1 -1

index 9dad8dc..b1cfc6a 100644
@@ -70,7 +70,7 @@ void arch_reset(char mode, const char *cmd)
 	mdelay(50);
 
 	/* we'll take a jump through zero as a poor second */
-	cpu_reset(0);
+	soft_restart(0);
 }
 
 void mxc_arch_reset_init(void __iomem *base)

arch/arm/plat-spear/include/plat/system.h +1 -1

index a235fa0..1171f22 100644
@@ -31,7 +31,7 @@ static inline void arch_reset(char mode, const char *cmd)
 {
 	if (mode == 's') {
 		/* software reset, Jump into ROM at address 0 */
-		cpu_reset(0);
+		soft_restart(0);
 	} else {
 		/* hardware reset, Use on-chip reset capability */
 		sysctl_soft_reset((void __iomem *)VA_SPEAR_SYS_CTRL_BASE);

Signature · 7 lines

1.7.4.4


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Quoted 11 lines

We only need to set the system up for a soft-restart if we're going to be doing a soft-restart. Provide a new function (soft_restart()) which does the setup and final call for this, and make platforms use it. Eliminate the call to setup_restart() from the default handler.

This means that platforms arch_reset() function is no longer called with the page tables prepared for a soft-restart, and caches will still be enabled.

Signed-off-by Russell King <[email protected]>

---

arch/arm/plat-spear/include/plat/system.h +0 -0

Quoted 4 lines

index a235fa0..1171f22 100644

arch/arm/plat-spear/include/plat/system.h +0 -0

@@ -31,7 +31,7 @@ static inline void arch_reset(char mode, const char *cmd)

arch/arm/plat-spear/include/plat/system.h static inline void arch_reset(char mode, const char *cmd) · line 37

Quoted 8 lines

arch/arm/plat-spear/include/plat/system.h +1 -1

 {
      if (mode == 's') {
              /* software reset, Jump into ROM at address 0 */
-             cpu_reset(0);
+             soft_restart(0);
      } else {
              /* hardware reset, Use on-chip reset capability */
              sysctl_soft_reset((void __iomem *)VA_SPEAR_SYS_CTRL_BASE);

Quoted 6 lines

We only need to set the system up for a soft-restart if we're going to be doing a soft-restart. Provide a new function (soft_restart()) which does the setup and final call for this, and make platforms use it. Eliminate the call to setup_restart() from the default handler.

 arch/arm/mach-ixp4xx/include/mach/system.h        |    2 +-

Ack?

(If you're in the To: list I'm expecting a reply because this patch is touching something you're responsible for. Thanks.)

Ack?

(If you're in the To: list I'm expecting a reply because this patch is touching something you're responsible for. Thanks.)

Quoted 10 lines · Russell King - ARM Linux

We only need to set the system up for a soft-restart if we're going to be doing a soft-restart. Provide a new function (soft_restart()) which does the setup and final call for this, and make platforms use it. Eliminate the call to setup_restart() from the default handler.

This means that platforms arch_reset() function is no longer called with the page tables prepared for a soft-restart, and caches will still be enabled.

Signed-off-by Russell King <[email protected]>

Quoted 24 lines

---
 arch/arm/include/asm/system.h                     |    1 +
 arch/arm/kernel/process.c                         |   13 +++++++++++--
 arch/arm/mach-clps711x/include/mach/system.h      |    2 +-
 arch/arm/mach-ebsa110/include/mach/system.h       |    2 +-
 arch/arm/mach-footbridge/include/mach/system.h    |    2 +-
 arch/arm/mach-iop32x/include/mach/system.h        |    2 +-
 arch/arm/mach-iop33x/include/mach/system.h        |    2 +-
 arch/arm/mach-ixp4xx/include/mach/system.h        |    2 +-
 arch/arm/mach-ks8695/include/mach/system.h        |    2 +-
 arch/arm/mach-mmp/include/mach/system.h           |    4 ++--
 arch/arm/mach-mxs/system.c                        |    2 +-
 arch/arm/mach-pnx4008/include/mach/system.h       |    2 +-
 arch/arm/mach-pxa/reset.c                         |    2 +-
 arch/arm/mach-rpc/include/mach/system.h           |    2 +-
 arch/arm/mach-s3c2410/include/mach/system-reset.h |    4 ++--
 arch/arm/mach-s3c64xx/include/mach/system.h       |    2 +-
 arch/arm/mach-sa1100/include/mach/system.h        |    2 +-
 arch/arm/mach-shmobile/include/mach/system.h      |    2 +-
 arch/arm/mach-w90x900/include/mach/system.h       |    2 +-
 arch/arm/plat-mxc/system.c                        |    2 +-
 arch/arm/plat-spear/include/plat/system.h         |    2 +-
 21 files changed, 33 insertions(+), 23 deletions(-)

Ack?

(If you're in the To: list I'm expecting a reply because this patch is touching something you're responsible for. Thanks.)

Quoted 10 lines · Russell King - ARM Linux

We only need to set the system up for a soft-restart if we're going to be doing a soft-restart. Provide a new function (soft_restart()) which does the setup and final call for this, and make platforms use it. Eliminate the call to setup_restart() from the default handler.

This means that platforms arch_reset() function is no longer called with the page tables prepared for a soft-restart, and caches will still be enabled.

Signed-off-by Russell King <[email protected]>

Ack?

(If you're in the To: list I'm expecting a reply because this patch is touching something you're responsible for. Thanks.)

Quoted 10 lines · Russell King - ARM Linux

We only need to set the system up for a soft-restart if we're going to be doing a soft-restart. Provide a new function (soft_restart()) which does the setup and final call for this, and make platforms use it. Eliminate the call to setup_restart() from the default handler.

This means that platforms arch_reset() function is no longer called with the page tables prepared for a soft-restart, and caches will still be enabled.

Signed-off-by Russell King <[email protected]>

Quoted 24 lines

---
 arch/arm/include/asm/system.h                     |    1 +
 arch/arm/kernel/process.c                         |   13 +++++++++++--
 arch/arm/mach-clps711x/include/mach/system.h      |    2 +-
 arch/arm/mach-ebsa110/include/mach/system.h       |    2 +-
 arch/arm/mach-footbridge/include/mach/system.h    |    2 +-
 arch/arm/mach-iop32x/include/mach/system.h        |    2 +-
 arch/arm/mach-iop33x/include/mach/system.h        |    2 +-
 arch/arm/mach-ixp4xx/include/mach/system.h        |    2 +-
 arch/arm/mach-ks8695/include/mach/system.h        |    2 +-
 arch/arm/mach-mmp/include/mach/system.h           |    4 ++--
 arch/arm/mach-mxs/system.c                        |    2 +-
 arch/arm/mach-pnx4008/include/mach/system.h       |    2 +-
 arch/arm/mach-pxa/reset.c                         |    2 +-
 arch/arm/mach-rpc/include/mach/system.h           |    2 +-
 arch/arm/mach-s3c2410/include/mach/system-reset.h |    4 ++--
 arch/arm/mach-s3c64xx/include/mach/system.h       |    2 +-
 arch/arm/mach-sa1100/include/mach/system.h        |    2 +-
 arch/arm/mach-shmobile/include/mach/system.h      |    2 +-
 arch/arm/mach-w90x900/include/mach/system.h       |    2 +-
 arch/arm/plat-mxc/system.c                        |    2 +-
 arch/arm/plat-spear/include/plat/system.h         |    2 +-
 21 files changed, 33 insertions(+), 23 deletions(-)

Review

Quoted 1 line

(quoted diff) +0 -0

b/arch/arm/include/asm/system.h

Quoted 19 lines

index 984014b..fe7de75 100644

arch/arm/include/asm/system.h +1 -0

@@ -101,6 +101,7 @@ extern int __pure cpu_architecture(void);
 extern void cpu_init(void);
 
 void arm_machine_restart(char mode, const char *cmd);
+void soft_restart(unsigned long);
 extern void (*arm_pm_restart)(char str, const char *cmd);
 
 #define UDBG_UNDEFINED	(1 << 0)

arch/arm/kernel/process.c +0 -0

index dca7971..52b4306 100644
@@ -92,7 +92,7 @@ static int __init hlt_setup(char *__unused)
 __setup("nohlt", nohlt_setup);
 __setup("hlt", hlt_setup);
 

arch/arm/kernel/process.c void arm_machine_restart(char mode, const char

Quoted 6 lines

arch/arm/kernel/process.c +1 -1

-void arm_machine_restart(char mode, const char *cmd)
+void soft_restart(unsigned long addr)
 {
 	/* Disable interrupts first */
 	local_irq_disable();

@@ -114,7 +114,16 @@ void arm_machine_restart(char mode, const char

Review

Quoted 18 lines

arch/arm/kernel/process.c +10 -1

 	/* Push out any further dirty data, and ensure cache is empty */
 	flush_cache_all();
 
-	/* Now call the architecture specific reboot code. */
+	cpu_reset(addr);
+}
+
+void arm_machine_restart(char mode, const char *cmd)
+{
+	/* Disable interrupts first */
+	local_irq_disable();
+	local_fiq_disable();
+
+	/* Call the architecture specific reboot code. */
 	arch_reset(mode, cmd);
 }
 

(quoted diff) +0 -0

b/arch/arm/mach-clps711x/include/mach/system.h

Review

Quoted 13 lines

index f916cd7..6c11993 100644

arch/arm/mach-clps711x/include/mach/system.h +1 -1

@@ -34,7 +34,7 @@ static inline void arch_idle(void)
 
 static inline void arch_reset(char mode, const char *cmd)
 {
-	cpu_reset(0);
+	soft_restart(0);
 }
 
 #endif

(quoted diff) +0 -0

b/arch/arm/mach-ebsa110/include/mach/system.h

Review

Quoted 12 lines

index 9a26245..0d5df72 100644

arch/arm/mach-ebsa110/include/mach/system.h +1 -1

@@ -34,6 +34,6 @@ static inline void arch_idle(void)
 	asm volatile ("mcr p15, 0, ip, c15, c1, 2" : : : "cc");
 }
 
-#define arch_reset(mode, cmd)	cpu_reset(0x80000000)
+#define arch_reset(mode, cmd)	soft_restart(0x80000000)
 
 #endif

(quoted diff) +0 -0

b/arch/arm/mach-footbridge/include/mach/system.h

arch/arm/mach-footbridge/include/mach/system.h static inline void arch_reset(char mode, const char

Quoted 4 lines

index 0b29315..249f895 100644

arch/arm/mach-footbridge/include/mach/system.h +0 -0

@@ -24,7 +24,7 @@ static inline void arch_reset(char mode, const char

*cmd)

arch/arm/mach-

Quoted 9 lines

arch/arm/mach-footbridge/include/mach/system.h +1 -1

 		/*
 		 * Jump into the ROM
 		 */
-		cpu_reset(0x41000000);
+		soft_restart(0x41000000);
 	} else {
 		if (machine_is_netwinder()) {
 			/* open up the SuperIO chip

arch/arm/mach- renamed from arch/arm/mach-iop32x/include/mach/system.h +0 -0

iop32x/include/mach/system.h

arch/arm/mach-iop32x/include/mach/system.h static inline void arch_reset(char mode, const char

Quoted 4 lines

index a4b808f..4865a9b 100644

arch/arm/mach-iop32x/include/mach/system.h +0 -0

@@ -30,5 +30,5 @@ static inline void arch_reset(char mode, const char

*cmd)

arch/arm/mach-

Quoted 7 lines

arch/arm/mach-iop32x/include/mach/system.h +1 -1

 	*IOP3XX_PCSR = 0x30;
 
 	/* Jump into ROM at address 0 */
-	cpu_reset(0);
+	soft_restart(0);
 }

arch/arm/mach- renamed from arch/arm/mach-iop33x/include/mach/system.h +0 -0

iop33x/include/mach/system.h

arch/arm/mach-iop33x/include/mach/system.h static inline void arch_reset(char mode, const char

Quoted 4 lines

index f192a34..86d1b20 100644

arch/arm/mach-iop33x/include/mach/system.h +0 -0

@@ -19,5 +19,5 @@ static inline void arch_reset(char mode, const char

*cmd)

arch/arm/mach-

Quoted 7 lines

arch/arm/mach-iop33x/include/mach/system.h +1 -1

 	*IOP3XX_PCSR = 0x30;
 
 	/* Jump into ROM at address 0 */
-	cpu_reset(0);
+	soft_restart(0);
 }

arch/arm/mach- renamed from arch/arm/mach-ixp4xx/include/mach/system.h +0 -0

ixp4xx/include/mach/system.h

arch/arm/mach-ixp4xx/include/mach/system.h static inline void arch_reset(char mode, const char

Quoted 4 lines

index 54c0af7..24337d9 100644

arch/arm/mach-ixp4xx/include/mach/system.h +0 -0

@@ -26,7 +26,7 @@ static inline void arch_reset(char mode, const char

*cmd)

arch/arm/mach-

Quoted 9 lines

arch/arm/mach-ixp4xx/include/mach/system.h +1 -1

 {
 	if ( 1 && mode == 's') {
 		/* Jump into ROM at address 0 */
-		cpu_reset(0);
+		soft_restart(0);
 	} else {
 		/* Use on-chip reset capability */
 

arch/arm/mach- renamed from arch/arm/mach-ks8695/include/mach/system.h +0 -0

ks8695/include/mach/system.h

arch/arm/mach-

Quoted 13 lines

index fb1dda9..ceb19c9 100644

arch/arm/mach-ks8695/include/mach/system.h +1 -1

@@ -32,7 +32,7 @@ static void arch_reset(char mode, const char *cmd)
 	unsigned int reg;
 
 	if (mode == 's')
-		cpu_reset(0);
+		soft_restart(0);
 
 	/* disable timer0 */
 	reg = __raw_readl(KS8695_TMR_VA + KS8695_TMCON);

arch/arm/mach- renamed from arch/arm/mach-mmp/include/mach/system.h +0 -0

mmp/include/mach/system.h

Review

Quoted 28 lines

index 1a8a25e..cb06379 100644

arch/arm/mach-mmp/include/mach/system.h +2 -2

@@ -19,8 +19,8 @@ static inline void arch_idle(void)
 static inline void arch_reset(char mode, const char *cmd)
 {
 	if (cpu_is_pxa168())
-		cpu_reset(0xffff0000);
+		soft_restart(0xffff0000);
 	else
-		cpu_reset(0);
+		soft_restart(0);
 }
 #endif /* __ASM_MACH_SYSTEM_H */

arch/arm/mach-mxs/system.c +1 -1

index 20ec3bd..cab8836 100644
@@ -53,7 +53,7 @@ void arch_reset(char mode, const char *cmd)
 	mdelay(50);
 
 	/* We'll take a jump through zero as a poor second */
-	cpu_reset(0);
+	soft_restart(0);
 }
 
 static int __init mxs_arch_reset_init(void)

(quoted diff) +0 -0

b/arch/arm/mach-pnx4008/include/mach/system.h

arch/arm/mach-

Quoted 26 lines

index 5dda2bb..5d6384a 100644

arch/arm/mach-pnx4008/include/mach/system.h +1 -1

@@ -32,7 +32,7 @@ static void arch_idle(void)
 
 static inline void arch_reset(char mode, const char *cmd)
 {
-	cpu_reset(0);
+	soft_restart(0);
 }
 
 #endif

arch/arm/mach-pxa/reset.c +1 -1

index 01e9d64..b8bcda1 100644
@@ -88,7 +88,7 @@ void arch_reset(char mode, const char *cmd)
 	switch (mode) {
 	case 's':
 		/* Jump into ROM at address 0 */
-		cpu_reset(0);
+		soft_restart(0);
 		break;
 	case 'g':
 		do_gpio_reset();

arch/arm/mach- renamed from arch/arm/mach-rpc/include/mach/system.h +0 -0

rpc/include/mach/system.h

arch/arm/mach-rpc/include/mach/system.h static inline void arch_reset(char mode, const char

Quoted 4 lines

index 45c7b93..a354f4d 100644

arch/arm/mach-rpc/include/mach/system.h +0 -0

@@ -23,5 +23,5 @@ static inline void arch_reset(char mode, const char

*cmd)

Review

Quoted 7 lines

arch/arm/mach-rpc/include/mach/system.h +1 -1

 	/*
 	 * Jump into the ROM
 	 */
-	cpu_reset(0);
+	soft_restart(0);
 }

(quoted diff) +0 -0

b/arch/arm/mach-s3c2410/include/mach/system-reset.h

Review

Quoted 20 lines

index 6faadce..913893d 100644

arch/arm/mach-s3c2410/include/mach/system-reset.h +2 -2

@@ -19,7 +19,7 @@ static void
 arch_reset(char mode, const char *cmd)
 {
 	if (mode == 's') {
-		cpu_reset(0);
+		soft_restart(0);
 	}
 
 	if (s3c24xx_reset_hook)

@@ -28,5 +28,5 @@ arch_reset(char mode, const char *cmd)
 	arch_wdt_reset();
 
 	/* we'll take a jump through zero as a poor second */
-	cpu_reset(0);
+	soft_restart(0);
 }

(quoted diff) +0 -0

b/arch/arm/mach-s3c64xx/include/mach/system.h

arch/arm/mach-

Quoted 13 lines

index 2e58cb7..d8ca578 100644

arch/arm/mach-s3c64xx/include/mach/system.h +1 -1

@@ -24,7 +24,7 @@ static void arch_reset(char mode, const char *cmd)
 		arch_wdt_reset();
 
 	/* if all else fails, or mode was for soft, jump to 0 */
-	cpu_reset(0);
+	soft_restart(0);
 }
 
 #endif /* __ASM_ARCH_IRQ_H */

arch/arm/mach- renamed from arch/arm/mach-sa1100/include/mach/system.h +0 -0

sa1100/include/mach/system.h

arch/arm/mach-sa1100/include/mach/system.h static inline void arch_reset(char mode, const char

Quoted 4 lines

index ba9da9f..345d35b 100644

arch/arm/mach-sa1100/include/mach/system.h +0 -0

@@ -14,7 +14,7 @@ static inline void arch_reset(char mode, const char

*cmd)

Review

Quoted 9 lines

arch/arm/mach-sa1100/include/mach/system.h +1 -1

 {
 	if (mode == 's') {
 		/* Jump into ROM at address 0 */
-		cpu_reset(0);
+		soft_restart(0);
 	} else {
 		/* Use on-chip reset capability */
 		RSRR = RSRR_SWR;

(quoted diff) +0 -0

b/arch/arm/mach-shmobile/include/mach/system.h

Review

Quoted 13 lines

index 76a687e..956ac18 100644

arch/arm/mach-shmobile/include/mach/system.h +1 -1

@@ -8,7 +8,7 @@ static inline void arch_idle(void)
 
 static inline void arch_reset(char mode, const char *cmd)
 {
-	cpu_reset(0);
+	soft_restart(0);
 }
 
 #endif

(quoted diff) +0 -0

b/arch/arm/mach-w90x900/include/mach/system.h

arch/arm/plat-

Quoted 26 lines

index ce228bd..68875a1 100644

arch/arm/mach-w90x900/include/mach/system.h +1 -1

@@ -33,7 +33,7 @@ static void arch_reset(char mode, const char *cmd)
 {
 	if (mode == 's') {
 		/* Jump into ROM at address 0 */
-		cpu_reset(0);
+		soft_restart(0);
 	} else {
 		__raw_writel(WTE | WTRE | WTCLK, WTCR);
 	}

arch/arm/plat-mxc/system.c +1 -1

index 9dad8dc..b1cfc6a 100644
@@ -70,7 +70,7 @@ void arch_reset(char mode, const char *cmd)
 	mdelay(50);
 
 	/* we'll take a jump through zero as a poor second */
-	cpu_reset(0);
+	soft_restart(0);
 }
 
 void mxc_arch_reset_init(void __iomem *base)

arch/arm/plat- renamed from arch/arm/plat-spear/include/plat/system.h +0 -0

spear/include/plat/system.h

arch/arm/plat-spear/include/plat/system.h static inline void arch_reset(char mode, const char

Quoted 4 lines

index a235fa0..1171f22 100644

arch/arm/plat-spear/include/plat/system.h +0 -0

@@ -31,7 +31,7 @@ static inline void arch_reset(char mode, const char

*cmd)

Quoted 12 lines

arch/arm/plat-spear/include/plat/system.h +1 -2

 {
 	if (mode == 's') {
 		/* software reset, Jump into ROM at address 0 */
-		cpu_reset(0);
+		soft_restart(0);
 	} else {
 		/* hardware reset, Use on-chip reset capability */
 		sysctl_soft_reset((void __iomem *)VA_SPEAR_SYS_CTRL_BASE);
--

1.7.4.4

Quoted 4 lines

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Quoted 16 lines · Russell King - ARM Linux

Ack?

(If you're in the To: list I'm expecting a reply because this patch is touching something you're responsible for. Thanks.)

Quoted 9 lines · Russell King - ARM Linux

We only need to set the system up for a soft-restart if we're going to be doing a soft-restart. Provide a new function (soft_restart()) which does the setup and final call for this, and make platforms use it. Eliminate the call to setup_restart() from the default handler.

This means that platforms arch_reset() function is no longer called with the page tables prepared for a soft-restart, and caches will still be enabled.

Quoted 1 line

Quoted 1 line

Signed-off-by Russell King <[email protected]>

Sorry for late response...

For Samsung stuff:

Acked-by Kukjin Kim <[email protected]>

Quoted 8 lines · Kukjin Kim

Quoted 7 lines · Russell King - ARM Linux

Ack?

(If you're in the To: list I'm expecting a reply because this patch is touching something you're responsible for. Thanks.)

On Sun, Nov 06, 2011 at 05:33:35PM +0000, Russell King - ARM Linux

Quoted 1 line · wrote:

Quoted 1 line

Quoted 1 line

We only need to set the system up for a soft-restart if we're going

to

Quoted 1 line

Quoted 1 line

Quoted 1 line

be doing a soft-restart. Provide a new function (soft_restart())

which

Quoted 4 lines

Quoted 4 lines

Quoted 4 lines

does the setup and final call for this, and make platforms use it. Eliminate the call to setup_restart() from the default handler.

This means that platforms arch_reset() function is no longer called

with

Quoted 1 line

Quoted 1 line

Quoted 1 line

the page tables prepared for a soft-restart, and caches will still

be

Quoted 4 lines

Quoted 3 lines

Quoted 3 lines

enabled.

Signed-off-by Russell King <[email protected]>

Quoted 4 lines

Sorry for late response...

For Samsung stuff:

Acked-by Kukjin Kim <[email protected]>

Too late, it's now part of devel-stable so I can't accept any more acks for this. Sorry.

We only need to set the system up for a soft-restart if we're going to be doing a soft-restart. ?Provide a new function (soft_restart()) which does the setup and final call for this, and make platforms use it. Eliminate the call to setup_restart() from the default handler.

This means that platforms arch_reset() function is no longer called with the page tables prepared for a soft-restart, and caches will still be enabled.

Signed-off-by Russell King <[email protected]>

---

?arch/arm/include/asm/system.h ? ? ? ? ? ? ? ? ? ? | ? ?1 +
?arch/arm/kernel/process.c ? ? ? ? ? ? ? ? ? ? ? ? | ? 13 +++++++++++--
?arch/arm/mach-clps711x/include/mach/system.h ? ? ?| ? ?2 +-
?arch/arm/mach-ebsa110/include/mach/system.h ? ? ? | ? ?2 +-
?arch/arm/mach-footbridge/include/mach/system.h ? ?| ? ?2 +-
?arch/arm/mach-iop32x/include/mach/system.h ? ? ? ?| ? ?2 +-
?arch/arm/mach-iop33x/include/mach/system.h ? ? ? ?| ? ?2 +-
?arch/arm/mach-ixp4xx/include/mach/system.h ? ? ? ?| ? ?2 +-
?arch/arm/mach-ks8695/include/mach/system.h ? ? ? ?| ? ?2 +-
?arch/arm/mach-mmp/include/mach/system.h ? ? ? ? ? | ? ?4 ++--
?arch/arm/mach-mxs/system.c ? ? ? ? ? ? ? ? ? ? ? ?| ? ?2 +-
?arch/arm/mach-pnx4008/include/mach/system.h ? ? ? | ? ?2 +-
?arch/arm/mach-pxa/reset.c ? ? ? ? ? ? ? ? ? ? ? ? | ? ?2 +-
?arch/arm/mach-rpc/include/mach/system.h ? ? ? ? ? | ? ?2 +-
?arch/arm/mach-s3c2410/include/mach/system-reset.h | ? ?4 ++--
?arch/arm/mach-s3c64xx/include/mach/system.h ? ? ? | ? ?2 +-
?arch/arm/mach-sa1100/include/mach/system.h ? ? ? ?| ? ?2 +-
?arch/arm/mach-shmobile/include/mach/system.h ? ? ?| ? ?2 +-
?arch/arm/mach-w90x900/include/mach/system.h ? ? ? | ? ?2 +-
?arch/arm/plat-mxc/system.c ? ? ? ? ? ? ? ? ? ? ? ?| ? ?2 +-
?arch/arm/plat-spear/include/plat/system.h ? ? ? ? | ? ?2 +-

?21 files changed, 33 insertions(+), 23 deletions(-)

arch/arm/include/asm/system.h +1 -0

index 984014b..fe7de75 100644
@@ -101,6 +101,7 @@ extern int __pure cpu_architecture(void);
 ?extern void cpu_init(void);
 
 ?void arm_machine_restart(char mode, const char *cmd);
+void soft_restart(unsigned long);
 ?extern void (*arm_pm_restart)(char str, const char *cmd);
 
 ?#define UDBG_UNDEFINED (1 << 0)

arch/arm/kernel/process.c +1 -1

index dca7971..52b4306 100644
@@ -92,7 +92,7 @@ static int __init hlt_setup(char *__unused)
 ?__setup("nohlt", nohlt_setup);
 ?__setup("hlt", hlt_setup);
 
-void arm_machine_restart(char mode, const char *cmd)
+void soft_restart(unsigned long addr)
 ?{

? ? ? ?/* Disable interrupts first */
? ? ? ?local_irq_disable();

arch/arm/kernel/process.c +0 -0

@@ -114,7 +114,16 @@ void arm_machine_restart(char mode, const char *cmd)

? ? ? ?/* Push out any further dirty data, and ensure cache is empty */ ? ? ? ?flush_cache_all();

- ? ? ? /* Now call the architecture specific reboot code. */
+ ? ? ? cpu_reset(addr);

arch/arm/kernel/process.c +9 -0

+}
+
+void arm_machine_restart(char mode, const char *cmd)
+{
+ ? ? ? /* Disable interrupts first */
+ ? ? ? local_irq_disable();
+ ? ? ? local_fiq_disable();
+
+ ? ? ? /* Call the architecture specific reboot code. */

? ? ? ?arch_reset(mode, cmd);
?}

arch/arm/mach-clps711x/include/mach/system.h +1 -1

index f916cd7..6c11993 100644
@@ -34,7 +34,7 @@ static inline void arch_idle(void)
 
 ?static inline void arch_reset(char mode, const char *cmd)
 ?{
- ? ? ? cpu_reset(0);
+ ? ? ? soft_restart(0);
 ?}
 

?#endif

arch/arm/mach-ebsa110/include/mach/system.h +1 -1

index 9a26245..0d5df72 100644
@@ -34,6 +34,6 @@ static inline void arch_idle(void)
 ? ? ? ?asm volatile ("mcr p15, 0, ip, c15, c1, 2" : : : "cc");
 ?}
 
-#define arch_reset(mode, cmd) ?cpu_reset(0x80000000)
+#define arch_reset(mode, cmd) ?soft_restart(0x80000000)
 

?#endif

arch/arm/mach-footbridge/include/mach/system.h +0 -0

index 0b29315..249f895 100644
@@ -24,7 +24,7 @@ static inline void arch_reset(char mode, const char *cmd)

? ? ? ? ? ? ? ?/*
? ? ? ? ? ? ? ? * Jump into the ROM
? ? ? ? ? ? ? ? */
- ? ? ? ? ? ? ? cpu_reset(0x41000000);
+ ? ? ? ? ? ? ? soft_restart(0x41000000); ? ? ? ?} else {
? ? ? ? ? ? ? ?if (machine_is_netwinder()) { ? ? ? ? ? ? ? ? ? ? ? ?/* open up the SuperIO chip

arch/arm/mach-iop32x/include/mach/system.h +0 -0

index a4b808f..4865a9b 100644
@@ -30,5 +30,5 @@ static inline void arch_reset(char mode, const char *cmd)
 ? ? ? ?*IOP3XX_PCSR = 0x30;
 

? ? ? ?/* Jump into ROM at address 0 */
- ? ? ? cpu_reset(0);
+ ? ? ? soft_restart(0);
?}

arch/arm/mach-iop33x/include/mach/system.h +0 -0

index f192a34..86d1b20 100644
@@ -19,5 +19,5 @@ static inline void arch_reset(char mode, const char *cmd)
 ? ? ? ?*IOP3XX_PCSR = 0x30;
 

? ? ? ?/* Jump into ROM at address 0 */
- ? ? ? cpu_reset(0);
+ ? ? ? soft_restart(0);
?}

arch/arm/mach-ixp4xx/include/mach/system.h +0 -0

index 54c0af7..24337d9 100644
@@ -26,7 +26,7 @@ static inline void arch_reset(char mode, const char *cmd)
 ?{
 ? ? ? ?if ( 1 && mode == 's') {

? ? ? ? ? ? ? ?/* Jump into ROM at address 0 */
- ? ? ? ? ? ? ? cpu_reset(0);
+ ? ? ? ? ? ? ? soft_restart(0);
? ? ? ?} else {
? ? ? ? ? ? ? ?/* Use on-chip reset capability */

arch/arm/mach-ks8695/include/mach/system.h +1 -1

index fb1dda9..ceb19c9 100644
@@ -32,7 +32,7 @@ static void arch_reset(char mode, const char *cmd)
 ? ? ? ?unsigned int reg;
 
 ? ? ? ?if (mode == 's')
- ? ? ? ? ? ? ? cpu_reset(0);
+ ? ? ? ? ? ? ? soft_restart(0);
 

? ? ? ?/* disable timer0 */
? ? ? ?reg = __raw_readl(KS8695_TMR_VA + KS8695_TMCON);

arch/arm/mach-mmp/include/mach/system.h +1 -1

index 1a8a25e..cb06379 100644
@@ -19,8 +19,8 @@ static inline void arch_idle(void)
 ?static inline void arch_reset(char mode, const char *cmd)
 ?{
 ? ? ? ?if (cpu_is_pxa168())
- ? ? ? ? ? ? ? cpu_reset(0xffff0000);
+ ? ? ? ? ? ? ? soft_restart(0xffff0000);

? ? ? ?else
- ? ? ? ? ? ? ? cpu_reset(0);
+ ? ? ? ? ? ? ? soft_restart(0);
?}
?#endif /* __ASM_MACH_SYSTEM_H */

arch/arm/mach-mxs/system.c +0 -0

index 20ec3bd..cab8836 100644
@@ -53,7 +53,7 @@ void arch_reset(char mode, const char *cmd)
 ? ? ? ?mdelay(50);
 

? ? ? ?/* We'll take a jump through zero as a poor second */
- ? ? ? cpu_reset(0);
+ ? ? ? soft_restart(0);
?}

?static int __init mxs_arch_reset_init(void)

arch/arm/mach-pnx4008/include/mach/system.h +1 -1

index 5dda2bb..5d6384a 100644
@@ -32,7 +32,7 @@ static void arch_idle(void)
 
 ?static inline void arch_reset(char mode, const char *cmd)
 ?{
- ? ? ? cpu_reset(0);
+ ? ? ? soft_restart(0);
 ?}
 

?#endif

arch/arm/mach-pxa/reset.c +0 -0

index 01e9d64..b8bcda1 100644
@@ -88,7 +88,7 @@ void arch_reset(char mode, const char *cmd)
 ? ? ? ?switch (mode) {

? ? ? ?case 's':
? ? ? ? ? ? ? ?/* Jump into ROM at address 0 */
- ? ? ? ? ? ? ? cpu_reset(0);
+ ? ? ? ? ? ? ? soft_restart(0);
? ? ? ? ? ? ? ?break;
? ? ? ?case 'g':
? ? ? ? ? ? ? ?do_gpio_reset();

arch/arm/mach-rpc/include/mach/system.h +0 -0

index 45c7b93..a354f4d 100644
@@ -23,5 +23,5 @@ static inline void arch_reset(char mode, const char *cmd)

? ? ? ?/*
? ? ? ? * Jump into the ROM
? ? ? ? */
- ? ? ? cpu_reset(0);
+ ? ? ? soft_restart(0);
?}

arch/arm/mach-s3c2410/include/mach/system-reset.h +1 -1

index 6faadce..913893d 100644
@@ -19,7 +19,7 @@ static void
 ?arch_reset(char mode, const char *cmd)
 ?{
 ? ? ? ?if (mode == 's') {
- ? ? ? ? ? ? ? cpu_reset(0);
+ ? ? ? ? ? ? ? soft_restart(0);
 ? ? ? ?}
 
 ? ? ? ?if (s3c24xx_reset_hook)

@@ -28,5 +28,5 @@ arch_reset(char mode, const char *cmd)
 ? ? ? ?arch_wdt_reset();
 

? ? ? ?/* we'll take a jump through zero as a poor second */
- ? ? ? cpu_reset(0);
+ ? ? ? soft_restart(0);
?}

arch/arm/mach-s3c64xx/include/mach/system.h +0 -0

index 2e58cb7..d8ca578 100644
@@ -24,7 +24,7 @@ static void arch_reset(char mode, const char *cmd)
 ? ? ? ? ? ? ? ?arch_wdt_reset();
 

? ? ? ?/* if all else fails, or mode was for soft, jump to 0 */
- ? ? ? cpu_reset(0);
+ ? ? ? soft_restart(0);
?}

?#endif /* __ASM_ARCH_IRQ_H */

arch/arm/mach-sa1100/include/mach/system.h +0 -0

index ba9da9f..345d35b 100644
@@ -14,7 +14,7 @@ static inline void arch_reset(char mode, const char *cmd)
 ?{
 ? ? ? ?if (mode == 's') {

? ? ? ? ? ? ? ?/* Jump into ROM at address 0 */
- ? ? ? ? ? ? ? cpu_reset(0);
+ ? ? ? ? ? ? ? soft_restart(0);
? ? ? ?} else {
? ? ? ? ? ? ? ?/* Use on-chip reset capability */
? ? ? ? ? ? ? ?RSRR = RSRR_SWR;

arch/arm/mach-shmobile/include/mach/system.h +1 -1

index 76a687e..956ac18 100644
@@ -8,7 +8,7 @@ static inline void arch_idle(void)
 
 ?static inline void arch_reset(char mode, const char *cmd)
 ?{
- ? ? ? cpu_reset(0);
+ ? ? ? soft_restart(0);
 ?}
 

?#endif

arch/arm/mach-w90x900/include/mach/system.h +0 -0

index ce228bd..68875a1 100644
@@ -33,7 +33,7 @@ static void arch_reset(char mode, const char *cmd)
 ?{
 ? ? ? ?if (mode == 's') {

? ? ? ? ? ? ? ?/* Jump into ROM at address 0 */
- ? ? ? ? ? ? ? cpu_reset(0);
+ ? ? ? ? ? ? ? soft_restart(0);
? ? ? ?} else {
? ? ? ? ? ? ? ?__raw_writel(WTE | WTRE | WTCLK, WTCR); ? ? ? ?}

arch/arm/plat-mxc/system.c +0 -0

index 9dad8dc..b1cfc6a 100644
@@ -70,7 +70,7 @@ void arch_reset(char mode, const char *cmd)
 ? ? ? ?mdelay(50);
 

? ? ? ?/* we'll take a jump through zero as a poor second */
- ? ? ? cpu_reset(0);
+ ? ? ? soft_restart(0);
?}

?void mxc_arch_reset_init(void __iomem *base)

arch/arm/plat-spear/include/plat/system.h +0 -0

index a235fa0..1171f22 100644
@@ -31,7 +31,7 @@ static inline void arch_reset(char mode, const char *cmd)
 ?{
 ? ? ? ?if (mode == 's') {

? ? ? ? ? ? ? ?/* software reset, Jump into ROM at address 0 */
- ? ? ? ? ? ? ? cpu_reset(0);
+ ? ? ? ? ? ? ? soft_restart(0);
? ? ? ?} else {
? ? ? ? ? ? ? ?/* hardware reset, Use on-chip reset capability */ ? ? ? ? ? ? ? ?sysctl_soft_reset((void __iomem *)VA_SPEAR_SYS_CTRL_BASE);

--
1.7.4.4

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

We only need to set the system up for a soft-restart if we're going to be doing a soft-restart. ?Provide a new function (soft_restart()) which does the setup and final call for this, and make platforms use it. Eliminate the call to setup_restart() from the default handler.

This means that platforms arch_reset() function is no longer called with the page tables prepared for a soft-restart, and caches will still be enabled.

Signed-off-by Russell King <[email protected]>

---

?arch/arm/include/asm/system.h ? ? ? ? ? ? ? ? ? ? | ? ?1 +
?arch/arm/kernel/process.c ? ? ? ? ? ? ? ? ? ? ? ? | ? 13 +++++++++++--
?arch/arm/mach-clps711x/include/mach/system.h ? ? ?| ? ?2 +-
?arch/arm/mach-ebsa110/include/mach/system.h ? ? ? | ? ?2 +-
?arch/arm/mach-footbridge/include/mach/system.h ? ?| ? ?2 +-
?arch/arm/mach-iop32x/include/mach/system.h ? ? ? ?| ? ?2 +-
?arch/arm/mach-iop33x/include/mach/system.h ? ? ? ?| ? ?2 +-
?arch/arm/mach-ixp4xx/include/mach/system.h ? ? ? ?| ? ?2 +-
?arch/arm/mach-ks8695/include/mach/system.h ? ? ? ?| ? ?2 +-
?arch/arm/mach-mmp/include/mach/system.h ? ? ? ? ? | ? ?4 ++--
?arch/arm/mach-mxs/system.c ? ? ? ? ? ? ? ? ? ? ? ?| ? ?2 +-
?arch/arm/mach-pnx4008/include/mach/system.h ? ? ? | ? ?2 +-
?arch/arm/mach-pxa/reset.c ? ? ? ? ? ? ? ? ? ? ? ? | ? ?2 +-
?arch/arm/mach-rpc/include/mach/system.h ? ? ? ? ? | ? ?2 +-
?arch/arm/mach-s3c2410/include/mach/system-reset.h | ? ?4 ++--
?arch/arm/mach-s3c64xx/include/mach/system.h ? ? ? | ? ?2 +-
?arch/arm/mach-sa1100/include/mach/system.h ? ? ? ?| ? ?2 +-
?arch/arm/mach-shmobile/include/mach/system.h ? ? ?| ? ?2 +-
?arch/arm/mach-w90x900/include/mach/system.h ? ? ? | ? ?2 +-
?arch/arm/plat-mxc/system.c ? ? ? ? ? ? ? ? ? ? ? ?| ? ?2 +-
?arch/arm/plat-spear/include/plat/system.h ? ? ? ? | ? ?2 +-

?21 files changed, 33 insertions(+), 23 deletions(-)

arch/arm/include/asm/system.h +1 -0

index 984014b..fe7de75 100644
@@ -101,6 +101,7 @@ extern int __pure cpu_architecture(void);
 ?extern void cpu_init(void);
 
 ?void arm_machine_restart(char mode, const char *cmd);
+void soft_restart(unsigned long);
 ?extern void (*arm_pm_restart)(char str, const char *cmd);
 
 ?#define UDBG_UNDEFINED (1 << 0)

arch/arm/kernel/process.c +1 -1

index dca7971..52b4306 100644
@@ -92,7 +92,7 @@ static int __init hlt_setup(char *__unused)
 ?__setup("nohlt", nohlt_setup);
 ?__setup("hlt", hlt_setup);
 
-void arm_machine_restart(char mode, const char *cmd)
+void soft_restart(unsigned long addr)
 ?{

? ? ? ?/* Disable interrupts first */
? ? ? ?local_irq_disable();

arch/arm/kernel/process.c +0 -0

@@ -114,7 +114,16 @@ void arm_machine_restart(char mode, const char *cmd)

? ? ? ?/* Push out any further dirty data, and ensure cache is empty */ ? ? ? ?flush_cache_all();

- ? ? ? /* Now call the architecture specific reboot code. */
+ ? ? ? cpu_reset(addr);

arch/arm/kernel/process.c +9 -0

+}
+
+void arm_machine_restart(char mode, const char *cmd)
+{
+ ? ? ? /* Disable interrupts first */
+ ? ? ? local_irq_disable();
+ ? ? ? local_fiq_disable();
+
+ ? ? ? /* Call the architecture specific reboot code. */

? ? ? ?arch_reset(mode, cmd);
?}

arch/arm/mach-clps711x/include/mach/system.h +1 -1

index f916cd7..6c11993 100644
@@ -34,7 +34,7 @@ static inline void arch_idle(void)
 
 ?static inline void arch_reset(char mode, const char *cmd)
 ?{
- ? ? ? cpu_reset(0);
+ ? ? ? soft_restart(0);
 ?}
 

?#endif

arch/arm/mach-ebsa110/include/mach/system.h +1 -1

index 9a26245..0d5df72 100644
@@ -34,6 +34,6 @@ static inline void arch_idle(void)
 ? ? ? ?asm volatile ("mcr p15, 0, ip, c15, c1, 2" : : : "cc");
 ?}
 
-#define arch_reset(mode, cmd) ?cpu_reset(0x80000000)
+#define arch_reset(mode, cmd) ?soft_restart(0x80000000)
 

?#endif

arch/arm/mach-footbridge/include/mach/system.h +0 -0

index 0b29315..249f895 100644
@@ -24,7 +24,7 @@ static inline void arch_reset(char mode, const char *cmd)

? ? ? ? ? ? ? ?/*
? ? ? ? ? ? ? ? * Jump into the ROM
? ? ? ? ? ? ? ? */
- ? ? ? ? ? ? ? cpu_reset(0x41000000);
+ ? ? ? ? ? ? ? soft_restart(0x41000000); ? ? ? ?} else {
? ? ? ? ? ? ? ?if (machine_is_netwinder()) { ? ? ? ? ? ? ? ? ? ? ? ?/* open up the SuperIO chip

arch/arm/mach-iop32x/include/mach/system.h +0 -0

index a4b808f..4865a9b 100644
@@ -30,5 +30,5 @@ static inline void arch_reset(char mode, const char *cmd)
 ? ? ? ?*IOP3XX_PCSR = 0x30;
 

? ? ? ?/* Jump into ROM at address 0 */
- ? ? ? cpu_reset(0);
+ ? ? ? soft_restart(0);
?}

arch/arm/mach-iop33x/include/mach/system.h +0 -0

index f192a34..86d1b20 100644
@@ -19,5 +19,5 @@ static inline void arch_reset(char mode, const char *cmd)
 ? ? ? ?*IOP3XX_PCSR = 0x30;
 

? ? ? ?/* Jump into ROM at address 0 */
- ? ? ? cpu_reset(0);
+ ? ? ? soft_restart(0);
?}

arch/arm/mach-ixp4xx/include/mach/system.h +0 -0

index 54c0af7..24337d9 100644
@@ -26,7 +26,7 @@ static inline void arch_reset(char mode, const char *cmd)
 ?{
 ? ? ? ?if ( 1 && mode == 's') {

? ? ? ? ? ? ? ?/* Jump into ROM at address 0 */
- ? ? ? ? ? ? ? cpu_reset(0);
+ ? ? ? ? ? ? ? soft_restart(0);
? ? ? ?} else {
? ? ? ? ? ? ? ?/* Use on-chip reset capability */

arch/arm/mach-ks8695/include/mach/system.h +1 -1

index fb1dda9..ceb19c9 100644
@@ -32,7 +32,7 @@ static void arch_reset(char mode, const char *cmd)
 ? ? ? ?unsigned int reg;
 
 ? ? ? ?if (mode == 's')
- ? ? ? ? ? ? ? cpu_reset(0);
+ ? ? ? ? ? ? ? soft_restart(0);
 

? ? ? ?/* disable timer0 */
? ? ? ?reg = __raw_readl(KS8695_TMR_VA + KS8695_TMCON);

arch/arm/mach-mmp/include/mach/system.h +1 -1

index 1a8a25e..cb06379 100644
@@ -19,8 +19,8 @@ static inline void arch_idle(void)
 ?static inline void arch_reset(char mode, const char *cmd)
 ?{
 ? ? ? ?if (cpu_is_pxa168())
- ? ? ? ? ? ? ? cpu_reset(0xffff0000);
+ ? ? ? ? ? ? ? soft_restart(0xffff0000);

? ? ? ?else
- ? ? ? ? ? ? ? cpu_reset(0);
+ ? ? ? ? ? ? ? soft_restart(0);
?}
?#endif /* __ASM_MACH_SYSTEM_H */

arch/arm/mach-mxs/system.c +0 -0

index 20ec3bd..cab8836 100644
@@ -53,7 +53,7 @@ void arch_reset(char mode, const char *cmd)
 ? ? ? ?mdelay(50);
 

? ? ? ?/* We'll take a jump through zero as a poor second */
- ? ? ? cpu_reset(0);
+ ? ? ? soft_restart(0);
?}

?static int __init mxs_arch_reset_init(void)

arch/arm/mach-pnx4008/include/mach/system.h +1 -1

index 5dda2bb..5d6384a 100644
@@ -32,7 +32,7 @@ static void arch_idle(void)
 
 ?static inline void arch_reset(char mode, const char *cmd)
 ?{
- ? ? ? cpu_reset(0);
+ ? ? ? soft_restart(0);
 ?}
 

?#endif

arch/arm/mach-pxa/reset.c +0 -0

index 01e9d64..b8bcda1 100644
@@ -88,7 +88,7 @@ void arch_reset(char mode, const char *cmd)
 ? ? ? ?switch (mode) {

? ? ? ?case 's':
? ? ? ? ? ? ? ?/* Jump into ROM at address 0 */
- ? ? ? ? ? ? ? cpu_reset(0);
+ ? ? ? ? ? ? ? soft_restart(0);
? ? ? ? ? ? ? ?break;
? ? ? ?case 'g':
? ? ? ? ? ? ? ?do_gpio_reset();

arch/arm/mach-rpc/include/mach/system.h +0 -0

index 45c7b93..a354f4d 100644
@@ -23,5 +23,5 @@ static inline void arch_reset(char mode, const char *cmd)

? ? ? ?/*
? ? ? ? * Jump into the ROM
? ? ? ? */
- ? ? ? cpu_reset(0);
+ ? ? ? soft_restart(0);
?}

arch/arm/mach-s3c2410/include/mach/system-reset.h +1 -1

index 6faadce..913893d 100644
@@ -19,7 +19,7 @@ static void
 ?arch_reset(char mode, const char *cmd)
 ?{
 ? ? ? ?if (mode == 's') {
- ? ? ? ? ? ? ? cpu_reset(0);
+ ? ? ? ? ? ? ? soft_restart(0);
 ? ? ? ?}
 
 ? ? ? ?if (s3c24xx_reset_hook)

@@ -28,5 +28,5 @@ arch_reset(char mode, const char *cmd)
 ? ? ? ?arch_wdt_reset();
 

? ? ? ?/* we'll take a jump through zero as a poor second */
- ? ? ? cpu_reset(0);
+ ? ? ? soft_restart(0);
?}

arch/arm/mach-s3c64xx/include/mach/system.h +0 -0

index 2e58cb7..d8ca578 100644
@@ -24,7 +24,7 @@ static void arch_reset(char mode, const char *cmd)
 ? ? ? ? ? ? ? ?arch_wdt_reset();
 

? ? ? ?/* if all else fails, or mode was for soft, jump to 0 */
- ? ? ? cpu_reset(0);
+ ? ? ? soft_restart(0);
?}

?#endif /* __ASM_ARCH_IRQ_H */

arch/arm/mach-sa1100/include/mach/system.h +0 -0

index ba9da9f..345d35b 100644
@@ -14,7 +14,7 @@ static inline void arch_reset(char mode, const char *cmd)
 ?{
 ? ? ? ?if (mode == 's') {

? ? ? ? ? ? ? ?/* Jump into ROM at address 0 */
- ? ? ? ? ? ? ? cpu_reset(0);
+ ? ? ? ? ? ? ? soft_restart(0);
? ? ? ?} else {
? ? ? ? ? ? ? ?/* Use on-chip reset capability */
? ? ? ? ? ? ? ?RSRR = RSRR_SWR;

arch/arm/mach-shmobile/include/mach/system.h +1 -1

index 76a687e..956ac18 100644
@@ -8,7 +8,7 @@ static inline void arch_idle(void)
 
 ?static inline void arch_reset(char mode, const char *cmd)
 ?{
- ? ? ? cpu_reset(0);
+ ? ? ? soft_restart(0);
 ?}
 

?#endif

arch/arm/mach-w90x900/include/mach/system.h +0 -0

index ce228bd..68875a1 100644
@@ -33,7 +33,7 @@ static void arch_reset(char mode, const char *cmd)
 ?{
 ? ? ? ?if (mode == 's') {

? ? ? ? ? ? ? ?/* Jump into ROM at address 0 */
- ? ? ? ? ? ? ? cpu_reset(0);
+ ? ? ? ? ? ? ? soft_restart(0);
? ? ? ?} else {
? ? ? ? ? ? ? ?__raw_writel(WTE | WTRE | WTCLK, WTCR); ? ? ? ?}

arch/arm/plat-mxc/system.c +0 -0

index 9dad8dc..b1cfc6a 100644
@@ -70,7 +70,7 @@ void arch_reset(char mode, const char *cmd)
 ? ? ? ?mdelay(50);
 

? ? ? ?/* we'll take a jump through zero as a poor second */
- ? ? ? cpu_reset(0);
+ ? ? ? soft_restart(0);
?}

?void mxc_arch_reset_init(void __iomem *base)

arch/arm/plat-spear/include/plat/system.h +0 -0

index a235fa0..1171f22 100644
@@ -31,7 +31,7 @@ static inline void arch_reset(char mode, const char *cmd)
 ?{
 ? ? ? ?if (mode == 's') {

? ? ? ? ? ? ? ?/* software reset, Jump into ROM at address 0 */
- ? ? ? ? ? ? ? cpu_reset(0);
+ ? ? ? ? ? ? ? soft_restart(0);
? ? ? ?} else {
? ? ? ? ? ? ? ?/* hardware reset, Use on-chip reset capability */ ? ? ? ? ? ? ? ?sysctl_soft_reset((void __iomem *)VA_SPEAR_SYS_CTRL_BASE); --
1.7.4.4

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Hook these platforms restart code into the new restart hook rather than using arch_reset().

Signed-off-by Russell King <[email protected]>

---
 arch/arm/mach-omap1/board-voiceblue.c     |    5 ++---
 arch/arm/mach-omap1/include/mach/system.h |    6 ++++++
 arch/arm/mach-omap1/reset.c               |    4 +---
 arch/arm/mach-omap2/include/mach/system.h |    6 ++++++
 arch/arm/mach-omap2/prcm.c                |    4 +---
 arch/arm/plat-omap/include/plat/system.h  |    2 --
 6 files changed, 16 insertions(+), 11 deletions(-)

arch/arm/mach-omap1/board-voiceblue.c +1 -3

index 2a6545b..b0111b6 100644
@@ -220,7 +220,7 @@ void voiceblue_wdt_ping(void)
 	gpio_set_value(0, wdt_gpio_state);
 }
 
-static void voiceblue_reset(char mode, const char *cmd)
+static void voiceblue_restart(char mode, const char *cmd)
 {
 	/*
 	 * Workaround for 5912/1611b bug mentioned in sprz209d.pdf p. 28

@@ -284,8 +284,6 @@ static void __init voiceblue_init(void)
 	 * (it is connected through invertor) */
 	omap_writeb(0x00, OMAP_LPG1_LCR);
 	omap_writeb(0x00, OMAP_LPG1_PMR);	/* Disable clock */
-
-	arch_reset = voiceblue_reset;
 }
 
 MACHINE_START(VOICEBLUE, "VoiceBlue OMAP5910")

I guess we want the rest of the board files to set .restart to omap1_restart or omap_prcm_restart? Do you already have some script doing that or do you need some help there?

Hook these platforms restart code into the new restart hook rather than using arch_reset().

Signed-off-by Russell King <[email protected]>

---
 arch/arm/mach-exynos4/cpu.c                 |    6 +-----
 arch/arm/mach-exynos4/mach-armlex4210.c     |    1 +
 arch/arm/mach-exynos4/mach-nuri.c           |    1 +
 arch/arm/mach-exynos4/mach-origen.c         |    1 +
 arch/arm/mach-exynos4/mach-smdk4x12.c       |    2 ++
 arch/arm/mach-exynos4/mach-smdkv310.c       |    2 ++
 arch/arm/mach-exynos4/mach-universal_c210.c |    1 +
 7 files changed, 9 insertions(+), 5 deletions(-)

arch/arm/mach-exynos4/cpu.c +1 -2

index 5b1765b..5b1ee56 100644
@@ -27,7 +27,6 @@
 #include <plat/fb-core.h>
 #include <plat/fimc-core.h>
 #include <plat/iic-core.h>
-#include <plat/reset.h>
 #include <plat/tv-core.h>
 
 #include <mach/regs-irq.h>

@@ -145,7 +144,7 @@ static void exynos4_idle(void)
 	local_irq_enable();
 }
 
-static void exynos4_sw_reset(void)
+void exynos4_restart(char mode, const char *cmd)
 {
 	__raw_writel(0x1, S5P_SWRESET);
 }

arch/arm/mach-exynos4/cpu.c +0 -0

 	return sysdev_register(&exynos4_sysdev);
 }

arch/arm/mach-exynos4/mach-armlex4210.c +1 -0

index f0ca6c1..9bb7e6c 100644
@@ -212,4 +212,5 @@ MACHINE_START(ARMLEX4210, "ARMLEX4210")
 	.map_io		= armlex4210_map_io,
 	.init_machine	= armlex4210_machine_init,
 	.timer		= &exynos4_timer,
+	.restart	= exynos4_restart,
 MACHINE_END

arch/arm/mach-exynos4/mach-nuri.c +1 -0

index 236bbe1..3504f56 100644
@@ -1336,4 +1336,5 @@ MACHINE_START(NURI, "NURI")
 	.init_machine	= nuri_machine_init,
 	.timer		= &exynos4_timer,
 	.reserve        = &nuri_reserve,
+	.restart	= exynos4_restart,
 MACHINE_END

arch/arm/mach-exynos4/mach-origen.c +1 -0

index f80b563..161e5ee 100644
@@ -697,4 +697,5 @@ MACHINE_START(ORIGEN, "ORIGEN")
 	.init_machine	= origen_machine_init,
 	.timer		= &exynos4_timer,
 	.reserve	= &origen_reserve,
+	.restart	= exynos4_restart,
 MACHINE_END

arch/arm/mach-exynos4/mach-smdk4x12.c +2 -0

index fcf2e0e..020284c 100644
@@ -289,6 +289,7 @@ MACHINE_START(SMDK4212, "SMDK4212")
 	.map_io		= smdk4x12_map_io,
 	.init_machine	= smdk4x12_machine_init,
 	.timer		= &exynos4_timer,
+	.restart	= exynos4_restart,
 MACHINE_END
 
 MACHINE_START(SMDK4412, "SMDK4412")

@@ -299,4 +300,5 @@ MACHINE_START(SMDK4412, "SMDK4412")
 	.map_io		= smdk4x12_map_io,
 	.init_machine	= smdk4x12_machine_init,
 	.timer		= &exynos4_timer,
+	.restart	= exynos4_restart,
 MACHINE_END

arch/arm/mach-exynos4/mach-smdkv310.c +2 -0

index cec2afa..fdf5535 100644
@@ -378,6 +378,7 @@ MACHINE_START(SMDKV310, "SMDKV310")
 	.init_machine	= smdkv310_machine_init,
 	.timer		= &exynos4_timer,
 	.reserve	= &smdkv310_reserve,
+	.restart	= exynos4_restart,
 MACHINE_END
 
 MACHINE_START(SMDKC210, "SMDKC210")

@@ -387,4 +388,5 @@ MACHINE_START(SMDKC210, "SMDKC210")
 	.map_io		= smdkv310_map_io,
 	.init_machine	= smdkv310_machine_init,
 	.timer		= &exynos4_timer,
+	.restart	= exynos4_restart,
 MACHINE_END

arch/arm/mach-exynos4/mach-universal_c210.c +1 -0

index a2a177f..4bdd30c 100644
@@ -1061,4 +1061,5 @@ MACHINE_START(UNIVERSAL_C210, "UNIVERSAL_C210")
 	.init_machine	= universal_machine_init,
 	.timer		= &exynos4_timer,
 	.reserve        = &universal_reserve,
+	.restart	= exynos4_restart,
 MACHINE_END

Signature · 7 lines

1.7.4.4


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Quoted 36 lines · Russell King - ARM Linux

Hook these platforms restart code into the new restart hook rather than using arch_reset().

Signed-off-by Russell King <[email protected]>

---
 arch/arm/mach-exynos4/cpu.c                 |    6 +-----
 arch/arm/mach-exynos4/mach-armlex4210.c     |    1 +
 arch/arm/mach-exynos4/mach-nuri.c           |    1 +
 arch/arm/mach-exynos4/mach-origen.c         |    1 +
 arch/arm/mach-exynos4/mach-smdk4x12.c       |    2 ++
 arch/arm/mach-exynos4/mach-smdkv310.c       |    2 ++
 arch/arm/mach-exynos4/mach-universal_c210.c |    1 +
 7 files changed, 9 insertions(+), 5 deletions(-)

arch/arm/mach-exynos4/cpu.c +1 -2

index 5b1765b..5b1ee56 100644
@@ -27,7 +27,6 @@
 #include <plat/fb-core.h>
 #include <plat/fimc-core.h>
 #include <plat/iic-core.h>
-#include <plat/reset.h>
 #include <plat/tv-core.h>
 
 #include <mach/regs-irq.h>

@@ -145,7 +144,7 @@ static void exynos4_idle(void)
 	local_irq_enable();
 }
 
-static void exynos4_sw_reset(void)
+void exynos4_restart(char mode, const char *cmd)
 {
 	__raw_writel(0x1, S5P_SWRESET);
 }

arch/arm/mach-exynos4/cpu.c int __init exynos4_init(void) · line 291

Quoted 6 lines

arch/arm/mach-exynos4/cpu.c +0 -3

@@ -286,8 +285,5 @@ int __init exynos4_init(void)
 	/* set idle function */
 	pm_idle = exynos4_idle;
 
-	/* set sw_reset function */
-	s5p_reset_hook = exynos4_sw_reset;
-

I notice in last nights merge of the Samsung stuff, this has become less trivial - it's now:

        /* set sw_reset function */
        if (soc_is_exynos4210() || soc_is_exynos4212() ||
soc_is_exynos4412())
                s5p_reset_hook = exynos4_sw_reset;

So which of the boards should be converted and which shouldn't ? In other words, which exynos4210, 4212 or 4412 platforms?

Quoted 89 lines

arch/arm/mach-exynos4/cpu.c +0 -0

 	return sysdev_register(&exynos4_sysdev);
 }

arch/arm/mach-exynos4/mach-armlex4210.c +1 -0

index f0ca6c1..9bb7e6c 100644
@@ -212,4 +212,5 @@ MACHINE_START(ARMLEX4210, "ARMLEX4210")
 	.map_io		= armlex4210_map_io,
 	.init_machine	= armlex4210_machine_init,
 	.timer		= &exynos4_timer,
+	.restart	= exynos4_restart,
 MACHINE_END

arch/arm/mach-exynos4/mach-nuri.c +1 -0

index 236bbe1..3504f56 100644
@@ -1336,4 +1336,5 @@ MACHINE_START(NURI, "NURI")
 	.init_machine	= nuri_machine_init,
 	.timer		= &exynos4_timer,
 	.reserve        = &nuri_reserve,
+	.restart	= exynos4_restart,
 MACHINE_END

arch/arm/mach-exynos4/mach-origen.c +1 -0

index f80b563..161e5ee 100644
@@ -697,4 +697,5 @@ MACHINE_START(ORIGEN, "ORIGEN")
 	.init_machine	= origen_machine_init,
 	.timer		= &exynos4_timer,
 	.reserve	= &origen_reserve,
+	.restart	= exynos4_restart,
 MACHINE_END

arch/arm/mach-exynos4/mach-smdk4x12.c +2 -0

index fcf2e0e..020284c 100644
@@ -289,6 +289,7 @@ MACHINE_START(SMDK4212, "SMDK4212")
 	.map_io		= smdk4x12_map_io,
 	.init_machine	= smdk4x12_machine_init,
 	.timer		= &exynos4_timer,
+	.restart	= exynos4_restart,
 MACHINE_END
 
 MACHINE_START(SMDK4412, "SMDK4412")

@@ -299,4 +300,5 @@ MACHINE_START(SMDK4412, "SMDK4412")
 	.map_io		= smdk4x12_map_io,
 	.init_machine	= smdk4x12_machine_init,
 	.timer		= &exynos4_timer,
+	.restart	= exynos4_restart,
 MACHINE_END

arch/arm/mach-exynos4/mach-smdkv310.c +2 -0

index cec2afa..fdf5535 100644
@@ -378,6 +378,7 @@ MACHINE_START(SMDKV310, "SMDKV310")
 	.init_machine	= smdkv310_machine_init,
 	.timer		= &exynos4_timer,
 	.reserve	= &smdkv310_reserve,
+	.restart	= exynos4_restart,
 MACHINE_END
 
 MACHINE_START(SMDKC210, "SMDKC210")

@@ -387,4 +388,5 @@ MACHINE_START(SMDKC210, "SMDKC210")
 	.map_io		= smdkv310_map_io,
 	.init_machine	= smdkv310_machine_init,
 	.timer		= &exynos4_timer,
+	.restart	= exynos4_restart,
 MACHINE_END

arch/arm/mach-exynos4/mach-universal_c210.c +1 -1

index a2a177f..4bdd30c 100644
@@ -1061,4 +1061,5 @@ MACHINE_START(UNIVERSAL_C210, "UNIVERSAL_C210")
 	.init_machine	= universal_machine_init,
 	.timer		= &exynos4_timer,
 	.reserve        = &universal_reserve,
+	.restart	= exynos4_restart,
 MACHINE_END
--

1.7.4.4

Quoted 4 lines

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Quoted 51 lines · Russell King - ARM Linux

Quoted 36 lines · Russell King - ARM Linux

Hook these platforms restart code into the new restart hook rather than using arch_reset().

Signed-off-by Russell King <[email protected]>

---
 arch/arm/mach-exynos4/cpu.c                 |    6 +-----
 arch/arm/mach-exynos4/mach-armlex4210.c     |    1 +
 arch/arm/mach-exynos4/mach-nuri.c           |    1 +
 arch/arm/mach-exynos4/mach-origen.c         |    1 +
 arch/arm/mach-exynos4/mach-smdk4x12.c       |    2 ++
 arch/arm/mach-exynos4/mach-smdkv310.c       |    2 ++
 arch/arm/mach-exynos4/mach-universal_c210.c |    1 +
 7 files changed, 9 insertions(+), 5 deletions(-)

arch/arm/mach-exynos4/cpu.c +1 -2

index 5b1765b..5b1ee56 100644
@@ -27,7 +27,6 @@
 #include <plat/fb-core.h>
 #include <plat/fimc-core.h>
 #include <plat/iic-core.h>
-#include <plat/reset.h>
 #include <plat/tv-core.h>
 
 #include <mach/regs-irq.h>

@@ -145,7 +144,7 @@ static void exynos4_idle(void)
 	local_irq_enable();
 }
 
-static void exynos4_sw_reset(void)
+void exynos4_restart(char mode, const char *cmd)
 {
 	__raw_writel(0x1, S5P_SWRESET);
 }

arch/arm/mach-exynos4/cpu.c int __init exynos4_init(void) · line 291

Quoted 6 lines

arch/arm/mach-exynos4/cpu.c +0 -3

@@ -286,8 +285,5 @@ int __init exynos4_init(void)
 	/* set idle function */
 	pm_idle = exynos4_idle;
 
-	/* set sw_reset function */
-	s5p_reset_hook = exynos4_sw_reset;
-

I notice in last nights merge of the Samsung stuff, this has become less trivial - it's now:

        /* set sw_reset function */
        if (soc_is_exynos4210() || soc_is_exynos4212() ||
soc_is_exynos4412())
                s5p_reset_hook = exynos4_sw_reset;

Quoted 2 lines

So which of the boards should be converted and which shouldn't ? In other words, which exynos4210, 4212 or 4412 platforms?

except the arch/arm/mach-exynos4/mach-smdk4x12.c, exynos4210 is used. currently all exynos4 series has same reset function. it's preparation for exynos5 series maybe.

you can use the exynos4_sw_reset for all boards.

Quoted 2 lines · Kyungmin Park

Quoted 1 line · Russell King - ARM Linux

On Sun, Nov 06, 2011 at 05:56:08PM +0000, Russell King - ARM Linux

Quoted 14 lines

Quoted 14 lines

Quoted 14 lines

Hook these platforms restart code into the new restart hook rather than using arch_reset().

Signed-off-by Russell King <[email protected]>

---
 arch/arm/mach-exynos4/cpu.c                 |    6 +-----
 arch/arm/mach-exynos4/mach-armlex4210.c     |    1 +
 arch/arm/mach-exynos4/mach-nuri.c           |    1 +
 arch/arm/mach-exynos4/mach-origen.c         |    1 +
 arch/arm/mach-exynos4/mach-smdk4x12.c       |    2 ++
 arch/arm/mach-exynos4/mach-smdkv310.c       |    2 ++
 arch/arm/mach-exynos4/mach-universal_c210.c |    1 +
 7 files changed, 9 insertions(+), 5 deletions(-)

Quoted 1 line

Quoted 1 line

Review

Quoted 1 line

(quoted diff) +0 -0

Quoted 35 lines

Quoted 35 lines

Quoted 21 lines

index 5b1765b..5b1ee56 100644

arch/arm/mach-exynos4/cpu.c +1 -2

@@ -27,7 +27,6 @@
 #include <plat/fb-core.h>
 #include <plat/fimc-core.h>
 #include <plat/iic-core.h>
-#include <plat/reset.h>
 #include <plat/tv-core.h>
 
 #include <mach/regs-irq.h>

@@ -145,7 +144,7 @@ static void exynos4_idle(void)
 	local_irq_enable();
 }
 
-static void exynos4_sw_reset(void)
+void exynos4_restart(char mode, const char *cmd)
 {
 	__raw_writel(0x1, S5P_SWRESET);
 }

arch/arm/mach-exynos4/cpu.c int __init exynos4_init(void) · line 291

Quoted 6 lines

arch/arm/mach-exynos4/cpu.c +0 -3

@@ -286,8 +285,5 @@ int __init exynos4_init(void)
 	/* set idle function */
 	pm_idle = exynos4_idle;
 
-	/* set sw_reset function */
-	s5p_reset_hook = exynos4_sw_reset;
-

I notice in last nights merge of the Samsung stuff, this has become less trivial - it's now:

        /* set sw_reset function */
        if (soc_is_exynos4210() || soc_is_exynos4212() ||
soc_is_exynos4412())
                s5p_reset_hook = exynos4_sw_reset;

Quoted 8 lines

Quoted 2 lines

So which of the boards should be converted and which shouldn't ? In other words, which exynos4210, 4212 or 4412 platforms?

except the arch/arm/mach-exynos4/mach-smdk4x12.c, exynos4210 is used. currently all exynos4 series has same reset function. it's preparation for exynos5 series maybe.

you can use the exynos4_sw_reset for all boards.

Thanks, that gets me back to where I was with the patch before the exynos4 move.

Quoted 4 lines · Russell King - ARM Linux

Quoted 2 lines · Kyungmin Park

Quoted 1 line · Russell King - ARM Linux

On Sun, Nov 06, 2011 at 05:56:08PM +0000, Russell King - ARM Linux

Quoted 14 lines · wrote:

Quoted 14 lines

Quoted 14 lines

Quoted 14 lines

Hook these platforms restart code into the new restart hook rather than using arch_reset().

Signed-off-by Russell King <[email protected]>

---
 arch/arm/mach-exynos4/cpu.c                 |    6 +-----
 arch/arm/mach-exynos4/mach-armlex4210.c     |    1 +
 arch/arm/mach-exynos4/mach-nuri.c           |    1 +
 arch/arm/mach-exynos4/mach-origen.c         |    1 +
 arch/arm/mach-exynos4/mach-smdk4x12.c       |    2 ++
 arch/arm/mach-exynos4/mach-smdkv310.c       |    2 ++
 arch/arm/mach-exynos4/mach-universal_c210.c |    1 +
 7 files changed, 9 insertions(+), 5 deletions(-)

Quoted 1 line

Quoted 1 line

Quoted 1 line

Review

Quoted 1 line

(quoted diff) +0 -0

b/arch/arm/mach-exynos4/cpu.c

Quoted 35 lines

Quoted 35 lines

Quoted 35 lines

Quoted 21 lines

index 5b1765b..5b1ee56 100644

arch/arm/mach-exynos4/cpu.c +1 -2

@@ -27,7 +27,6 @@
 #include <plat/fb-core.h>
 #include <plat/fimc-core.h>
 #include <plat/iic-core.h>
-#include <plat/reset.h>
 #include <plat/tv-core.h>
 
 #include <mach/regs-irq.h>

@@ -145,7 +144,7 @@ static void exynos4_idle(void)
 	local_irq_enable();
 }
 
-static void exynos4_sw_reset(void)
+void exynos4_restart(char mode, const char *cmd)
 {
 	__raw_writel(0x1, S5P_SWRESET);
 }

arch/arm/mach-exynos4/cpu.c int __init exynos4_init(void) · line 291

Quoted 6 lines

arch/arm/mach-exynos4/cpu.c +0 -3

@@ -286,8 +285,5 @@ int __init exynos4_init(void)
 	/* set idle function */
 	pm_idle = exynos4_idle;
 
-	/* set sw_reset function */
-	s5p_reset_hook = exynos4_sw_reset;
-

I notice in last nights merge of the Samsung stuff, this has become less trivial - it's now:

        /* set sw_reset function */
        if (soc_is_exynos4210() || soc_is_exynos4212() ||
soc_is_exynos4412())
                s5p_reset_hook = exynos4_sw_reset;

Quoted 9 lines

Quoted 8 lines

Quoted 2 lines

So which of the boards should be converted and which shouldn't ? In other words, which exynos4210, 4212 or 4412 platforms?

except the arch/arm/mach-exynos4/mach-smdk4x12.c, exynos4210 is used. currently all exynos4 series has same reset function. it's preparation for exynos5 series maybe.

you can use the exynos4_sw_reset for all boards.

Thanks, Kyungmin.

Quoted 3 lines

Thanks, that gets me back to where I was with the patch before the exynos4 move.

Thanks.

Quoted 7 lines · Kukjin Kim

Quoted 4 lines · Russell King - ARM Linux

Quoted 2 lines · Kyungmin Park

Quoted 1 line · Russell King - ARM Linux

On Sun, Nov 06, 2011 at 05:56:08PM +0000, Russell King - ARM Linux

Quoted 1 line · wrote:

Quoted 1 line

Quoted 1 line

Quoted 1 line

Hook these platforms restart code into the new restart hook

Quoted 39 lines

Quoted 13 lines

Quoted 13 lines

Quoted 13 lines

Quoted 13 lines

than using arch_reset().

Signed-off-by Russell King <[email protected]>

---
 arch/arm/mach-exynos4/cpu.c                 |    6 +-----
 arch/arm/mach-exynos4/mach-armlex4210.c     |    1 +
 arch/arm/mach-exynos4/mach-nuri.c           |    1 +
 arch/arm/mach-exynos4/mach-origen.c         |    1 +
 arch/arm/mach-exynos4/mach-smdk4x12.c       |    2 ++
 arch/arm/mach-exynos4/mach-smdkv310.c       |    2 ++
 arch/arm/mach-exynos4/mach-universal_c210.c |    1 +
 7 files changed, 9 insertions(+), 5 deletions(-)

Quoted 1 line

Quoted 1 line

Quoted 1 line

Review

Quoted 1 line

(quoted diff) +0 -0

b/arch/arm/mach-exynos4/cpu.c

Quoted 24 lines

Quoted 24 lines

Quoted 24 lines

Quoted 24 lines

index 5b1765b..5b1ee56 100644

arch/arm/mach-exynos4/cpu.c +1 -2

@@ -27,7 +27,6 @@
 #include <plat/fb-core.h>
 #include <plat/fimc-core.h>
 #include <plat/iic-core.h>
-#include <plat/reset.h>
 #include <plat/tv-core.h>
 
 #include <mach/regs-irq.h>

@@ -145,7 +144,7 @@ static void exynos4_idle(void)
 	local_irq_enable();
 }
 
-static void exynos4_sw_reset(void)
+void exynos4_restart(char mode, const char *cmd)
 {
 	__raw_writel(0x1, S5P_SWRESET);
 }

@@ -286,8 +285,5 @@ int __init exynos4_init(void)
 	/* set idle function */
 	pm_idle = exynos4_idle;
 

Quoted 5 lines

Quoted 5 lines

Quoted 5 lines

Quoted 5 lines

arch/arm/mach-exynos4/cpu.c int __init exynos4_init(void) · line 291

Quoted 3 lines

arch/arm/mach-exynos4/cpu.c +0 -3

-	/* set sw_reset function */
-	s5p_reset_hook = exynos4_sw_reset;
-

I notice in last nights merge of the Samsung stuff, this has

Quoted 10 lines

Quoted 10 lines

Quoted 10 lines

Quoted 8 lines

less trivial - it's now:

        /* set sw_reset function */
        if (soc_is_exynos4210() || soc_is_exynos4212() ||
soc_is_exynos4412())
                s5p_reset_hook = exynos4_sw_reset;

So which of the boards should be converted and which shouldn't ? In other words, which exynos4210, 4212 or 4412 platforms?

except the arch/arm/mach-exynos4/mach-smdk4x12.c, exynos4210 is

Quoted 1 line

Quoted 1 line

Quoted 1 line

currently all exynos4 series has same reset function. it's

Quoted 10 lines

Quoted 4 lines

Quoted 3 lines

for exynos5 series maybe.

you can use the exynos4_sw_reset for all boards.

Thanks, Kyungmin.

Quoted 3 lines

Thanks, that gets me back to where I was with the patch before the exynos4 move.

Quoted 1 line

Thanks.

I have to point out that even so, this patch as it stands will break the exynos build (that's why the subject line contains the XXX WIP XXX stuff.)

As I said in my pet peaves mail, there should be a header in arch/arm/mach-exynos for the data and function declarations which are

only used by and only provided by files in this directory. Such things as:

struct sys_timer exynos4_timer;
void exynos4_init_irq(void);

etc. This stuff should not be inappropriately placed:

arch/arm/plat-samsung/include/plat/exynos4.h:extern struct sys_timer exynos4_timer; arch/arm/plat-samsung/include/plat/exynos4.h:extern void

(e.g.,

$ grep exynos4_init_irq\\\> arch/arm -r
arch/arm/mach-exynos/mach-nuri.c:   .init_irq       = exynos4_init_irq,
arch/arm/mach-exynos/mach-origen.c: .init_irq       = exynos4_init_irq,
arch/arm/mach-exynos/mach-armlex4210.c:     .init_irq       =

arch/arm/mach-exynos/mach-smdkv310.c: .init_irq =
exynos4_init_irq,
arch/arm/mach-exynos/mach-smdkv310.c: .init_irq =
exynos4_init_irq,
arch/arm/mach-exynos/mach-smdk4x12.c: .init_irq =
exynos4_init_irq,
arch/arm/mach-exynos/mach-smdk4x12.c: .init_irq =
exynos4_init_irq,
arch/arm/mach-exynos/cpu.c:void __init exynos4_init_irq(void)
arch/arm/mach-exynos/mach-universal_c210.c: .init_irq =

arch/arm/plat-samsung/include/plat/exynos4.h:extern void

$ grep exynos4_timer arch/arm -r
arch/arm/mach-exynos/mach-nuri.c:   .timer          = &exynos4_timer,
arch/arm/mach-exynos/mach-origen.c: .timer          = &exynos4_timer,
arch/arm/mach-exynos/mach-armlex4210.c:     .timer          =
&exynos4_timer,
arch/arm/mach-exynos/mach-smdkv310.c:       .timer          =
&exynos4_timer,

arch/arm/mach-exynos/mach-smdkv310.c:       .timer          =
&exynos4_timer,
arch/arm/mach-exynos/mach-smdk4x12.c:       .timer          =
&exynos4_timer,
arch/arm/mach-exynos/mach-smdk4x12.c:       .timer          =
&exynos4_timer,
arch/arm/mach-exynos/mct.c:struct sys_timer exynos4_timer = {
arch/arm/mach-exynos/mach-universal_c210.c: .timer          =

arch/arm/plat-samsung/include/plat/exynos4.h:extern struct sys_timer exynos4_timer;

$ grep exynos4_register_clocks arch/arm -r
arch/arm/mach-exynos/clock.c:void __init exynos4_register_clocks(void)
arch/arm/mach-exynos/cpu.c: exynos4_register_clocks();
arch/arm/plat-samsung/include/plat/exynos4.h:extern void
exynos4_register_clock(void);
$ grep exynos421._register_clocks arch/arm -r
arch/arm/mach-exynos/clock-exynos4212.c:void __init
exynos4212_register_clocks(void)
arch/arm/mach-exynos/cpu.c:         exynos4210_register_clocks();
arch/arm/mach-exynos/cpu.c:         exynos4212_register_clocks();
arch/arm/mach-exynos/clock-exynos4210.c:void __init
exynos4210_register_clocks(void)
arch/arm/plat-samsung/include/plat/exynos4.h:extern void
exynos4210_register_clocks(void);
arch/arm/plat-samsung/include/plat/exynos4.h:extern void
exynos4212_register_clocks(void);
)

I suspect a sizeable proportion of plat/exynos4.h could move into arch/arm/mach-exynos.