From c85220654f03e1c0815627c36fb3928aef4e6850 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Tue, 6 May 2014 15:44:14 -0700 Subject: [PATCH] nyan*: Detect watchdog resets and reset the whole machine. When a watchdog reset happens, the SOC will reset but other parts of the system might not. That puts the machine in a funny state and may prevent it from booting properly. BUG=chrome-os-partner:28559 TEST=Built for nyan, nyan_big and nyan_blaze. Booted normally, through EC reset, software reset ("reboot" command from the terminal), and through watch dog reset. Verified that the new code only triggered during the watchdog reset and that the system rebooted and was able to boot without going into recovery mode unnecessarily. BRANCH=nyan Change-Id: Id92411c928344547fcd97e45063e4aff52d2e9e8 Signed-off-by: Gabe Black Reviewed-on: https://chromium-review.googlesource.com/198582 Reviewed-by: Tom Warren Reviewed-by: Andrew Bresticker Commit-Queue: Gabe Black Tested-by: Gabe Black (cherry picked from commit b298be41c0959c58aeb8be5bf15141549da2504c) Signed-off-by: Marc Jones Reviewed-on: http://review.coreboot.org/7900 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan --- src/mainboard/google/nyan/Makefile.inc | 1 + src/mainboard/google/nyan/romstage.c | 11 +++++++++++ src/mainboard/google/nyan_big/Makefile.inc | 1 + src/mainboard/google/nyan_big/romstage.c | 11 +++++++++++ src/mainboard/google/nyan_blaze/Makefile.inc | 1 + src/mainboard/google/nyan_blaze/romstage.c | 11 +++++++++++ 6 files changed, 36 insertions(+) diff --git a/src/mainboard/google/nyan/Makefile.inc b/src/mainboard/google/nyan/Makefile.inc index 30cd27d9fc..b66cd555fb 100644 --- a/src/mainboard/google/nyan/Makefile.inc +++ b/src/mainboard/google/nyan/Makefile.inc @@ -32,6 +32,7 @@ bootblock-y += bootblock.c bootblock-y += pmic.c bootblock-y += reset.c +romstage-y += reset.c romstage-y += romstage.c romstage-y += sdram_configs.c romstage-$(CONFIG_CHROMEOS) += chromeos.c diff --git a/src/mainboard/google/nyan/romstage.c b/src/mainboard/google/nyan/romstage.c index b4e27330ac..4e023654e7 100644 --- a/src/mainboard/google/nyan/romstage.c +++ b/src/mainboard/google/nyan/romstage.c @@ -27,12 +27,14 @@ #include #include #include +#include #include #include #include "sdram_configs.h" #include #include #include +#include #include #include #include @@ -181,6 +183,15 @@ static void __attribute__((noinline)) romstage(void) mmu_disable_range(0, 1); dcache_mmu_enable(); + /* + * A watchdog reset only resets part of the system so it ends up in + * a funny state. If that happens, we need to reset the whole machine. + */ + if (power_reset_status() == POWER_RESET_WATCHDOG) { + printk(BIOS_INFO, "Watchdog reset detected, rebooting.\n"); + cpu_reset(); + } + /* For quality of the user experience, it's important to get * the video going ASAP. Because there are long delays in some * of the powerup steps, we do some very early setup here in diff --git a/src/mainboard/google/nyan_big/Makefile.inc b/src/mainboard/google/nyan_big/Makefile.inc index 30cd27d9fc..b66cd555fb 100644 --- a/src/mainboard/google/nyan_big/Makefile.inc +++ b/src/mainboard/google/nyan_big/Makefile.inc @@ -32,6 +32,7 @@ bootblock-y += bootblock.c bootblock-y += pmic.c bootblock-y += reset.c +romstage-y += reset.c romstage-y += romstage.c romstage-y += sdram_configs.c romstage-$(CONFIG_CHROMEOS) += chromeos.c diff --git a/src/mainboard/google/nyan_big/romstage.c b/src/mainboard/google/nyan_big/romstage.c index b4e27330ac..4e023654e7 100644 --- a/src/mainboard/google/nyan_big/romstage.c +++ b/src/mainboard/google/nyan_big/romstage.c @@ -27,12 +27,14 @@ #include #include #include +#include #include #include #include "sdram_configs.h" #include #include #include +#include #include #include #include @@ -181,6 +183,15 @@ static void __attribute__((noinline)) romstage(void) mmu_disable_range(0, 1); dcache_mmu_enable(); + /* + * A watchdog reset only resets part of the system so it ends up in + * a funny state. If that happens, we need to reset the whole machine. + */ + if (power_reset_status() == POWER_RESET_WATCHDOG) { + printk(BIOS_INFO, "Watchdog reset detected, rebooting.\n"); + cpu_reset(); + } + /* For quality of the user experience, it's important to get * the video going ASAP. Because there are long delays in some * of the powerup steps, we do some very early setup here in diff --git a/src/mainboard/google/nyan_blaze/Makefile.inc b/src/mainboard/google/nyan_blaze/Makefile.inc index 30cd27d9fc..b66cd555fb 100644 --- a/src/mainboard/google/nyan_blaze/Makefile.inc +++ b/src/mainboard/google/nyan_blaze/Makefile.inc @@ -32,6 +32,7 @@ bootblock-y += bootblock.c bootblock-y += pmic.c bootblock-y += reset.c +romstage-y += reset.c romstage-y += romstage.c romstage-y += sdram_configs.c romstage-$(CONFIG_CHROMEOS) += chromeos.c diff --git a/src/mainboard/google/nyan_blaze/romstage.c b/src/mainboard/google/nyan_blaze/romstage.c index b4e27330ac..4e023654e7 100644 --- a/src/mainboard/google/nyan_blaze/romstage.c +++ b/src/mainboard/google/nyan_blaze/romstage.c @@ -27,12 +27,14 @@ #include #include #include +#include #include #include #include "sdram_configs.h" #include #include #include +#include #include #include #include @@ -181,6 +183,15 @@ static void __attribute__((noinline)) romstage(void) mmu_disable_range(0, 1); dcache_mmu_enable(); + /* + * A watchdog reset only resets part of the system so it ends up in + * a funny state. If that happens, we need to reset the whole machine. + */ + if (power_reset_status() == POWER_RESET_WATCHDOG) { + printk(BIOS_INFO, "Watchdog reset detected, rebooting.\n"); + cpu_reset(); + } + /* For quality of the user experience, it's important to get * the video going ASAP. Because there are long delays in some * of the powerup steps, we do some very early setup here in