diff options
| author | Mary Ruthven <mruthven@chromium.org> | 2021-11-09 17:28:46 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-11-18 04:51:59 +0000 |
| commit | 1ff6bd60f692e8900f82a449b9fe7b1299d24581 (patch) | |
| tree | 060a212d7d227623d9bc4f538f1e87c6cc553c1b /common | |
| parent | 6fe661db731627a0d2ef82cef4bed594dce469ec (diff) | |
| download | chrome-ec-1ff6bd60f692e8900f82a449b9fe7b1299d24581.tar.gz | |
Revert "system: Log PC and task id on watchdog"
This reverts commit 0037fb8dfcd7136d40e608ad9973331bd82d9a80.
Merge conflict RESET_FLAG_WATCHDOG renamed to EC_RESET_FLAG_WATCHDOG
BUG=b:200823466
TEST=make buildall -j
Change-Id: Icf366b474e54c66a01ed68b6650b60d234a14064
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3273439
Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/system.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/common/system.c b/common/system.c index b26d35e1d2..b2982b12d0 100644 --- a/common/system.c +++ b/common/system.c @@ -759,19 +759,12 @@ void system_common_pre_init(void) #ifdef CONFIG_SOFTWARE_PANIC /* - * Log panic cause if watchdog caused reset and panic cause - * was not already logged. This must happen before calculating - * jump_data address because it might change panic pointer. + * Log panic cause if watchdog caused reset. This + * must happen before calculating jump_data address + * because it might change panic pointer. */ - if (system_get_reset_flags() & EC_RESET_FLAG_WATCHDOG) { - uint32_t reason; - uint32_t info; - uint8_t exception; - - panic_get_reason(&reason, &info, &exception); - if (reason != PANIC_SW_WATCHDOG) - panic_set_reason(PANIC_SW_WATCHDOG, 0, 0); - } + if (system_get_reset_flags() & EC_RESET_FLAG_WATCHDOG) + panic_set_reason(PANIC_SW_WATCHDOG, 0, 0); #endif /* |