espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-06-22 23:38:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_panic_reboot_reenter' into 'master'

Browse Source 
esp8266: fix panic reenter when reboot

See merge request sdk/ESP8266_RTOS_SDK!1209
This commit is contained in:
Dong Heng
2019-12-02 18:59:31 +08:00
parent 1ac46099fe 8c7305f473
commit 22029d989a
3 changed files with 47 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp8266/include/esp8266/rom_functions.h
View File

@ -42,4 +42,8 @@ int SPIEraseSector(uint32_t sector_num);
void Cache_Read_Disable(); void Cache_Read_Disable();
void Cache_Read_Enable(uint8_t map, uint8_t p, uint8_t v); void Cache_Read_Enable(uint8_t map, uint8_t p, uint8_t v);
void rom_software_reboot(void);
void rom_i2c_writeReg(uint8_t block, uint8_t host_id, uint8_t reg_add, uint8_t data);
#endif #endif

2
components/esp8266/ld/esp8266.rom.ld
View File

@ -64,3 +64,5 @@ PROVIDE ( rom_i2c_readReg = 0x40007268 );
PROVIDE ( rom_i2c_readReg_Mask = 0x4000729c ); PROVIDE ( rom_i2c_readReg_Mask = 0x4000729c );
PROVIDE ( rom_i2c_writeReg = 0x400072d8 ); PROVIDE ( rom_i2c_writeReg = 0x400072d8 );
PROVIDE ( rom_i2c_writeReg_Mask = 0x4000730c ); PROVIDE ( rom_i2c_writeReg_Mask = 0x4000730c );
PROVIDE ( rom_software_reboot = 0x40000080 );

53
components/freertos/port/esp8266/panic.c
View File

@ -17,17 +17,32 @@
#include "esp_attr.h" #include "esp_attr.h"
#include "esp_libc.h" #include "esp_libc.h"
#include "esp_system.h" #include "esp_system.h"
#include "esp_task_wdt.h"
#include "internal/esp_system_internal.h"
#include "esp8266/rom_functions.h" #include "esp8266/rom_functions.h"
#include "esp8266/backtrace.h" #include "esp8266/backtrace.h"
#include "rom/ets_sys.h" #include "rom/ets_sys.h"
#include "rom/uart.h"
#include "esp_err.h" #include "esp_err.h"
#include "FreeRTOS.h" #include "FreeRTOS.h"
#define PANIC(_fmt, ...) ets_printf(_fmt, ##__VA_ARGS__) #define PANIC(_fmt, ...) ets_printf(_fmt, ##__VA_ARGS__)
#ifndef CONFIG_ESP_PANIC_SILENT_REBOOT #if defined(CONFIG_ESP_PANIC_SILENT_REBOOT) || defined(CONFIG_ESP_PANIC_PRINT_REBOOT)
#define ESP_PANIC_REBOOT
#else
#undef ESP_PANIC_REBOOT
#endif
#if defined(CONFIG_ESP_PANIC_SILENT_REBOOT)
#undef ESP_PANIC_PRINT
#else
#define ESP_PANIC_PRINT
#endif
#ifdef ESP_PANIC_PRINT
typedef struct panic_frame { typedef struct panic_frame {
uint32_t exit; uint32_t exit;
@ -59,7 +74,7 @@ typedef struct panic_frame {
uint32_t exccause; uint32_t exccause;
} panic_frame_t; } panic_frame_t;
static inline void panic_frame(panic_frame_t *frame) static void panic_frame(panic_frame_t *frame)
{ {
static const char *sdesc[] = { static const char *sdesc[] = {
"PC", "PS", "A0", "A1", "PC", "PS", "A0", "A1",
@ -107,11 +122,25 @@ static inline void panic_frame(panic_frame_t *frame)
} }
PANIC("\r\n"); PANIC("\r\n");
} }
#endif /* !CONFIG_ESP_PANIC_SILENT_REBOOT */ #endif /* ESP_PANIC_PRINT */
#ifdef ESP_PANIC_REBOOT
static void esp_panic_reset(void)
{
uart_tx_wait_idle(0);
uart_tx_wait_idle(1);
rom_i2c_writeReg(0x67, 4, 1, 0x08);
rom_i2c_writeReg(0x67, 4, 2, 0x81);
esp_reset_reason_set_hint(ESP_RST_PANIC);
rom_software_reboot();
}
#endif
void panicHandler(void *frame, int wdt) void panicHandler(void *frame, int wdt)
{ {
#ifndef CONFIG_ESP_PANIC_SILENT_REBOOT
extern int _chip_nmi_cnt; extern int _chip_nmi_cnt;
_chip_nmi_cnt = 0; _chip_nmi_cnt = 0;
@ -122,21 +151,21 @@ void panicHandler(void *frame, int wdt)
REG_WRITE(INT_ENA_WDEV, 0); REG_WRITE(INT_ENA_WDEV, 0);
} while (REG_READ(INT_ENA_WDEV) != 0); } while (REG_READ(INT_ENA_WDEV) != 0);
#ifdef ESP_PANIC_PRINT
if (wdt) { if (wdt) {
PANIC("Task watchdog got triggered.\r\n\r\n"); PANIC("Task watchdog got triggered.\r\n\r\n");
} }
panic_frame(frame); panic_frame(frame);
#ifdef CONFIG_ESP_PANIC_PRINT_HALT
while (1);
#else
esp_restart();
#endif #endif
#else /* CONFIG_ESP_PANIC_SILENT_REBOOT */ #ifdef ESP_PANIC_REBOOT
esp_restart(); esp_panic_reset();
#endif /* !CONFIG_ESP_PANIC_SILENT_REBOOT */ #else
while (1) {
esp_task_wdt_reset();
}
#endif
} }
static void esp_error_check_failed_print(const char *msg, esp_err_t rc, const char *file, int line, const char *function, const char *expression) static void esp_error_check_failed_print(const char *msg, esp_err_t rc, const char *file, int line, const char *function, const char *expression)