random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-13 20:36:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

board: freescale: p1_p2_rdb_pc: Turn off watchdog before reset

Browse Source 
P1/P2 RDB boards have external max6370 watchdog connected to CPLD and this
watchdog is not deactivated on board reset. So if it is active during board
reset, it can trigger another reset when CPU is booting U-Boot. To prevent
possible infinite reset loop caused by external watchdog, turn it off
before reset.

Do it via a new board_reset_prepare() callback which is called from
do_reset() function before any reset sequence.

Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
This commit is contained in:
Pali Rohár 2022-08-01 15:31:46 +02:00 committed by Peng Fan
parent 7e962cb132
commit 44366be10a
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/cpu/mpc85xx/cpu.c
View File

@ -44,6 +44,7 @@ __board_reset(void)
{ {
/* Do nothing */ /* Do nothing */
} }
void board_reset_prepare(void) __attribute__((weak, alias("__board_reset")));
void board_reset(void) __attribute__((weak, alias("__board_reset"))); void board_reset(void) __attribute__((weak, alias("__board_reset")));
void board_reset_last(void) __attribute__((weak, alias("__board_reset"))); void board_reset_last(void) __attribute__((weak, alias("__board_reset")));
@ -320,6 +321,9 @@ int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
#else #else
volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
/* Call board-specific preparation for reset */
board_reset_prepare();
/* Attempt board-specific reset */ /* Attempt board-specific reset */
board_reset(); board_reset();

12
board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
View File

@ -83,6 +83,18 @@ struct cpld_data {
#define CPLD_FXS_LED 0x0F #define CPLD_FXS_LED 0x0F
#define CPLD_SYS_RST 0x00 #define CPLD_SYS_RST 0x00
void board_reset_prepare(void)
{
/*
* During reset preparation, turn off external watchdog.
* This ensures that external watchdog does not trigger
* another reset or possible infinite reset loop.
*/
struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE);
out_8(&cpld_data->wd_cfg, CPLD_WD_CFG);
in_8(&cpld_data->wd_cfg); /* Read back to sync write */
}
void board_reset_last(void) void board_reset_last(void)
{ {
struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE); struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE);