feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'staging/esp32c61_reset_reason' into 'master'

Browse Source 
fix(soc): add missing reset reasons for the ESP32-C61

Closes IDF-9267

See merge request espressif/esp-idf!33736
This commit is contained in:
Omar Chebib
2024-09-26 10:57:21 +08:00
parent c141c91b86 22436dae10
commit 72f83c3441
3 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp_rom/esp32c61/include/esp32c61/rom/rtc.h
View File

@@ -94,6 +94,8 @@ typedef enum {
USB_UART_CHIP_RESET = 21, /**<21, usb uart reset digital core (hp system)*/ USB_UART_CHIP_RESET = 21, /**<21, usb uart reset digital core (hp system)*/
USB_JTAG_CHIP_RESET = 22, /**<22, usb jtag reset digital core (hp system)*/ USB_JTAG_CHIP_RESET = 22, /**<22, usb jtag reset digital core (hp system)*/
JTAG_RESET = 24, /**<24, jtag reset CPU*/ JTAG_RESET = 24, /**<24, jtag reset CPU*/
RTC_PWR_GLITCH_RESET = 25, /**<25, RTC power glitch reset system*/
CPU_LOCKUP_RESET = 26, /**<26, cpu lockup reset*/
} RESET_REASON; } RESET_REASON;
// Check if the reset reason defined in ROM is compatible with soc/reset_reasons.h // Check if the reset reason defined in ROM is compatible with soc/reset_reasons.h
@@ -114,6 +116,8 @@ ESP_STATIC_ASSERT((soc_reset_reason_t)EFUSE_RESET == RESET_REASON_CORE_EFUSE_CRC
ESP_STATIC_ASSERT((soc_reset_reason_t)USB_UART_CHIP_RESET == RESET_REASON_CORE_USB_UART, "USB_UART_CHIP_RESET != RESET_REASON_CORE_USB_UART"); ESP_STATIC_ASSERT((soc_reset_reason_t)USB_UART_CHIP_RESET == RESET_REASON_CORE_USB_UART, "USB_UART_CHIP_RESET != RESET_REASON_CORE_USB_UART");
ESP_STATIC_ASSERT((soc_reset_reason_t)USB_JTAG_CHIP_RESET == RESET_REASON_CORE_USB_JTAG, "USB_JTAG_CHIP_RESET != RESET_REASON_CORE_USB_JTAG"); ESP_STATIC_ASSERT((soc_reset_reason_t)USB_JTAG_CHIP_RESET == RESET_REASON_CORE_USB_JTAG, "USB_JTAG_CHIP_RESET != RESET_REASON_CORE_USB_JTAG");
ESP_STATIC_ASSERT((soc_reset_reason_t)JTAG_RESET == RESET_REASON_CPU0_JTAG, "JTAG_RESET != RESET_REASON_CPU0_JTAG"); ESP_STATIC_ASSERT((soc_reset_reason_t)JTAG_RESET == RESET_REASON_CPU0_JTAG, "JTAG_RESET != RESET_REASON_CPU0_JTAG");
ESP_STATIC_ASSERT((soc_reset_reason_t)RTC_PWR_GLITCH_RESET == RESET_REASON_RTC_BROWN_OUT, "RTC_PWR_GLITCH_RESET != RESET_REASON_RTC_BROWN_OUT");
ESP_STATIC_ASSERT((soc_reset_reason_t)CPU_LOCKUP_RESET == RESET_REASON_CPU_LOCKUP, "CPU_LOCKUP_RESET != RESET_REASON_CPU_LOCKUP");
typedef enum { typedef enum {
NO_SLEEP = 0, NO_SLEEP = 0,

4
components/esp_system/port/soc/esp32c61/reset_reason.c
View File

@@ -49,6 +49,7 @@ static esp_reset_reason_t get_reset_reason(soc_reset_reason_t rtc_reset_reason,
case RESET_REASON_CPU0_MWDT1: case RESET_REASON_CPU0_MWDT1:
return ESP_RST_WDT; return ESP_RST_WDT;
case RESET_REASON_RTC_BROWN_OUT:
case RESET_REASON_SYS_BROWN_OUT: case RESET_REASON_SYS_BROWN_OUT:
return ESP_RST_BROWNOUT; return ESP_RST_BROWNOUT;
@@ -62,6 +63,9 @@ static esp_reset_reason_t get_reset_reason(soc_reset_reason_t rtc_reset_reason,
case RESET_REASON_CPU0_JTAG: case RESET_REASON_CPU0_JTAG:
return ESP_RST_JTAG; return ESP_RST_JTAG;
case RESET_REASON_CPU_LOCKUP:
return ESP_RST_CPU_LOCKUP;
default: default:
return ESP_RST_UNKNOWN; return ESP_RST_UNKNOWN;
} }

2
components/soc/esp32c61/include/soc/reset_reasons.h
View File

@@ -46,6 +46,8 @@ typedef enum {
RESET_REASON_CORE_USB_UART = 0x15, // USB UART resets the digital core (hp system) RESET_REASON_CORE_USB_UART = 0x15, // USB UART resets the digital core (hp system)
RESET_REASON_CORE_USB_JTAG = 0x16, // USB JTAG resets the digital core (hp system) RESET_REASON_CORE_USB_JTAG = 0x16, // USB JTAG resets the digital core (hp system)
RESET_REASON_CPU0_JTAG = 0x18, // JTAG resets the CPU 0 RESET_REASON_CPU0_JTAG = 0x18, // JTAG resets the CPU 0
RESET_REASON_RTC_BROWN_OUT = 0x19, // RTC power glitch resets system
RESET_REASON_CPU_LOCKUP = 0x1A, // CPU lockup resets
} soc_reset_reason_t; } soc_reset_reason_t;