Skip to contentSkip to conversation

OMAP: pass the reboot command to the boot loader

PATCH New Aaro Koskinen 2 participants 2 messages Feb 26, 2010 – Mar 11, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 OMAP: pass the reboot command to the boot loader

This patch follows the commit be093beb608edf821b45fe00a8a080fb5c6ed4af by Russell King:

OMAP wishes to pass state to the boot loader upon reboot in order to instruct it whether to wait for USB-based reflashing or not. There is already a facility to do this via the reboot() syscall, except we ignore the string passed to machine_restart().

The patch adds the missing parameter to omap1_arch_reset() and omap_prcm_arch_reset(), and modifies the latter to pass the reboot command parameter to the boot loader instead of reboot mode (which is for kernel internal use only and cannot be modified by the userspace).

---

v2: Refreshed against the current omap-for-linus branch (b610ec502376d915b76a62e22576c5d0462cc9c9).

 arch/arm/mach-omap2/prcm.c               |    4 ++--
 arch/arm/plat-omap/include/plat/prcm.h   |    2 +-
 arch/arm/plat-omap/include/plat/system.h |    6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/mach-omap2/prcm.c +2 -2
index 81872aa..9537f6f 100644
@@ -133,7 +133,7 @@ u32 omap_prcm_get_reset_sources(void)
 EXPORT_SYMBOL(omap_prcm_get_reset_sources);
 
 /* Resets clock rates and reboots the system. Only called from system.h */
-void omap_prcm_arch_reset(char mode)
+void omap_prcm_arch_reset(char mode, const char *cmd)
 {
 	s16 prcm_offs = 0;
 
@@ -145,7 +145,7 @@ void omap_prcm_arch_reset(char mode)
 		u32 l;
 
 		prcm_offs = OMAP3430_GR_MOD;
-		l = ('B' << 24) | ('M' << 16) | mode;
+		l = ('B' << 24) | ('M' << 16) | (cmd ? (u8)*cmd : 0);
 		/* Reserve the first word in scratchpad for communicating
 		 * with the boot ROM. A pointer to a data structure
 		 * describing the boot process can be stored there,
arch/arm/plat-omap/include/plat/prcm.h +1 -1
index d6a0e27..9fbd914 100644
@@ -24,7 +24,7 @@
 #define __ASM_ARM_ARCH_OMAP_PRCM_H
 
 u32 omap_prcm_get_reset_sources(void);
-void omap_prcm_arch_reset(char mode);
+void omap_prcm_arch_reset(char mode, const char *cmd);
 int omap2_cm_wait_idlest(void __iomem *reg, u32 mask, u8 idlest,
 			 const char *name);
 
arch/arm/plat-omap/include/plat/system.h +3 -3
index c58a4ef..d0a119f 100644
@@ -22,7 +22,7 @@ static inline void arch_idle(void)
 	cpu_do_idle();
 }
 
-static inline void omap1_arch_reset(char mode)
+static inline void omap1_arch_reset(char mode, const char *cmd)
 {
 	/*
 	 * Workaround for 5912/1611b bug mentioned in sprz209d.pdf p. 28
@@ -43,9 +43,9 @@ static inline void omap1_arch_reset(char mode)
 static inline void arch_reset(char mode, const char *cmd)
 {
 	if (!cpu_class_is_omap2())
-		omap1_arch_reset(mode);
+		omap1_arch_reset(mode, cmd);
 	else
-		omap_prcm_arch_reset(mode);
+		omap_prcm_arch_reset(mode, cmd);
 }
 
 #endif
Signature · 1 line
1.5.6.5
maintainer
#1 lore raw

PATCH v2 1/1 OMAP: pass the reboot command to the boot loader

This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Branch in linux-omap: omap-fixes

Initial commit ID (Likely to change): 943c26fba31960a004a4c8eab3a83679cb789d69

PatchWorks
http://patchwork.kernel.org/patch/82291/

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=943c26fba31960a004a4c8eab3a83679cb789d69