diff options
| author | Ruibin Chang <Ruibin.Chang@ite.com.tw> | 2021-05-24 10:24:40 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-06-09 19:18:00 +0000 |
| commit | 9377aa057d8fe028501fdd6b7462c1c8b29c818f (patch) | |
| tree | 65cdc08478d2c9a96efb6d79359a7e1c255fffe6 | |
| parent | 670bd7e258d352a2ea197e055e46b60690935afc (diff) | |
| download | chrome-ec-9377aa057d8fe028501fdd6b7462c1c8b29c818f.tar.gz | |
zephyr: add new config for adjusting leading time
For the ITE chip, use CONFIG_WDT_ITE_WARNING_LEADING_TIME_MS instead
of CONFIG_PLATFORM_EC_WATCHDOG_WARNING_LEADING_TIME_MS.
BUG=b:187190711
BRANCH=none
TEST=zmake -lDEBUG configure -B zephyr/build
-b zephyr/projects/it8xxx2_evb
zmake -lDEBUG configure -B zephyr/build
-b zephyr/projects/asurada/hayato
Cq-Depend: chromium:2936162
Change-Id: If4d61d72763de9326a3056b6848f0ca90f27746c
Signed-off-by: Ruibin Chang <Ruibin.Chang@ite.com.tw>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2914711
Commit-Queue: Keith Short <keithshort@chromium.org>
Reviewed-by: Keith Short <keithshort@chromium.org>
| -rw-r--r-- | zephyr/Kconfig.watchdog | 4 | ||||
| -rw-r--r-- | zephyr/shim/include/config_chip.h | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/zephyr/Kconfig.watchdog b/zephyr/Kconfig.watchdog index be87e4bce5..7d5860ce34 100644 --- a/zephyr/Kconfig.watchdog +++ b/zephyr/Kconfig.watchdog @@ -14,7 +14,7 @@ config PLATFORM_EC_WATCHDOG_PERIOD_MS config PLATFORM_EC_WATCHDOG_WARNING_LEADING_TIME_MS int "Leading time of the watchdog warning timer in ms" default 500 - depends on !WDT_NPCX + depends on !WDT_NPCX && !WDT_ITE_IT8XXX2 help Set the leading time of the watchdog warning timer. Chromium EC system uses an auxiliary timer to handle the system warning event. The @@ -23,5 +23,7 @@ config PLATFORM_EC_WATCHDOG_WARNING_LEADING_TIME_MS PLATFORM_EC_WATCHDOG_WARNING_LEADING_TIME_MS. For the NPCX chip, use WDT_NPCX_DELAY_CYCLES instead of this config. + For the ITE chip, use CONFIG_WDT_ITE_WARNING_LEADING_TIME_MS instead + of this config. endif # PLATFORM_EC_WATCHDOG diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h index 9a23b725e2..9c3a84de5b 100644 --- a/zephyr/shim/include/config_chip.h +++ b/zephyr/shim/include/config_chip.h @@ -1413,14 +1413,21 @@ #undef CONFIG_WATCHDOG_WARNING_LEADING_TIME_MS #if defined(CONFIG_PLATFORM_EC_WATCHDOG_WARNING_LEADING_TIME_MS) || \ - defined(CONFIG_WDT_NPCX_DELAY_CYCLES) + defined(CONFIG_WDT_NPCX_DELAY_CYCLES) || \ + defined(CONFIG_WDT_ITE_WARNING_LEADING_TIME_MS) /* - * Note: NPCX wdt driver uses CONFIG_WDT_NPCX_DELAY_CYCLES to set the leading + * Note: + * NPCX wdt driver uses CONFIG_WDT_NPCX_DELAY_CYCLES to set the leading * time of the watchdog warning timer. + * IT8XXX2 WDT driver uses CONFIG_WDT_ITE_WARNING_LEADING_TIME_MS period + * between watchdog warning and reset. */ #ifdef CONFIG_WDT_NPCX_DELAY_CYCLES #define CONFIG_WATCHDOG_WARNING_LEADING_TIME_MS \ (CONFIG_WDT_NPCX_DELAY_CYCLES * 31) +#elif CONFIG_WDT_ITE_WARNING_LEADING_TIME_MS +#define CONFIG_WATCHDOG_WARNING_LEADING_TIME_MS \ + CONFIG_WDT_ITE_WARNING_LEADING_TIME_MS #else #define CONFIG_WATCHDOG_WARNING_LEADING_TIME_MS \ CONFIG_PLATFORM_EC_WATCHDOG_WARNING_LEADING_TIME_MS |