summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDino Li <Dino.Li@ite.com.tw>2018-05-21 17:15:56 +0800
committerchrome-bot <chrome-bot@chromium.org>2018-05-22 09:49:33 -0700
commit3423505535e3eb0546644337ff8938e28231a90a (patch)
treef9e86745e9744fb332400d993177f62cbb983a78
parentefcd71e07544760605f5c194bf5fdc92965c6d97 (diff)
downloadchrome-ec-3423505535e3eb0546644337ff8938e28231a90a.tar.gz
it83xx: watchdog: print LP on watchdog warning
It's difficult to debug problems with single watchdog warning. This patch will print IPC and LP registers continually if watchdog warning is fired. BRANCH=None BUG=b:79733639 TEST=waitms 1000, EC print warning message but no reset. waitms 3000, EC print warning message and then reset. On bip, EC is powered by servo only. And we got the following watchdog warning message: And we refer to assembly code, the IPC indicates CPU is executing instructions in "gpio_get_level()" (IPC:00002408, IPC:00002404, IPC:000023fc, IPC:0000240e), and calling from "chipset_pre_init_callback()" (LP:0000101e). Pre-WDT warning! IPC:00002408 LP:0000101e Pre-WDT warning! IPC:00002408 LP:0000101e Pre-WDT warning! IPC:00002408 LP:0000101e Pre-WDT warning! IPC:00002408 LP:0000101e Pre-WDT warning! IPC:00002408 LP:0000101e Pre-WDT warning! IPC:00002408 LP:0000101e Pre-WDT warning! IPC:00002408 LP:0000101e Pre-WDT warning! IPC:00002408 LP:0000101e Pre-WDT warning! IPC:00002408 LP:0000101e Pre-WDT warning! IPC:00002408 LP:0000101e Pre-WDT warning! IPC:00002408 LP:0000101e Pre-WDT warning! IPC:00002408 LP:0000101e Pre-WDT warning! IPC:00002408 LP:0000101e Pre-WDT warning! IPC:00002404 LP:0000101e Pre-WDT warning! IPC:000023fc LP:0000101e Pre-WDT warning! IPC:0000240e LP:0000101e Pre-WDT warning! IPC:00002408 LP:0000101e Change-Id: I9e9429806db448624a10c348bee9c6e3d0a7765b Signed-off-by: Dino Li <Dino.Li@ite.com.tw> Reviewed-on: https://chromium-review.googlesource.com/1060937 Reviewed-by: Jett Rink <jettrink@chromium.org>
-rw-r--r--chip/it83xx/watchdog.c40
-rw-r--r--core/nds32/cpu.h2
-rw-r--r--core/nds32/init.S2
-rw-r--r--core/nds32/task.c6
4 files changed, 47 insertions, 3 deletions
diff --git a/chip/it83xx/watchdog.c b/chip/it83xx/watchdog.c
index 1bbba6ceb3..ee21170e34 100644
--- a/chip/it83xx/watchdog.c
+++ b/chip/it83xx/watchdog.c
@@ -16,6 +16,8 @@
/* Panic data goes at the end of RAM. */
static struct panic_data * const pdata_ptr = PANIC_DATA_PTR;
+/* Enter critical period or not. */
+static int wdt_warning_fired;
/*
* We use WDT_EXT_TIMER to trigger an interrupt just before the watchdog timer
@@ -25,6 +27,16 @@ static struct panic_data * const pdata_ptr = PANIC_DATA_PTR;
/* Magic value to tickle the watchdog register. */
#define ITE83XX_WATCHDOG_MAGIC_WORD 0x5C
+/* Start to print warning message. */
+#define ITE83XX_WATCHDOG_WARNING_MS CONFIG_AUX_TIMER_PERIOD_MS
+/* The interval to print warning message at critical period. */
+#define ITE83XX_WATCHDOG_CRITICAL_MS 30
+
+/* set warning timer */
+static void watchdog_set_warning_timer(int32_t ms, int init)
+{
+ ext_timer_ms(WDT_EXT_TIMER, EXT_PSR_32P768K_HZ, 1, 1, ms, init, 0);
+}
void watchdog_warning_irq(void)
{
@@ -37,7 +49,24 @@ void watchdog_warning_irq(void)
/* Reset warning timer. */
IT83XX_ETWD_ETXCTRL(WDT_EXT_TIMER) = 0x03;
- panic_printf("Pre-watchdog warning! IPC: %08x\n", get_ipc());
+ /*
+ * The IPC (Interruption Program Counter) is the shadow stack register
+ * of the PC (Program Counter). It stores the return address of program
+ * (PC->IPC) when the ISR was called.
+ *
+ * The LP (Link Pointer) stores the program address of the next
+ * sequential instruction for function call return purposes.
+ * LP = PC+4 after a jump and link instruction (jal).
+ */
+ panic_printf("Pre-WDT warning! IPC:%08x LP:%08x TASK_ID:%d\n",
+ get_ipc(), ilp, task_get_current());
+
+ if (!wdt_warning_fired++)
+ /*
+ * Reduce interval of warning timer, so we can print more
+ * warning messages during critical period.
+ */
+ watchdog_set_warning_timer(ITE83XX_WATCHDOG_CRITICAL_MS, 0);
}
void watchdog_reload(void)
@@ -47,6 +76,12 @@ void watchdog_reload(void)
/* Restart (tickle) watchdog timer. */
IT83XX_ETWD_EWDKEYR = ITE83XX_WATCHDOG_MAGIC_WORD;
+
+ if (wdt_warning_fired) {
+ wdt_warning_fired = 0;
+ /* Reset warning timer to default if watchdog is touched. */
+ watchdog_set_warning_timer(ITE83XX_WATCHDOG_WARNING_MS, 0);
+ }
}
DECLARE_HOOK(HOOK_TICK, watchdog_reload, HOOK_PRIO_DEFAULT);
@@ -72,8 +107,7 @@ int watchdog_init(void)
#endif
/* Start WDT_EXT_TIMER (CONFIG_AUX_TIMER_PERIOD_MS ms). */
- ext_timer_ms(WDT_EXT_TIMER, EXT_PSR_32P768K_HZ, 1, 1,
- CONFIG_AUX_TIMER_PERIOD_MS, 1, 0);
+ watchdog_set_warning_timer(ITE83XX_WATCHDOG_WARNING_MS, 1);
/* Start timer 1 (must be started for watchdog timer to run). */
IT83XX_ETWD_ET1CNTLLR = 0x00;
diff --git a/core/nds32/cpu.h b/core/nds32/cpu.h
index 2246ec7f77..dcf668bd24 100644
--- a/core/nds32/cpu.h
+++ b/core/nds32/cpu.h
@@ -54,4 +54,6 @@ static inline uint32_t get_itype(void)
/* Generic CPU core initialization */
void cpu_init(void);
+extern uint32_t ilp;
+
#endif /* __CROS_EC_CPU_H */
diff --git a/core/nds32/init.S b/core/nds32/init.S
index 2ee7815908..d13eeb3a57 100644
--- a/core/nds32/init.S
+++ b/core/nds32/init.S
@@ -20,6 +20,8 @@ __entry_\()\name:
smw.adm $r15, [$sp], $r15, 0xb
/* r0-r5 are caller saved */
smw.adm $r0, [$sp], $r5, 0
+ /* store link pointer register */
+ swi.gp $lp, [ + ilp]
/* switch to system stack if we are called from process stack */
la $r3, stack_end
mov55 $fp, $sp
diff --git a/core/nds32/task.c b/core/nds32/task.c
index 17f02cd10e..9a77114651 100644
--- a/core/nds32/task.c
+++ b/core/nds32/task.c
@@ -174,6 +174,12 @@ static int sw_int_num;
/* Number of CPU hardware interrupts (HW0 ~ HW15) */
int cpu_int_entry_number;
+/*
+ * This variable is used to save link pointer register,
+ * and it is updated at the beginning of each ISR.
+ */
+uint32_t ilp;
+
static inline task_ *__task_id_to_ptr(task_id_t id)
{
return tasks + id;