Merge branch 'fix/fixed_qa_test_issues_for_s31' into 'master'

fix(ble): fixed occasional sched assertion for scan scenario

Closes BLERP-3055 and BLERP-3056

See merge request espressif/esp-idf!51848

components/bt/common/ble_log/deprecated/include/ble_log/ble_log_spi_out.h

@@ -11,6 +11,7 @@
 #include "driver/spi_master.h"
 #include "driver/gpio.h"
 #include "esp_timer.h"
+#include "freertos/FreeRTOS.h"
 #include "freertos/semphr.h"
 #include "esp_heap_caps.h"
 #include "esp_task.h"

components/bt/controller/linker_esp_btdm_controller.lf

@@ -5,6 +5,7 @@ entries:
 [sections:high_perf_iram_text]
 entries:
     .iram_high_perf+
+    .critical_iram+
 
 [sections:adv_fast_execute_code_iram_text]
 entries:

components/bt/porting_btdm/controller/ble/src/ble.c

@@ -123,7 +123,7 @@ void api_adv_hci_enableScanReqRxdVsEvent(bool en);
 void api_conn_hci_enableChanMapUpdCompVsEvent(bool en);
 #endif // UC_BT_CTRL_LE_VS_CMD_EVT_ENABLED
 
-void r_sched_txn_bredrIsEnabled(bool en);
+void api_sched_txn_bredrIsEnabled(bool en);
 
 /*
  ***************************************************************************************************
@@ -318,7 +318,7 @@ ble_stack_enable(void)
 #endif // UC_BT_CTRL_LE_VS_CMD_EVT_ENABLED
 
 #if UC_BT_CTRL_BR_EDR_IS_ENABLE
-    r_sched_txn_bredrIsEnabled(true);
+    api_sched_txn_bredrIsEnabled(true);
 #endif // UC_BT_CTRL_BR_EDR_IS_ENABLE
 
     return 0;

components/bt/porting_btdm/controller/btdm_common/include/btdm_mem_debug.h

@@ -18,7 +18,7 @@ extern "C" {
  * Set to 0 to compile out the tracking hooks.
  */
 #ifndef BTDM_MEM_DEBUG
-#define BTDM_MEM_DEBUG 1
+#define BTDM_MEM_DEBUG (0)
 #endif
 
 #if BTDM_MEM_DEBUG

components/bt/porting_btdm/controller/btdm_common/src/btdm_log.c

@@ -53,6 +53,7 @@ typedef enum {
 #if CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
 void r_btdm_sched_list_details_dump(void);
 void api_base_ll_dumpDebugStatus(void);
+void api_sched_txn_dumpListDetails(void);
 void r_ble_phy_hw_state_dump(uint8_t);
 void esp_ble_controller_log_dump_all(bool);
 void esp_panic_handler_feed_wdts(void);
@@ -370,6 +371,7 @@ btdm_log_exception_dump(void)
 #if CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
     api_base_ll_dumpDebugStatus();
     r_btdm_sched_list_details_dump();
+    api_sched_txn_dumpListDetails();
     esp_ble_controller_log_dump_all(true);
 #endif // CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
 }

components/bt/porting_btdm/controller/btdm_common/src/btdm_mem_debug.c

@@ -5,6 +5,7 @@
  */
 
 #include "btdm_mem_debug.h"
+#include "btdm_user_cfg.h"
 #include <stdint.h>
 
 #if BTDM_MEM_DEBUG
@@ -21,12 +22,16 @@ typedef struct {
     void *ptr;
     uint32_t size;
     uint32_t seq;
+    const char *func;
+    uint32_t line;
 } btdm_mem_debug_entry_t;
 
 static btdm_mem_debug_entry_t s_mem_dbg_tbl[BTDM_MEM_DEBUG_MAX];
 static uint32_t s_mem_dbg_seq;
 static uint32_t s_mem_dbg_count;
 static portMUX_TYPE s_mem_dbg_lock = portMUX_INITIALIZER_UNLOCKED;
+static const char *s_mem_dbg_func_name = NULL;
+static uint32_t s_mem_dbg_line_num = 0;
 
 void
 btdm_mem_debug_record(void *ptr, uint32_t size)
@@ -45,12 +50,18 @@ btdm_mem_debug_record(void *ptr, uint32_t size)
             s_mem_dbg_tbl[i].ptr = ptr;
             s_mem_dbg_tbl[i].size = size;
             s_mem_dbg_tbl[i].seq = s_mem_dbg_seq;
+            s_mem_dbg_tbl[i].func = s_mem_dbg_func_name;
+            s_mem_dbg_tbl[i].line = s_mem_dbg_line_num;
             s_mem_dbg_count++;
+
+            s_mem_dbg_func_name = NULL;
+            s_mem_dbg_line_num = 0;
             portEXIT_CRITICAL(&s_mem_dbg_lock);
             return;
         }
     }
-
+    s_mem_dbg_func_name = NULL;
+    s_mem_dbg_line_num = 0;
     portEXIT_CRITICAL(&s_mem_dbg_lock);
     esp_rom_printf("[BTDM_MEM] record full, drop ptr=%p size=%u\n", ptr, (unsigned)size);
 }
@@ -90,6 +101,8 @@ btdm_mem_debug_dump(void)
     uint32_t seq;
     uint32_t count = 0;
     uint32_t total_size = 0;
+    const char *func = NULL;
+    uint32_t line = 0;
 
     esp_rom_printf("[BTDM_MEM] ===== unfreed dump begin =====\n");
 
@@ -98,11 +111,13 @@ btdm_mem_debug_dump(void)
         ptr = s_mem_dbg_tbl[i].ptr;
         size = s_mem_dbg_tbl[i].size;
         seq = s_mem_dbg_tbl[i].seq;
+        func = s_mem_dbg_tbl[i].func;
+        line = s_mem_dbg_tbl[i].line;
         portEXIT_CRITICAL(&s_mem_dbg_lock);
 
         if (ptr != NULL) {
-            esp_rom_printf("[BTDM_MEM] ptr=%p size=%u seq=%u\n",
-                           ptr, (unsigned)size, (unsigned)seq);
+            esp_rom_printf("[BTDM_MEM] ptr=%p size=%u seq=%u, func=%s, line=%u\n", ptr,
+                           (unsigned)size, (unsigned)seq, func ? func : "unknown", line);
             count++;
             total_size += size;
         }
@@ -144,4 +159,13 @@ btdm_mem_debug_get_seq_num(void)
     return sequence;
 }
 
+void
+ext_btdm_mem_debug_hook(const char *func, uint32_t line)
+{
+    if (s_mem_dbg_func_name == NULL) {
+        s_mem_dbg_func_name = func;
+        s_mem_dbg_line_num = line;
+    }
+}
+
 #endif /* BTDM_MEM_DEBUG */

components/bt/porting_btdm/controller/btdm_common/src/btdm_osal_freertos.c

@@ -11,6 +11,7 @@
 #include "btdm_osal_freertos.h"
 #include "btdm_user_cfg.h"
 #include "btdm_mempool.h"
+#include "btdm_mem_debug.h"
 
 #include "esp_mac.h"
 #include "esp_heap_caps.h"
@@ -1047,12 +1048,22 @@ wr_btdm_osal_malloc(uint32_t size, btdm_osal_malloc_flag_t flags)
         ptr = heap_caps_malloc(size, MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT | MALLOC_CAP_DMA);
     }
 
+#if BTDM_MEM_DEBUG
+    if (ptr) {
+        btdm_mem_debug_record(ptr, size);
+    }
+#endif // BTDM_MEM_DEBUG
+
     return ptr;
 }
 
 void
 wr_btdm_osal_free(void *ptr)
 {
+#if BTDM_MEM_DEBUG
+    btdm_mem_debug_clear(ptr);
+#endif // BTDM_MEM_DEBUG
+
     heap_caps_free(ptr);
 }