In preparation for making system restart use a generic set of hooks for boards and architectures, we define some wrappers and weak stubs.

The new wrapper functions are: system_restart() - Normal system reboot (IE: user request) emergency_restart() - Critical error response (IE: panic(), etc)

During the process of converting all architectures to use the new hooks, the system_restart() and emergency_restart() code will fall back to call the existing do_reset() function.

The handler for the "reset" shell command is now do_generic_reset(), which is a trivial wrapper around system_restart().

The new hooks (for architecture and board-support code to define) are: __arch_emergency_restart() __arch_restart() __board_emergency_restart() __board_restart()

By default the __(arch|board)_emergency_restart() functions just call the corresponding __(arch|board)_restart() hook. This works for all hardware platforms which have a properly defined hardware reset capability.

Signed-off-by: Kyle Moffett Kyle.D.Moffett@boeing.com Cc: Wolfgang Denk wd@denx.de --- api/api.c | 3 +- common/cmd_boot.c | 128 ++++++++++++++++++++++++++++++++++++++++++++- common/cmd_bootm.c | 8 +-- common/hush.c | 2 +- common/main.c | 2 +- examples/api/libgenwrap.c | 5 +- include/_exports.h | 2 +- include/command.h | 13 +++++ lib/vsprintf.c | 2 +- 9 files changed, 152 insertions(+), 13 deletions(-)

diff --git a/api/api.c b/api/api.c index 853f010..b65fabd 100644 --- a/api/api.c +++ b/api/api.c @@ -131,7 +131,8 @@ static int API_puts(va_list ap) */ static int API_reset(va_list ap) { - do_reset(NULL, 0, 0, NULL); + if (system_restart()) + return API_ENODEV;

/* NOT REACHED */ return 0; diff --git a/common/cmd_boot.c b/common/cmd_boot.c index 7b603d3..c0f26fc 100644 --- a/common/cmd_boot.c +++ b/common/cmd_boot.c @@ -58,6 +58,132 @@ int do_go (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return rcode; }

+/* + * emergency_restart() - Restart function to call from panic(), etc. + * + * This may be called from any context when something has gone terribly wrong + * and the system needs a best-effort reboot. + * + * This function will never return. + */ +__attribute__((__noreturn__)) +void emergency_restart(void) +{ + __board_emergency_restart(); + __arch_emergency_restart(); + + /* Fallback to the old do_reset() until everything is converted. */ + do_reset(NULL, 0, 0, NULL); + + printf("EMERGENCY RESTART: All attempts to reboot failed!"); + hang(); +} + +/* + * Architecture/board-specific emergency-restart hooks. + * + * These hooks default to the same as the normal restart hooks. + * + * WARNING: If your platform's "restart" hooks are not a "safe" then you + * must redefine these functions in your port as empty stubs. + * + * Specifically, the following assumptions must be true for these hooks: + * (1) Safe to call from any context (interrupts, etc). + * (2) Must use a hardware mechanism to reset *ALL* system state. + * (3) They must not be interruptible (EG: with Ctrl-C). + */ +__attribute__((__weak__)) +void __board_emergency_restart(void) +{ + __board_restart(); +} + +__attribute__((__weak__)) +void __arch_emergency_restart(void) +{ + __arch_restart(); +} + +/* + * This MUST be called from normal interrupts-on context. If it requires + * extended interaction with external hardware it SHOULD react to Ctrl-C. + * + * If this function fails to guarantee a clean reboot or receives a Ctrl-C + * keystroke it SHOULD return with an error (-1). + */ +int system_restart(void) +{ + int err; + + /* + * Print a nice message and wait a bit to make sure it goes out the + * console properly. + */ + printf ("Restarting...\n"); + udelay(50000); + + /* First let the board code try to reboot */ + err = __board_restart(); + if (err) + goto failed; + + /* Now call into the architecture-specific code */ + err = __arch_restart(); + if (err) + goto failed; + + /* Fallback to the old do_reset() until everything is converted. */ + err = do_reset(NULL, 0, 0, NULL); + +failed: + printf("*** SYSTEM RESTART FAILED ***\n"); + return err; +} + +/* + * Architecture/board-specific restart hooks. + * + * If your implementation of these functions does not meet the requirements + * for the emergency_restart() hooks described above then you MUST separately + * implement those hooks. + */ +__attribute__((__weak__)) +int __board_restart(void) +{ + /* Fallthrough to architecture-specific code */ + return 0; +} + +__attribute__((__weak__)) +int __arch_restart(void) +{ + /* Fallthrough to legacy do_reset() code */ + return 0; +} + +/* + * Generic reset command implementation + * + * This is what you get when you type "reset" at the command line. + */ +int do_generic_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + return system_restart(); +} + +/* + * Empty legacy "do_reset" stub. + * + * This allows a platform using the new __board_restart() and + * __arch_restart() hooks to completely omit the old do_reset() function. + */ +int do_reset_stub(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + return 0; +} +__attribute__((__weak__,__alias__("do_reset_stub"))) +int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); + /* -------------------------------------------------------------------- */

U_BOOT_CMD( @@ -68,7 +194,7 @@ U_BOOT_CMD( );

U_BOOT_CMD( - reset, 1, 0, do_reset, + reset, 1, 0, do_generic_reset, "Perform RESET of the CPU", "" ); diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 18019d6..60e4983 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -645,7 +645,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])

if (ret < 0) { if (ret == BOOTM_ERR_RESET) - do_reset (cmdtp, flag, argc, argv); + emergency_restart(); if (ret == BOOTM_ERR_OVERLAP) { if (images.legacy_hdr_valid) { if (image_get_type (&images.legacy_hdr_os_copy) == IH_TYPE_MULTI) @@ -655,7 +655,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) puts ("ERROR: new format image overwritten - " "must RESET the board to recover\n"); show_boot_progress (-113); - do_reset (cmdtp, flag, argc, argv); + emergency_restart(); } } if (ret == BOOTM_ERR_UNIMPLEMENTED) { @@ -702,9 +702,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #ifdef DEBUG puts ("\n## Control returned to monitor - resetting...\n"); #endif - do_reset (cmdtp, flag, argc, argv); - - return 1; + emergency_restart(); }

/** diff --git a/common/hush.c b/common/hush.c index 8021a68..f9e57c9 100644 --- a/common/hush.c +++ b/common/hush.c @@ -1036,7 +1036,7 @@ static void get_user_input(struct in_str *i) if (n == -2) { puts("\nTimeout waiting for command\n"); # ifdef CONFIG_RESET_TO_RETRY - do_reset(NULL, 0, 0, NULL); + system_restart(); # else # error "This currently only works with CONFIG_RESET_TO_RETRY enabled" # endif diff --git a/common/main.c b/common/main.c index dcbacc9..abf77a5 100644 --- a/common/main.c +++ b/common/main.c @@ -450,7 +450,7 @@ void main_loop (void) puts ("\nTimed out waiting for command\n"); # ifdef CONFIG_RESET_TO_RETRY /* Reinit board to run initialization code again */ - do_reset (NULL, 0, 0, NULL); + system_restart(); # else return; /* retry autoboot */ # endif diff --git a/examples/api/libgenwrap.c b/examples/api/libgenwrap.c index 873cf34..31bfcf5 100644 --- a/examples/api/libgenwrap.c +++ b/examples/api/libgenwrap.c @@ -81,9 +81,10 @@ void __udelay(unsigned long usec) ub_udelay(usec); }

-int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int system_restart(void) { - ub_reset(); + if (ub_reset()) + return -1; return 0; }

diff --git a/include/_exports.h b/include/_exports.h index d89b65b..3d3e511 100644 --- a/include/_exports.h +++ b/include/_exports.h @@ -15,7 +15,7 @@ EXPORT_FUNC(free) EXPORT_FUNC(udelay) EXPORT_FUNC(get_timer) EXPORT_FUNC(vprintf) -EXPORT_FUNC(do_reset) +EXPORT_FUNC(system_restart) EXPORT_FUNC(getenv) EXPORT_FUNC(setenv) EXPORT_FUNC(simple_strtoul) diff --git a/include/command.h b/include/command.h index 8310fe5..ad8c915 100644 --- a/include/command.h +++ b/include/command.h @@ -101,6 +101,19 @@ extern int do_bootd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); extern int do_bootm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); extern int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);

+/* Generic system restart functions */ +__attribute__((__noreturn__)) +void emergency_restart(void); +int system_restart(void); + +/* Architecture/board-specific emergency-restart hooks. */ +void __board_emergency_restart(void); +void __arch_emergency_restart(void); + +/* Architecture/board-specific restart hooks. */ +int __board_restart(void); +int __arch_restart(void); + #endif /* __ASSEMBLY__ */

/* diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 61e6f0d..295b60b 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -674,6 +674,6 @@ void panic(const char *fmt, ...) hang(); #else udelay (100000); /* allow messages to go out */ - do_reset (NULL, 0, 0, NULL); + emergency_restart(); #endif }

Divide-by-zero errors should be controlled by the CONFIG_PANIC_HANG configuration variable just like any other kind of trappable U-Boot bug.

Signed-off-by: Kyle Moffett Kyle.D.Moffett@boeing.com Cc: Albert Aribaud albert.aribaud@free.fr --- arch/arm/lib/div0.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/lib/div0.c b/arch/arm/lib/div0.c index 6267bf1..4ec25dc 100644 --- a/arch/arm/lib/div0.c +++ b/arch/arm/lib/div0.c @@ -21,10 +21,10 @@ * MA 02111-1307 USA */

+#include <common.h> + /* Replacement (=dummy) for GNU/Linux division-by zero handler */ void __div0 (void) { - extern void hang (void); - - hang(); + panic("ERROR: divide by zero!"); }

The exported function table already assigns XF_do_reset properly, so there should be no need for this processor to manually reassign it.

This change is required before ARM is converted away from using the legacy do_reset() handler.

Signed-off-by: Kyle Moffett Kyle.D.Moffett@boeing.com Cc: Albert Aribaud albert.aribaud@free.fr Cc: Reinhard Meyer u-boot@emk-elektronik.de --- board/BuS/eb_cpux9k2/cpux9k2.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/board/BuS/eb_cpux9k2/cpux9k2.c b/board/BuS/eb_cpux9k2/cpux9k2.c index fe62a0f..473498c 100644 --- a/board/BuS/eb_cpux9k2/cpux9k2.c +++ b/board/BuS/eb_cpux9k2/cpux9k2.c @@ -111,7 +111,6 @@ int misc_init_r(void) } } #endif - gd->jt[XF_do_reset] = (void *) do_reset;

#ifdef CONFIG_STATUS_LED status_led_set(STATUS_LED_BOOT, STATUS_LED_BLINKING);

The ARM port has its own reset_cpu() dispatch for its various supported CPU families, so the existing do_reset() function is simply altered to use the new prototype for __arch_restart().

In addition, the debug message and delay are duplicated from the generic code, so they are removed.

This reset code will probably work even when the CPU is in a bad state, so no separate __arch_emergency_restart() function is required.

Signed-off-by: Kyle Moffett Kyle.D.Moffett@boeing.com Cc: Albert Aribaud albert.aribaud@free.fr --- arch/arm/lib/reset.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/arch/arm/lib/reset.c b/arch/arm/lib/reset.c index 08e6acb..ec4861e 100644 --- a/arch/arm/lib/reset.c +++ b/arch/arm/lib/reset.c @@ -39,12 +39,8 @@

#include <common.h>

-int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int __arch_reset(void) { - puts ("resetting ...\n"); - - udelay (50000); /* wait 50 ms */ - disable_interrupts(); reset_cpu(0);

The bfin_reset_or_hang function unnecessarily duplicates the panic() logic based on CONFIG_PANIC_HANG.

This patch deletes 20 lines of code and just calls panic() instead. This also makes the following generic-restart conversion patch simpler.

Signed-off-by: Kyle Moffett Kyle.D.Moffett@boeing.com Cc: Mike Frysinger vapier@gentoo.org --- arch/blackfin/cpu/cpu.h | 1 - arch/blackfin/cpu/reset.c | 19 +------------------ arch/blackfin/cpu/traps.c | 2 +- 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/arch/blackfin/cpu/cpu.h b/arch/blackfin/cpu/cpu.h index ba85e0b..e70560f 100644 --- a/arch/blackfin/cpu/cpu.h +++ b/arch/blackfin/cpu/cpu.h @@ -28,7 +28,6 @@ #include <command.h>

void board_reset(void) __attribute__((__weak__)); -void bfin_reset_or_hang(void) __attribute__((__noreturn__)); void bfin_dump(struct pt_regs *reg); void bfin_panic(struct pt_regs *reg); void dump(struct pt_regs *regs); diff --git a/arch/blackfin/cpu/reset.c b/arch/blackfin/cpu/reset.c index 164afde..49d0cf8 100644 --- a/arch/blackfin/cpu/reset.c +++ b/arch/blackfin/cpu/reset.c @@ -80,27 +80,10 @@ static void bfin_reset(void) * PC relative call with a 25 bit immediate. This is not enough * to get us from the top of SDRAM into L1. */ -__attribute__ ((__noreturn__)) -static inline void bfin_reset_trampoline(void) +int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { if (board_reset) board_reset(); while (1) asm("jump (%0);" : : "a" (bfin_reset)); } - -__attribute__ ((__noreturn__)) -void bfin_reset_or_hang(void) -{ -#ifdef CONFIG_PANIC_HANG - hang(); -#else - bfin_reset_trampoline(); -#endif -} - -int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) -{ - bfin_reset_trampoline(); - return 0; -} diff --git a/arch/blackfin/cpu/traps.c b/arch/blackfin/cpu/traps.c index 09388aa..0cb833a 100644 --- a/arch/blackfin/cpu/traps.c +++ b/arch/blackfin/cpu/traps.c @@ -426,5 +426,5 @@ void bfin_panic(struct pt_regs *regs) unsigned long tflags; trace_buffer_save(tflags); bfin_dump(regs); - bfin_reset_or_hang(); + panic("PANIC: Blackfin internal error"); }

The BlackFin port uses the exact same restart code on all supported CPUs, so that do_reset() function is simply altered to use the new prototype for __arch_restart().

Reading the code and CPU documentation does not make it entirely clear whether or not the implementation is safe to use when the CPU may be in a bad or undefined state, but it *appears* to be OK.

As a result no separate __arch_emergency_restart() function should be needed.

Signed-off-by: Kyle Moffett Kyle.D.Moffett@boeing.com Cc: Mike Frysinger vapier@gentoo.org --- arch/blackfin/cpu/cpu.h | 1 - arch/blackfin/cpu/reset.c | 4 +--- board/bf537-stamp/bf537-stamp.c | 5 ++++- 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/blackfin/cpu/cpu.h b/arch/blackfin/cpu/cpu.h index e70560f..32f6414 100644 --- a/arch/blackfin/cpu/cpu.h +++ b/arch/blackfin/cpu/cpu.h @@ -27,7 +27,6 @@

#include <command.h>

-void board_reset(void) __attribute__((__weak__)); void bfin_dump(struct pt_regs *reg); void bfin_panic(struct pt_regs *reg); void dump(struct pt_regs *regs); diff --git a/arch/blackfin/cpu/reset.c b/arch/blackfin/cpu/reset.c index 49d0cf8..84be51a 100644 --- a/arch/blackfin/cpu/reset.c +++ b/arch/blackfin/cpu/reset.c @@ -80,10 +80,8 @@ static void bfin_reset(void) * PC relative call with a 25 bit immediate. This is not enough * to get us from the top of SDRAM into L1. */ -int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int __arch_restart(void) { - if (board_reset) - board_reset(); while (1) asm("jump (%0);" : : "a" (bfin_reset)); } diff --git a/board/bf537-stamp/bf537-stamp.c b/board/bf537-stamp/bf537-stamp.c index ec888d4..e1ae775 100644 --- a/board/bf537-stamp/bf537-stamp.c +++ b/board/bf537-stamp/bf537-stamp.c @@ -43,11 +43,14 @@ int checkboard(void) return 0; }

-void board_reset(void) +int __board_restart(void) { /* workaround for weak pull ups on ssel */ if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_SPI_MASTER) bfin_reset_boot_spi_cs(GPIO_PF10); + + /* Fall through to the architecture reset handler */ + return 0; }

#ifdef CONFIG_BFIN_MAC

The MicroBlaze port only seems to have a single "microblaze-generic" board right now with completely undocumented "restart" functionality.

Since the only do_reset() function in the port is in the board-specific directory, it is renamed __board_restart().

It is unclear whether or not the code properly supports emergency restart. A new __board_emergency_restart() may need to be implemented.

Signed-off-by: Kyle Moffett Kyle.D.Moffett@boeing.com Cc: Michal Simek monstr@monstr.eu --- .../xilinx/microblaze-generic/microblaze-generic.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c index 183e4dc..d7f0eaa 100644 --- a/board/xilinx/microblaze-generic/microblaze-generic.c +++ b/board/xilinx/microblaze-generic/microblaze-generic.c @@ -31,7 +31,7 @@ #include <asm/microblaze_intc.h> #include <asm/asm.h>

-int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int __board_restart(void) { #ifdef CONFIG_SYS_GPIO_0 *((unsigned long *)(CONFIG_SYS_GPIO_0_ADDR)) =

The Nios-II port appears to use no generic hardware capability for performing a CPU reset. Since all of the supported boards use the exact same code to perform a jump-to-flash it goes into __arch_restart().

This means that Nios-II has a no-op __arch_emergency_restart() function. If the CPU is in an invalid state then jump-to-FLASH probably won't work.

Signed-off-by: Kyle Moffett Kyle.D.Moffett@boeing.com Cc: Scott McNutt smcnutt@psyent.com --- arch/nios2/cpu/cpu.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/arch/nios2/cpu/cpu.c b/arch/nios2/cpu/cpu.c index ef360ee..9f40188 100644 --- a/arch/nios2/cpu/cpu.c +++ b/arch/nios2/cpu/cpu.c @@ -40,10 +40,20 @@ int checkcpu (void) return (0); }

-int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int __arch_restart(void) { disable_interrupts(); /* indirect call to go beyond 256MB limitation of toolchain */ nios2_callr(CONFIG_SYS_RESET_ADDR); return 0; } + +/* + * The __arch_restart() just jumps back to flash, which isn't safe to do in + * emergency conditions. Since we don't have anything better to do, just + * fall through into the default hang(). + */ +void __arch_emergency_restart(void) +{ + return; +}

The PowerPC processors supported by U-Boot have many different varieties of hardware reset capabilites.

Some, such as the 7xx/74xx, require a board-specific hardware-reset signal to be supplied to the CPU.

Others use CPU-specific restart registers or faulting instructions.

Several of the CPU-specific do_reset() functions called a custom helper function "board_reset()" to allow board-specific override.

All of the do_reset() functions in arch/powerpc/ were changed to the new prototype __arch_restart() and all PowerPC board/* changed to use the function prototype __board_restart().

The "lwmon" board seems to keep its board-specific code littered in ifdef blocks in the middle of common code, and its restart function was no exception. That do_reset() function was moved to board/lwmon/lwmon.c where it belonged and changed to use the prototype __board_restart().

A few do_reset() functions in arch/powerpc/ used to be protected by ifdefs due to conflicting board-specific definitions. As they no longer conflict, the excess #ifdefs are removed.

The ppmc7xx board does not appear to have any usable hardware reset functionality, so it has a no-op __arch_emergency_restart() function. If the CPU is in an invalid state then jump-to-RAM probably won't work.

All of the rest of the reset code will probably work even when the CPU is in a bad state, so they should be fine with the defaults.

Signed-off-by: Kyle Moffett Kyle.D.Moffett@boeing.com Cc: Wolfgang Denk wd@denx.de Cc: Stefan Roese sr@denx.de Cc: Kim Phillips kim.phillips@freescale.com Cc: Andy Fleming afleming@gmail.com Cc: Kumar Gala kumar.gala@freescale.com --- arch/powerpc/cpu/74xx_7xx/cpu.c | 7 +----- arch/powerpc/cpu/mpc512x/cpu.c | 3 +- arch/powerpc/cpu/mpc5xx/cpu.c | 2 +- arch/powerpc/cpu/mpc5xxx/cpu.c | 3 +- arch/powerpc/cpu/mpc8220/cpu.c | 2 +- arch/powerpc/cpu/mpc824x/cpu.c | 2 +- arch/powerpc/cpu/mpc8260/cpu.c | 6 +---- arch/powerpc/cpu/mpc83xx/cpu.c | 5 +--- arch/powerpc/cpu/mpc85xx/cpu.c | 17 +++++++++++---- arch/powerpc/cpu/mpc86xx/cpu.c | 16 +-------------- arch/powerpc/cpu/mpc8xx/cpu.c | 30 +---------------------------- arch/powerpc/cpu/ppc4xx/cpu.c | 8 +------ board/amcc/yosemite/yosemite.c | 3 +- board/eltec/bab7xx/bab7xx.c | 4 +- board/eltec/elppc/elppc.c | 2 +- board/freescale/mpc8610hpcd/mpc8610hpcd.c | 3 +- board/freescale/mpc8641hpcn/mpc8641hpcn.c | 3 +- board/funkwerk/vovpn-gw/vovpn-gw.c | 5 +--- board/lwmon/lwmon.c | 22 +++++++++++++++++++++ board/lwmon5/lwmon5.c | 3 +- board/pcippc2/pcippc2.c | 2 +- board/ppmc7xx/ppmc7xx.c | 18 ++++++++++++---- board/sbc8641d/sbc8641d.c | 3 +- include/configs/VoVPN-GW.h | 3 -- include/configs/lwmon5.h | 1 - include/configs/yosemite.h | 1 - 26 files changed, 73 insertions(+), 101 deletions(-)

diff --git a/arch/powerpc/cpu/74xx_7xx/cpu.c b/arch/powerpc/cpu/74xx_7xx/cpu.c index b6a31b4..24b531a 100644 --- a/arch/powerpc/cpu/74xx_7xx/cpu.c +++ b/arch/powerpc/cpu/74xx_7xx/cpu.c @@ -229,12 +229,8 @@ soft_restart(unsigned long addr) }

-#if !defined(CONFIG_PCIPPC2) && \ - !defined(CONFIG_BAB7xx) && \ - !defined(CONFIG_ELPPC) && \ - !defined(CONFIG_PPMC7XX) /* no generic way to do board reset. simply call soft_reset. */ -int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int __arch_restart(void) { ulong addr; /* flush and disable I/D cache */ @@ -269,7 +265,6 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])

return 1; } -#endif

/* ------------------------------------------------------------------------- */

diff --git a/arch/powerpc/cpu/mpc512x/cpu.c b/arch/powerpc/cpu/mpc512x/cpu.c index a1a3bd4..c2dab2c 100644 --- a/arch/powerpc/cpu/mpc512x/cpu.c +++ b/arch/powerpc/cpu/mpc512x/cpu.c @@ -74,8 +74,7 @@ int checkcpu (void) }

-int -do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) +int __arch_restart(void) { ulong msr; volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR; diff --git a/arch/powerpc/cpu/mpc5xx/cpu.c b/arch/powerpc/cpu/mpc5xx/cpu.c index 5aa7f84..74193dc 100644 --- a/arch/powerpc/cpu/mpc5xx/cpu.c +++ b/arch/powerpc/cpu/mpc5xx/cpu.c @@ -138,7 +138,7 @@ int dcache_status (void) /* * Reset board */ -int do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) +int __arch_restart(void) { #if defined(CONFIG_PATI) volatile ulong *addr = (ulong *) CONFIG_SYS_RESET_ADDRESS; diff --git a/arch/powerpc/cpu/mpc5xxx/cpu.c b/arch/powerpc/cpu/mpc5xxx/cpu.c index 0c1eebd..ed3b267 100644 --- a/arch/powerpc/cpu/mpc5xxx/cpu.c +++ b/arch/powerpc/cpu/mpc5xxx/cpu.c @@ -77,8 +77,7 @@ int checkcpu (void)

/* ------------------------------------------------------------------------- */

-int -do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) +int __arch_restart(void) { ulong msr; /* Interrupts and MMU off */ diff --git a/arch/powerpc/cpu/mpc8220/cpu.c b/arch/powerpc/cpu/mpc8220/cpu.c index 64e0526..fa9d076 100644 --- a/arch/powerpc/cpu/mpc8220/cpu.c +++ b/arch/powerpc/cpu/mpc8220/cpu.c @@ -52,7 +52,7 @@ int checkcpu (void)

/* ------------------------------------------------------------------------- */

-int do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) +int __arch_restart(void) { volatile gptmr8220_t *gptmr = (volatile gptmr8220_t *) MMAP_GPTMR; ulong msr; diff --git a/arch/powerpc/cpu/mpc824x/cpu.c b/arch/powerpc/cpu/mpc824x/cpu.c index 44f91b2..c3188c9 100644 --- a/arch/powerpc/cpu/mpc824x/cpu.c +++ b/arch/powerpc/cpu/mpc824x/cpu.c @@ -92,7 +92,7 @@ int checkdcache (void)

/*------------------------------------------------------------------- */

-int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int __arch_restart(void) { ulong msr, addr;

diff --git a/arch/powerpc/cpu/mpc8260/cpu.c b/arch/powerpc/cpu/mpc8260/cpu.c index 220c1e2..2c07147 100644 --- a/arch/powerpc/cpu/mpc8260/cpu.c +++ b/arch/powerpc/cpu/mpc8260/cpu.c @@ -236,9 +236,7 @@ void upmconfig (uint upm, uint * table, uint size)

/* ------------------------------------------------------------------------- */

-#if !defined(CONFIG_HAVE_OWN_RESET) -int -do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) +int __arch_restart(void) { ulong msr, addr;

@@ -268,9 +266,7 @@ do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) #endif ((void (*)(void)) addr) (); return 1; - } -#endif /* CONFIG_HAVE_OWN_RESET */

/* ------------------------------------------------------------------------- */

diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c index 6635109..03f5154 100644 --- a/arch/powerpc/cpu/mpc83xx/cpu.c +++ b/arch/powerpc/cpu/mpc83xx/cpu.c @@ -126,8 +126,7 @@ int checkcpu(void) return 0; }

-int -do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) +int __arch_restart(void) { ulong msr; #ifndef MPC83xx_RESET @@ -136,8 +135,6 @@ do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])

volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;

- puts("Resetting the board.\n"); - #ifdef MPC83xx_RESET

/* Interrupts and MMU off */ diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c index 1aad2ba..c1690fa 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu.c +++ b/arch/powerpc/cpu/mpc85xx/cpu.c @@ -202,11 +202,11 @@ int checkcpu (void)

/* ------------------------------------------------------------------------- */

-int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) -{ -/* Everything after the first generation of PQ3 parts has RSTCR */ #if defined(CONFIG_MPC8540) || defined(CONFIG_MPC8541) || \ defined(CONFIG_MPC8555) || defined(CONFIG_MPC8560) + +int __arch_restart(void) +{ unsigned long val, msr;

/* @@ -220,15 +220,22 @@ int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) val = mfspr(DBCR0); val |= 0x70000000; mtspr(DBCR0,val); + return 1; +} + #else + +/* Everything after the first generation of PQ3 parts has RSTCR */ +int __arch_restart(void) +{ volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); out_be32(&gur->rstcr, 0x2); /* HRESET_REQ */ udelay(100); -#endif - return 1; }

+#endif +

/* * Get timebase clock frequency diff --git a/arch/powerpc/cpu/mpc86xx/cpu.c b/arch/powerpc/cpu/mpc86xx/cpu.c index ffcc8e6..5633a3a 100644 --- a/arch/powerpc/cpu/mpc86xx/cpu.c +++ b/arch/powerpc/cpu/mpc86xx/cpu.c @@ -32,17 +32,6 @@

DECLARE_GLOBAL_DATA_PTR;

-/* - * Default board reset function - */ -static void -__board_reset(void) -{ - /* Do nothing */ -} -void board_reset(void) __attribute__((weak, alias("__board_reset"))); - - int checkcpu(void) { @@ -123,14 +112,11 @@ checkcpu(void) }

-int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int __arch_restart(void) { volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR; volatile ccsr_gur_t *gur = &immap->im_gur;

- /* Attempt board-specific reset */ - board_reset(); - /* Next try asserting HRESET_REQ */ out_be32(&gur->rstcr, MPC86xx_RSTCR_HRST_REQ);

diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c index 142cfa5..e73b33e 100644 --- a/arch/powerpc/cpu/mpc8xx/cpu.c +++ b/arch/powerpc/cpu/mpc8xx/cpu.c @@ -476,9 +476,7 @@ void upmconfig (uint upm, uint * table, uint size)

/* ------------------------------------------------------------------------- */

-#ifndef CONFIG_LWMON - -int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int __arch_restart(void) { ulong msr, addr;

@@ -512,32 +510,6 @@ int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 1; }

-#else /* CONFIG_LWMON */ - -/* - * On the LWMON board, the MCLR reset input of the PIC's on the board - * uses a 47K/1n RC combination which has a 47us time constant. The - * low signal on the HRESET pin of the CPU is only 512 clocks = 8 us - * and thus too short to reset the external hardware. So we use the - * watchdog to reset the board. - */ -int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) -{ - /* prevent triggering the watchdog */ - disable_interrupts (); - - /* make sure the watchdog is running */ - reset_8xx_watchdog ((immap_t *) CONFIG_SYS_IMMR); - - /* wait for watchdog reset */ - while (1) {}; - - /* NOTREACHED */ - return 1; -} - -#endif /* CONFIG_LWMON */ - /* ------------------------------------------------------------------------- */

/* diff --git a/arch/powerpc/cpu/ppc4xx/cpu.c b/arch/powerpc/cpu/ppc4xx/cpu.c index 67f1fff..add4518 100644 --- a/arch/powerpc/cpu/ppc4xx/cpu.c +++ b/arch/powerpc/cpu/ppc4xx/cpu.c @@ -40,8 +40,6 @@

DECLARE_GLOBAL_DATA_PTR;

-void board_reset(void); - /* * To provide an interface to detect CPU number for boards that support * more then one CPU, we implement the "weak" default functions here. @@ -699,11 +697,8 @@ int ppc440spe_revB() {

/* ------------------------------------------------------------------------- */

-int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int __arch_restart(void) { -#if defined(CONFIG_BOARD_RESET) - board_reset(); -#else #if defined(CONFIG_SYS_4xx_RESET_TYPE) mtspr(SPRN_DBCR0, CONFIG_SYS_4xx_RESET_TYPE << 28); #else @@ -712,7 +707,6 @@ int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) */ mtspr(SPRN_DBCR0, 0x30000000); #endif /* defined(CONFIG_SYS_4xx_RESET_TYPE) */ -#endif /* defined(CONFIG_BOARD_RESET) */

return 1; } diff --git a/board/amcc/yosemite/yosemite.c b/board/amcc/yosemite/yosemite.c index aaeab6f..74f675a 100644 --- a/board/amcc/yosemite/yosemite.c +++ b/board/amcc/yosemite/yosemite.c @@ -365,8 +365,9 @@ void hw_watchdog_reset(void) } #endif

-void board_reset(void) +int __board_restart(void) { /* give reset to BCSR */ *(unsigned char *)(CONFIG_SYS_BCSR_BASE | 0x06) = 0x09; + return -1; } diff --git a/board/eltec/bab7xx/bab7xx.c b/board/eltec/bab7xx/bab7xx.c index ea4897b..5cd1525 100644 --- a/board/eltec/bab7xx/bab7xx.c +++ b/board/eltec/bab7xx/bab7xx.c @@ -181,10 +181,10 @@ void after_reloc (ulong dest_addr) /* ------------------------------------------------------------------------- */

/* - * do_reset is done here because in this case it is board specific, since the + * reset is done here because in this case it is board specific, since the * 7xx CPUs can only be reset by external HW (the RTC in this case). */ -int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int __board_restart(void) { #if defined(CONFIG_RTC_MK48T59) /* trigger watchdog immediately */ diff --git a/board/eltec/elppc/elppc.c b/board/eltec/elppc/elppc.c index cb9ab86..e10a984 100644 --- a/board/eltec/elppc/elppc.c +++ b/board/eltec/elppc/elppc.c @@ -117,7 +117,7 @@ phys_size_t initdram (int board_type) * Register PI in the MPC 107 (at offset 0x41090 of the Embedded Utilities * Memory Block). */ -int do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) +int __board_restart(void) { out8 (MPC107_EUMB_PI, 1); return (0); diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c index d7dd470..ee31588 100644 --- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c +++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c @@ -314,7 +314,7 @@ int board_eth_init(bd_t *bis) return pci_eth_init(bis); }

-void board_reset(void) +int __board_restart(void) { u8 *pixis_base = (u8 *)PIXIS_BASE;

@@ -322,4 +322,5 @@ void board_reset(void)

while (1) ; + return -1; } diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c index 166ff0c..60b52cf 100644 --- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c +++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c @@ -252,7 +252,7 @@ int board_eth_init(bd_t *bis) return pci_eth_init(bis); }

-void board_reset(void) +int __board_restart(void) { u8 *pixis_base = (u8 *)PIXIS_BASE;

@@ -260,6 +260,7 @@ void board_reset(void)

while (1) ; + return -1; }

#ifdef CONFIG_MP diff --git a/board/funkwerk/vovpn-gw/vovpn-gw.c b/board/funkwerk/vovpn-gw/vovpn-gw.c index a4bfbc9..14d495b 100644 --- a/board/funkwerk/vovpn-gw/vovpn-gw.c +++ b/board/funkwerk/vovpn-gw/vovpn-gw.c @@ -304,9 +304,7 @@ int misc_init_r (void) return 0; }

-#if defined(CONFIG_HAVE_OWN_RESET) -int -do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int __board_restart(void) { volatile ioport_t *iop;

@@ -314,7 +312,6 @@ do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) iop->pdat |= 0x00002000; /* PC18 = HW_RESET */ return 1; } -#endif /* CONFIG_HAVE_OWN_RESET */

#define ns2clk(ns) (ns / (1000000000 / CONFIG_8260_CLKIN) + 1)

diff --git a/board/lwmon/lwmon.c b/board/lwmon/lwmon.c index 9d6c21f..4c99b68 100644 --- a/board/lwmon/lwmon.c +++ b/board/lwmon/lwmon.c @@ -1052,6 +1052,28 @@ void board_poweroff (void) while (1); }

+/* + * On the LWMON board, the MCLR reset input of the PIC's on the board + * uses a 47K/1n RC combination which has a 47us time constant. The + * low signal on the HRESET pin of the CPU is only 512 clocks = 8 us + * and thus too short to reset the external hardware. So we use the + * watchdog to reset the board. + */ +int __board_restart(void) +{ + /* prevent triggering the watchdog */ + disable_interrupts (); + + /* make sure the watchdog is running */ + reset_8xx_watchdog ((immap_t *) CONFIG_SYS_IMMR); + + /* wait for watchdog reset */ + while (1) {}; + + /* NOTREACHED */ + return 1; +} + #ifdef CONFIG_MODEM_SUPPORT static int key_pressed(void) { diff --git a/board/lwmon5/lwmon5.c b/board/lwmon5/lwmon5.c index dd275bf..f659fd6 100644 --- a/board/lwmon5/lwmon5.c +++ b/board/lwmon5/lwmon5.c @@ -490,7 +490,8 @@ void video_get_info_str(int line_number, char *info) #endif /* CONFIG_CONSOLE_EXTRA_INFO */ #endif /* CONFIG_VIDEO */

-void board_reset(void) +int __board_restart(void) { gpio_write_bit(CONFIG_SYS_GPIO_BOARD_RESET, 1); + return -1; } diff --git a/board/pcippc2/pcippc2.c b/board/pcippc2/pcippc2.c index 4a91458..568b6f1 100644 --- a/board/pcippc2/pcippc2.c +++ b/board/pcippc2/pcippc2.c @@ -69,7 +69,7 @@ phys_size_t initdram (int board_type) return cpc710_ram_init (); }

-int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int __board_restart(void) { out32 (REG (CPC0, SPOR), 0); iobarrier_rw (); diff --git a/board/ppmc7xx/ppmc7xx.c b/board/ppmc7xx/ppmc7xx.c index 432d366..709fa33 100644 --- a/board/ppmc7xx/ppmc7xx.c +++ b/board/ppmc7xx/ppmc7xx.c @@ -84,14 +84,12 @@ int misc_init_r( void )

/* - * do_reset() + * __board_restart() * - * Shell command to reset the board. + * Called when the board needs to be rebooted */ -int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int __board_restart(void) { - printf( "Resetting...\n" ); - /* Disabe and invalidate cache */ icache_disable(); dcache_disable(); @@ -106,6 +104,16 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 1; }

+/* + * The __board_restart() just jumps back to RAM, which isn't safe to do in + * emergency conditions. Since we don't have anything better to do, just + * fall through into the default hang(). + */ +void __board_emergency_restart(void) +{ + return; +} + int board_eth_init(bd_t *bis) { return pci_eth_init(bis); diff --git a/board/sbc8641d/sbc8641d.c b/board/sbc8641d/sbc8641d.c index 5c30b26..4d8f17c 100644 --- a/board/sbc8641d/sbc8641d.c +++ b/board/sbc8641d/sbc8641d.c @@ -245,7 +245,7 @@ unsigned long get_board_sys_clk (ulong dummy) return val; }

-void board_reset(void) +int __board_restart(void) { #ifdef CONFIG_SYS_RESET_ADDRESS ulong addr = CONFIG_SYS_RESET_ADDRESS; @@ -272,6 +272,7 @@ void board_reset(void) __asm__ __volatile__ ("mtspr 27, 4"); __asm__ __volatile__ ("rfi"); #endif + return -1; }

#ifdef CONFIG_MP diff --git a/include/configs/VoVPN-GW.h b/include/configs/VoVPN-GW.h index c06909f..796c9a0 100644 --- a/include/configs/VoVPN-GW.h +++ b/include/configs/VoVPN-GW.h @@ -47,9 +47,6 @@ /* have reset_phy_r() function */ #define CONFIG_RESET_PHY_R 1

-/* have special reset function */ -#define CONFIG_HAVE_OWN_RESET 1 - /* allow serial and ethaddr to be overwritten */ #define CONFIG_ENV_OVERWRITE

diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index a1ead70..a8c6348 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -49,7 +49,6 @@ #define CONFIG_BOARD_EARLY_INIT_R /* Call board_early_init_r */ #define CONFIG_BOARD_POSTCLK_INIT /* Call board_postclk_init */ #define CONFIG_MISC_INIT_R /* Call misc_init_r */ -#define CONFIG_BOARD_RESET /* Call board_reset */

/* * Base addresses -- Note these are effective addresses where the diff --git a/include/configs/yosemite.h b/include/configs/yosemite.h index 0cbef6f..1657d91 100644 --- a/include/configs/yosemite.h +++ b/include/configs/yosemite.h @@ -51,7 +51,6 @@

#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */ #define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */ -#define CONFIG_BOARD_RESET 1 /* call board_reset() */

/*----------------------------------------------------------------------- * Base addresses -- Note these are effective addresses where the

The SuperH port uses the exact same restart code on all supported CPUs, so that do_reset() function is simply altered to use the new prototype for __arch_restart().

It will probably work even when the CPU is in a bad state, so no separate __arch_emergency_restart() function is required.

Signed-off-by: Kyle Moffett Kyle.D.Moffett@boeing.com Cc: Nobuhiro Iwamatsu iwamatsu@nigauri.org --- arch/sh/lib/board.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/sh/lib/board.c b/arch/sh/lib/board.c index 07361b4..9206311 100644 --- a/arch/sh/lib/board.c +++ b/arch/sh/lib/board.c @@ -204,7 +204,7 @@ void sh_generic_init(void)

/***********************************************************************/

-int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int __arch_restart(void) { disable_interrupts();

The Sparc port appears to use no generic hardware capability for performing a CPU reset. Since all of the supported boards use the exact same code to perform a jump-to-flash it goes into __arch_restart().

This means that Sparc has a no-op __arch_emergency_restart() function. If the CPU is in an invalid state then jump-to-FLASH probably won't work.

Signed-off-by: Kyle Moffett Kyle.D.Moffett@boeing.com Cc: Daniel Hellstrom daniel@gaisler.com --- arch/sparc/lib/board.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/arch/sparc/lib/board.c b/arch/sparc/lib/board.c index 128ece7..e250274 100644 --- a/arch/sparc/lib/board.c +++ b/arch/sparc/lib/board.c @@ -445,7 +445,7 @@ void hang(void) for (;;) ; }

-int do_reset(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) +int __arch_restart(void) { /* Interrupts off */ disable_interrupts(); @@ -456,4 +456,14 @@ int do_reset(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) return 1; }

+/* + * The __arch_restart() just jumps back to flash, which isn't safe to do in + * emergency conditions. Since we don't have anything better to do, just + * fall through into the default hang(). + */ +void __arch_emergency_restart(void) +{ + return; +} + /************************************************************************/