From 3283d9e55cddfe319168da0af2fc02d5a231118b Mon Sep 17 00:00:00 2001 From: Zhao Wei Liang Date: Wed, 26 Feb 2025 15:03:37 +0800 Subject: [PATCH] feat(ble): add a debug way to retain scene on ESP32-C6 --- components/bt/CMakeLists.txt | 15 ++++++++++++++- components/bt/controller/esp32c6/Kconfig.in | 6 ++++++ components/bt/controller/esp32c6/bt.c | 10 +++++++++- components/bt/controller/esp32h2/Kconfig.in | 6 ++++++ components/bt/controller/esp32h2/bt.c | 9 ++++++++- 5 files changed, 43 insertions(+), 3 deletions(-) diff --git a/components/bt/CMakeLists.txt b/components/bt/CMakeLists.txt index 1c1d6dd15e..2c0017178f 100644 --- a/components/bt/CMakeLists.txt +++ b/components/bt/CMakeLists.txt @@ -863,11 +863,24 @@ if(CONFIG_BT_ENABLED) endif() + +set(bt_priv_requires + nvs_flash + soc + esp_pm + esp_phy + esp_coex + mbedtls + driver + vfs + esp_gdbstub +) + idf_component_register(SRCS "${srcs}" INCLUDE_DIRS "${include_dirs}" PRIV_INCLUDE_DIRS "${priv_include_dirs}" REQUIRES esp_timer esp_wifi - PRIV_REQUIRES nvs_flash soc esp_pm esp_phy esp_coex mbedtls driver vfs + PRIV_REQUIRES "${bt_priv_requires}" LDFRAGMENTS "${ldscripts}") if(CONFIG_BT_ENABLED) diff --git a/components/bt/controller/esp32c6/Kconfig.in b/components/bt/controller/esp32c6/Kconfig.in index 77ad51cf02..fa5bcd247c 100644 --- a/components/bt/controller/esp32c6/Kconfig.in +++ b/components/bt/controller/esp32c6/Kconfig.in @@ -428,6 +428,12 @@ menu "Controller debug features" config BT_LE_ASSERT_WHEN_ABNORMAL_DISCONN_ENABLED bool "When ACL disconnects abnormally, assertion processing is performed(Experimental)" default n + + config BT_LE_DEBUG_REMAIN_SCENE_ENABLED + bool "Remain scene with GDB to capture relevant status info(Experimental)" + default n + help + Retain scene with GDB to capture info, requires disabling WDT (CONFIG_ESP_INT_WDT, CONFIG_ESP_TASK_WDT_EN). endmenu config BT_LE_LL_RESOLV_LIST_SIZE diff --git a/components/bt/controller/esp32c6/bt.c b/components/bt/controller/esp32c6/bt.c index 4dc9899842..ed2d941bb8 100644 --- a/components/bt/controller/esp32c6/bt.c +++ b/components/bt/controller/esp32c6/bt.c @@ -1654,6 +1654,10 @@ int ble_sm_alg_gen_key_pair(uint8_t *pub, uint8_t *priv) #endif // CONFIG_BT_LE_SM_LEGACY || CONFIG_BT_LE_SM_SC #endif // (!CONFIG_BT_NIMBLE_ENABLED) && (CONFIG_BT_CONTROLLER_ENABLED) +#if CONFIG_BT_LE_DEBUG_REMAIN_SCENE_ENABLED +#include "esp_gdbstub.h" +#endif // CONFIG_BT_LE_DEBUG_REMAIN_SCENE_ENABLED + int IRAM_ATTR ble_capture_info_user_handler(uint8_t type, uint32_t reason) { @@ -1664,7 +1668,11 @@ ble_capture_info_user_handler(uint8_t type, uint32_t reason) for (i = 0; i < 2; i++) { esp_ble_controller_info_capture(0x010101); } - +#if CONFIG_BT_LE_DEBUG_REMAIN_SCENE_ENABLED + uintptr_t sp; + __asm__ volatile ("mv %0, sp" : "=r" (sp)); + esp_gdbstub_panic_handler(&sp); +#endif // CONFIG_BT_LE_DEBUG_REMAIN_SCENE_ENABLED break; #if CONFIG_BT_LE_ASSERT_WHEN_ABNORMAL_DISCONN_ENABLED case 1: diff --git a/components/bt/controller/esp32h2/Kconfig.in b/components/bt/controller/esp32h2/Kconfig.in index 92299131fe..8b3262ef37 100644 --- a/components/bt/controller/esp32h2/Kconfig.in +++ b/components/bt/controller/esp32h2/Kconfig.in @@ -419,6 +419,12 @@ menu "Controller debug features" config BT_LE_ASSERT_WHEN_ABNORMAL_DISCONN_ENABLED bool "When ACL disconnects abnormally, assertion processing is performed(Experimental)" default n + + config BT_LE_DEBUG_REMAIN_SCENE_ENABLED + bool "Remain scene with GDB to capture relevant status info(Experimental)" + default n + help + Retain scene with GDB to capture info, requires disabling WDT (CONFIG_ESP_INT_WDT, CONFIG_ESP_TASK_WDT_EN). endmenu config BT_LE_LL_RESOLV_LIST_SIZE diff --git a/components/bt/controller/esp32h2/bt.c b/components/bt/controller/esp32h2/bt.c index f0492e98d3..2a0392635b 100644 --- a/components/bt/controller/esp32h2/bt.c +++ b/components/bt/controller/esp32h2/bt.c @@ -1633,6 +1633,9 @@ int ble_sm_alg_gen_key_pair(uint8_t *pub, uint8_t *priv) #endif // CONFIG_BT_LE_SM_LEGACY || CONFIG_BT_LE_SM_SC #endif // (!CONFIG_BT_NIMBLE_ENABLED) && (CONFIG_BT_CONTROLLER_ENABLED) +#if CONFIG_BT_LE_DEBUG_REMAIN_SCENE_ENABLED +#include "esp_gdbstub.h" +#endif // CONFIG_BT_LE_DEBUG_REMAIN_SCENE_ENABLED int IRAM_ATTR ble_capture_info_user_handler(uint8_t type, uint32_t reason) @@ -1644,7 +1647,11 @@ ble_capture_info_user_handler(uint8_t type, uint32_t reason) for (i = 0; i < 2; i++) { esp_ble_controller_info_capture(0x010101); } - +#if CONFIG_BT_LE_DEBUG_REMAIN_SCENE_ENABLED + uintptr_t sp; + __asm__ volatile ("mv %0, sp" : "=r" (sp)); + esp_gdbstub_panic_handler(&sp); +#endif // CONFIG_BT_LE_DEBUG_REMAIN_SCENE_ENABLED break; #if CONFIG_BT_LE_ASSERT_WHEN_ABNORMAL_DISCONN_ENABLED case 1: