Merge branch 'feature/h2_wdt' into 'master'

wdt: add support for H2 Closes IDF-6643 and IDF-6678 See merge request espressif/esp-idf!22422
espressif · Feb 24, 2023 · c2f9392 · c2f9392
2 parents b184b9a + 5d26a0d
commit c2f9392
Show file tree

Hide file tree

Showing 24 changed files with 139 additions and 83 deletions.
diff --git a/components/esp_rom/CMakeLists.txt b/components/esp_rom/CMakeLists.txt
@@ -119,11 +119,16 @@ if(BOOTLOADER_BUILD)
         rom_linker_script("newlib")
         # The linking of the bootloader needs to use the rom_i2c_writeReg_Mask in esp32c6.rom.phy.ld
         rom_linker_script("phy")
-        rom_linker_script("wdt")
+        if(CONFIG_HAL_WDT_USE_ROM_IMPL)
+            rom_linker_script("wdt")
+        endif()
         rom_linker_script("version")
 
     elseif(target STREQUAL "esp32h2")
         rom_linker_script("newlib")
+        if(CONFIG_HAL_WDT_USE_ROM_IMPL)
+            rom_linker_script("wdt")
+        endif()
     endif()
 
 else() # Regular app build
@@ -261,6 +266,10 @@ else() # Regular app build
             rom_linker_script("spiflash")
         endif()
 
+        if(CONFIG_HAL_WDT_USE_ROM_IMPL)
+            rom_linker_script("wdt")
+        endif()
+
         if(CONFIG_NEWLIB_NANO_FORMAT)
             # nano formatting functions in ROM are also built for 64-bit time_t.
             rom_linker_script("newlib-nano")

diff --git a/components/esp_rom/esp32c6/Kconfig.soc_caps.in b/components/esp_rom/esp32c6/Kconfig.soc_caps.in
@@ -66,3 +66,7 @@ config ESP_ROM_HAS_NEWLIB_NORMAL_FORMAT
 config ESP_ROM_REV0_HAS_NO_ECDSA_INTERFACE
     bool
     default y
+
+config ESP_ROM_WDT_INIT_PATCH
+    bool
+    default y
diff --git a/components/esp_rom/esp32c6/esp_rom_caps.h b/components/esp_rom/esp32c6/esp_rom_caps.h
@@ -22,3 +22,4 @@
 #define ESP_ROM_HAS_REGI2C_BUG              (1) // ROM has the regi2c bug
 #define ESP_ROM_HAS_NEWLIB_NORMAL_FORMAT    (1) // ROM has the newlib normal/full version of formatting functions (as opposed to the nano versions)
 #define ESP_ROM_REV0_HAS_NO_ECDSA_INTERFACE (1) // ECO 0 does not have ets_ecdsa_verify symbol, future revision will have it
+#define ESP_ROM_WDT_INIT_PATCH              (1) // ROM version does not configure the clock
diff --git a/components/esp_rom/esp32h2/Kconfig.soc_caps.in b/components/esp_rom/esp32h2/Kconfig.soc_caps.in
@@ -54,3 +54,7 @@ config ESP_ROM_WITHOUT_REGI2C
 config ESP_ROM_HAS_NEWLIB_NANO_FORMAT
     bool
     default y
+
+config ESP_ROM_WDT_INIT_PATCH
+    bool
+    default y
diff --git a/components/esp_rom/esp32h2/esp_rom_caps.h b/components/esp_rom/esp32h2/esp_rom_caps.h
@@ -19,3 +19,4 @@
 #define ESP_ROM_HAS_SPI_FLASH               (1) // ROM has the implementation of SPI Flash driver
 #define ESP_ROM_WITHOUT_REGI2C              (1) // ROM has no regi2c APIs
 #define ESP_ROM_HAS_NEWLIB_NANO_FORMAT      (1) // ROM has the newlib nano versions of formatting functions
+#define ESP_ROM_WDT_INIT_PATCH              (1) // ROM version does not configure the clock
diff --git a/components/esp_rom/esp32h2/ld/esp32h2.rom.ld b/components/esp_rom/esp32h2/ld/esp32h2.rom.ld
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -160,24 +160,6 @@ g_flash_guard_ops = 0x4084fff4;
 /* Note: esp_rom_spiflash_write_disable was moved from esp32c6.rom.spiflash.ld */
 esp_rom_spiflash_write_disable = 0x40000270;
 
-/***************************************
- Group hal_wdt
- ***************************************/
-
-/* Functions */
-wdt_hal_init = 0x4000038c;
-wdt_hal_deinit = 0x40000390;
-wdt_hal_config_stage = 0x40000394;
-wdt_hal_write_protect_disable = 0x40000398;
-wdt_hal_write_protect_enable = 0x4000039c;
-wdt_hal_enable = 0x400003a0;
-wdt_hal_disable = 0x400003a4;
-wdt_hal_handle_intr = 0x400003a8;
-wdt_hal_feed = 0x400003ac;
-wdt_hal_set_flashboot_en = 0x400003b0;
-wdt_hal_is_enabled = 0x400003b4;
-
-
 /***************************************
  Group hal_systimer
  ***************************************/

diff --git a/components/esp_rom/esp32h2/ld/esp32h2.rom.wdt.ld b/components/esp_rom/esp32h2/ld/esp32h2.rom.wdt.ld
@@ -0,0 +1,26 @@
+/*
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/***************************************
+ Group hal_wdt
+ ***************************************/
+
+/* Functions */
+
+/* Patch init function to set clock source
+wdt_hal_init = 0x4000038c;
+wdt_hal_deinit = 0x40000390;
+*/
+
+/* Functions */
+wdt_hal_config_stage = 0x40000394;
+wdt_hal_write_protect_disable = 0x40000398;
+wdt_hal_write_protect_enable = 0x4000039c;
+wdt_hal_enable = 0x400003a0;
+wdt_hal_disable = 0x400003a4;
+wdt_hal_handle_intr = 0x400003a8;
+wdt_hal_feed = 0x400003ac;
+wdt_hal_set_flashboot_en = 0x400003b0;
+wdt_hal_is_enabled = 0x400003b4;
diff --git a/components/esp_rom/patches/esp_rom_wdt.c b/components/esp_rom/patches/esp_rom_wdt.c
@@ -7,13 +7,15 @@
 #include "sdkconfig.h"
 #include <stddef.h>
 
+#include "esp_rom_caps.h"
+
 #include "hal/wdt_types.h"
 #include "hal/wdt_hal.h"
 #include "hal/mwdt_ll.h"
 
 #if CONFIG_HAL_WDT_USE_ROM_IMPL
 
-#if CONFIG_IDF_TARGET_ESP32C6
+#if ESP_ROM_WDT_INIT_PATCH
 void wdt_hal_init(wdt_hal_context_t *hal, wdt_inst_t wdt_inst, uint32_t prescaler, bool enable_intr)
 {
     //Initialize HAL context
@@ -116,6 +118,6 @@ void wdt_hal_deinit(wdt_hal_context_t *hal)
     //Deinit HAL context
     hal->mwdt_dev = NULL;
 }
-#endif // CONFIG_IDF_TARGET_ESP32C6
+#endif // ESP_ROM_WDT_INIT_PATCH
 
 #endif // CONFIG_HAL_WDT_USE_ROM_IMPL
diff --git a/components/esp_system/include/esp_private/esp_int_wdt.h b/components/esp_system/include/esp_private/esp_int_wdt.h
@@ -6,31 +6,10 @@
 
 #pragma once
 
-#include "system_internal.h"
-#include "soc/periph_defs.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#if SOC_TIMER_GROUPS > 1
-
-/* If we have two hardware timer groups, use the second one for interrupt watchdog. */
-#define WDT_LEVEL_INTR_SOURCE   ETS_TG1_WDT_LEVEL_INTR_SOURCE
-#define IWDT_PRESCALER          MWDT1_TICK_PRESCALER   // Tick period of 500us if WDT source clock is 80MHz
-#define IWDT_TICKS_PER_US       MWDT1_TICKS_PER_US
-#define IWDT_INSTANCE           WDT_MWDT1
-#define IWDT_INITIAL_TIMEOUT_S  5
-
-#else
-
-#define WDT_LEVEL_INTR_SOURCE   ETS_TG0_WDT_LEVEL_INTR_SOURCE
-#define IWDT_PRESCALER          MWDT0_TICK_PRESCALER   // Tick period of 500us if WDT source clock is 80MHz
-#define IWDT_TICKS_PER_US       MWDT0_TICKS_PER_US
-#define IWDT_INSTANCE           WDT_MWDT0
-#define IWDT_INITIAL_TIMEOUT_S  5
-
-#endif // SOC_TIMER_GROUPS > 1
 
 /**
  * @brief Initialize the non-CPU-specific parts of interrupt watchdog.

diff --git a/components/esp_system/include/esp_private/system_internal.h b/components/esp_system/include/esp_private/system_internal.h
@@ -11,28 +11,6 @@ extern "C" {
 #endif
 
 #include "esp_system.h"
-#include "soc/soc_caps.h"
-
-#if SOC_TIMER_GROUPS >= 2
-
-/* All the targets that have more than one timer group are using
- * APB or PLL clock by default (depends on target).
- * The following configurations are based on 80MHz clock
- */
-#define MWDT0_TICK_PRESCALER    40000
-#define MWDT0_TICKS_PER_US      500
-#define MWDT1_TICK_PRESCALER    40000
-#define MWDT1_TICKS_PER_US      500
-
-#else
-
-/* The targets that have a single timer group use a 40MHz clock for the
- * Timer Group 0. Let's adapt the prescaler value accordingly.
- */
-#define MWDT0_TICK_PRESCALER    20000
-#define MWDT0_TICKS_PER_US      500
-
-#endif
 
 /**
  * @brief  Internal function to restart PRO and APP CPUs.

diff --git a/components/esp_system/int_wdt.c b/components/esp_system/int_wdt.c
@@ -10,6 +10,7 @@
 #include "sdkconfig.h"
 #include "soc/soc_caps.h"
 #include "hal/wdt_hal.h"
+#include "hal/mwdt_ll.h"
 #include "freertos/FreeRTOS.h"
 #include "esp_cpu.h"
 #include "esp_err.h"
@@ -21,6 +22,25 @@
 #include "esp_private/periph_ctrl.h"
 #include "esp_private/esp_int_wdt.h"
 
+#if SOC_TIMER_GROUPS > 1
+
+/* If we have two hardware timer groups, use the second one for interrupt watchdog. */
+#define WDT_LEVEL_INTR_SOURCE   ETS_TG1_WDT_LEVEL_INTR_SOURCE
+#define IWDT_PRESCALER          MWDT_LL_DEFAULT_CLK_PRESCALER   // Tick period of 500us if WDT source clock is 80MHz
+#define IWDT_TICKS_PER_US       500
+#define IWDT_INSTANCE           WDT_MWDT1
+#define IWDT_INITIAL_TIMEOUT_S  5
+
+#else
+
+#define WDT_LEVEL_INTR_SOURCE   ETS_TG0_WDT_LEVEL_INTR_SOURCE
+#define IWDT_PRESCALER          MWDT_LL_DEFAULT_CLK_PRESCALER   // Tick period of 500us if WDT source clock is 80MHz
+#define IWDT_TICKS_PER_US       500
+#define IWDT_INSTANCE           WDT_MWDT0
+#define IWDT_INITIAL_TIMEOUT_S  5
+
+#endif // SOC_TIMER_GROUPS > 1
+
 #if CONFIG_ESP_INT_WDT
 
 static wdt_hal_context_t iwdt_context;

diff --git a/components/esp_system/panic.c b/components/esp_system/panic.c
@@ -17,6 +17,7 @@
 #include "hal/timer_hal.h"
 #include "hal/wdt_types.h"
 #include "hal/wdt_hal.h"
+#include "hal/mwdt_ll.h"
 #include "esp_private/esp_int_wdt.h"
 
 #include "esp_private/panic_internal.h"
@@ -59,6 +60,8 @@
 #include "hal/usb_serial_jtag_ll.h"
 #endif
 
+#define MWDT_DEFAULT_TICKS_PER_US       500
+
 bool g_panic_abort = false;
 static char *s_panic_abort_details = NULL;
 
@@ -179,9 +182,9 @@ void esp_panic_handler_reconfigure_wdts(uint32_t timeout_ms)
 
     //Todo: Refactor to use Interrupt or Task Watchdog API, and a system level WDT context
     //Reconfigure TWDT (Timer Group 0)
-    wdt_hal_init(&wdt0_context, WDT_MWDT0, MWDT0_TICK_PRESCALER, false); //Prescaler: wdt counts in ticks of TG0_WDT_TICK_US
+    wdt_hal_init(&wdt0_context, WDT_MWDT0, MWDT_LL_DEFAULT_CLK_PRESCALER, false); //Prescaler: wdt counts in ticks of TG0_WDT_TICK_US
     wdt_hal_write_protect_disable(&wdt0_context);
-    wdt_hal_config_stage(&wdt0_context, 0, timeout_ms * 1000 / MWDT0_TICKS_PER_US, WDT_STAGE_ACTION_RESET_SYSTEM); //1 second before reset
+    wdt_hal_config_stage(&wdt0_context, 0, timeout_ms * 1000 / MWDT_DEFAULT_TICKS_PER_US, WDT_STAGE_ACTION_RESET_SYSTEM); //1 second before reset
     wdt_hal_enable(&wdt0_context);
     wdt_hal_write_protect_enable(&wdt0_context);
 

diff --git a/components/esp_system/task_wdt/task_wdt_impl_timergroup.c b/components/esp_system/task_wdt/task_wdt_impl_timergroup.c
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include "sdkconfig.h"
 #include "hal/wdt_hal.h"
+#include "hal/mwdt_ll.h"
 #include "esp_err.h"
 #include "esp_attr.h"
 #include "esp_intr_alloc.h"
@@ -17,8 +18,8 @@
 #include "esp_private/esp_task_wdt_impl.h"
 
 #define TWDT_INSTANCE           WDT_MWDT0
-#define TWDT_TICKS_PER_US       MWDT0_TICKS_PER_US
-#define TWDT_PRESCALER          MWDT0_TICK_PRESCALER   // Tick period of 500us if WDT source clock is 80MHz
+#define TWDT_TICKS_PER_US       500
+#define TWDT_PRESCALER          MWDT_LL_DEFAULT_CLK_PRESCALER   // Tick period of 500us if WDT source clock is 80MHz
 #define TWDT_PERIPH_MODULE      PERIPH_TIMG0_MODULE
 #define TWDT_INTR_SOURCE        ETS_TG0_WDT_LEVEL_INTR_SOURCE
 

diff --git a/components/esp_system/test/test_task_wdt.c b/components/esp_system/test/test_task_wdt.c
@@ -23,7 +23,6 @@ void esp_task_wdt_isr_user_handler(void)
     timeout_flag = true;
 }
 
-#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32H2)
 TEST_CASE("Task WDT task timeout", "[task_wdt]")
 {
     timeout_flag = false;
@@ -94,7 +93,6 @@ TEST_CASE("Task WDT can be reconfigured", "[task_wdt]")
     TEST_ASSERT_EQUAL(ESP_OK, esp_task_wdt_delete(NULL));
     TEST_ASSERT_EQUAL(ESP_OK, esp_task_wdt_deinit());
 }
-#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32H2)
 
 TEST_CASE("Task WDT task feed", "[task_wdt]")
 {
@@ -115,7 +113,6 @@ TEST_CASE("Task WDT task feed", "[task_wdt]")
     TEST_ASSERT_EQUAL(ESP_OK, esp_task_wdt_deinit());
 }
 
-#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32H2)
 TEST_CASE("Task WDT user timeout", "[task_wdt]")
 {
     const char *user_name = "test_user";
@@ -134,7 +131,6 @@ TEST_CASE("Task WDT user timeout", "[task_wdt]")
     TEST_ASSERT_EQUAL(ESP_OK, esp_task_wdt_delete_user(user_handle));
     TEST_ASSERT_EQUAL(ESP_OK, esp_task_wdt_deinit());
 }
-#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32H2)
 
 TEST_CASE("Task WDT user feed", "[task_wdt]")
 {

diff --git a/components/hal/esp32/include/hal/mwdt_ll.h b/components/hal/esp32/include/hal/mwdt_ll.h
@@ -23,6 +23,9 @@ extern "C" {
 #include "esp_attr.h"
 #include "esp_assert.h"
 
+/* Pre-calculated prescaler to achieve 500 ticks/us (MWDT1_TICKS_PER_US) when using default clock (MWDT_CLK_SRC_DEFAULT ) */
+#define MWDT_LL_DEFAULT_CLK_PRESCALER 40000
+
 //Type check wdt_stage_action_t
 ESP_STATIC_ASSERT(WDT_STAGE_ACTION_OFF == TIMG_WDT_STG_SEL_OFF, "Add mapping to LL watchdog timeout behavior, since it's no longer naturally compatible with wdt_stage_action_t");
 ESP_STATIC_ASSERT(WDT_STAGE_ACTION_INT == TIMG_WDT_STG_SEL_INT, "Add mapping to LL watchdog timeout behavior, since it's no longer naturally compatible with wdt_stage_action_t");

diff --git a/components/hal/esp32c2/include/hal/mwdt_ll.h b/components/hal/esp32c2/include/hal/mwdt_ll.h
@@ -23,6 +23,9 @@ extern "C" {
 #include "hal/check.h"
 #include "hal/assert.h"
 
+/* Pre-calculated prescaler to achieve 500 ticks/us (MWDT1_TICKS_PER_US) when using default clock (MWDT_CLK_SRC_DEFAULT ) */
+#define MWDT_LL_DEFAULT_CLK_PRESCALER 20000
+
 //Type check wdt_stage_action_t
 STATIC_HAL_REG_CHECK("mwdt", WDT_STAGE_ACTION_OFF, TIMG_WDT_STG_SEL_OFF);
 STATIC_HAL_REG_CHECK("mwdt", WDT_STAGE_ACTION_INT, TIMG_WDT_STG_SEL_INT);

diff --git a/components/hal/esp32c3/include/hal/mwdt_ll.h b/components/hal/esp32c3/include/hal/mwdt_ll.h
@@ -23,6 +23,9 @@ extern "C" {
 #include "esp_assert.h"
 #include "hal/misc.h"
 
+/* Pre-calculated prescaler to achieve 500 ticks/us (MWDT1_TICKS_PER_US) when using default clock (MWDT_CLK_SRC_DEFAULT ) */
+#define MWDT_LL_DEFAULT_CLK_PRESCALER 40000
+
 //Type check wdt_stage_action_t
 ESP_STATIC_ASSERT(WDT_STAGE_ACTION_OFF == TIMG_WDT_STG_SEL_OFF, "Add mapping to LL watchdog timeout behavior, since it's no longer naturally compatible with wdt_stage_action_t");
 ESP_STATIC_ASSERT(WDT_STAGE_ACTION_INT == TIMG_WDT_STG_SEL_INT, "Add mapping to LL watchdog timeout behavior, since it's no longer naturally compatible with wdt_stage_action_t");

diff --git a/components/hal/esp32c6/include/hal/mwdt_ll.h b/components/hal/esp32c6/include/hal/mwdt_ll.h
@@ -24,6 +24,9 @@ extern "C" {
 #include "esp_assert.h"
 #include "hal/misc.h"
 
+/* Pre-calculated prescaler to achieve 500 ticks/us (MWDT1_TICKS_PER_US) when using default clock (MWDT_CLK_SRC_DEFAULT ) */
+#define MWDT_LL_DEFAULT_CLK_PRESCALER 40000
+
 //Type check wdt_stage_action_t
 ESP_STATIC_ASSERT(WDT_STAGE_ACTION_OFF == TIMG_WDT_STG_SEL_OFF, "Add mapping to LL watchdog timeout behavior, since it's no longer naturally compatible with wdt_stage_action_t");
 ESP_STATIC_ASSERT(WDT_STAGE_ACTION_INT == TIMG_WDT_STG_SEL_INT, "Add mapping to LL watchdog timeout behavior, since it's no longer naturally compatible with wdt_stage_action_t");