Merge branch 'Jason2866:release/v5.2' into release/v5.2

Author: Jason2866

components/bt/controller/lib_esp32c3_family

@@ -5402,6 +5402,10 @@ void bta_dm_ble_scan (tBTA_DM_MSG *p_data)
             status = (status == BTM_CMD_STARTED ? BTA_SUCCESS : BTA_FAILURE);
             p_data->ble_scan.p_stop_scan_cback(status);
         }
+
+        // reset BLE scan link state when stop scan
+        btm_ble_clear_topology_mask(BTM_BLE_STATE_ACTIVE_SCAN_BIT);
+        btm_ble_clear_topology_mask(BTM_BLE_STATE_PASSIVE_SCAN_BIT);
     }
 }
 

components/bt/host/bluedroid/bta/dm/bta_dm_act.c

@@ -4009,6 +4009,9 @@ static void btm_ble_stop_discover(void)
         if(btsnd_hcic_ble_set_scan_enable (BTM_BLE_SCAN_DISABLE, BTM_BLE_DUPLICATE_ENABLE)) {
             osi_sem_take(&scan_enable_sem, OSI_SEM_MAX_TIMEOUT);
         }
+        /* reset status */
+        btm_ble_clear_topology_mask(BTM_BLE_STATE_ACTIVE_SCAN_BIT);
+        btm_ble_clear_topology_mask(BTM_BLE_STATE_PASSIVE_SCAN_BIT);
     }
 
     if (p_scan_cb) {

components/bt/host/bluedroid/stack/btm/btm_ble_gap.c

@@ -507,7 +507,15 @@ esp_err_t esp_mmu_map(esp_paddr_t paddr_start, size_t size, mmu_target_t target,
 
     if (is_enclosed) {
         ESP_LOGW(TAG, "paddr block is mapped already, vaddr_start: %p, size: 0x%x", (void *)mem_block->vaddr_start, mem_block->size);
-        *out_ptr = (void *)mem_block->vaddr_start;
+        /*
+         * This condition is triggered when `s_is_enclosed` is true and hence
+         * we are sure that `paddr_start` >= `mem_block->paddr_start`.
+         *
+         * Add the offset of new physical address while returning the virtual
+         * address.
+         */
+        const uint32_t new_paddr_offset = paddr_start - mem_block->paddr_start;
+        *out_ptr = (void *)mem_block->vaddr_start + new_paddr_offset;
         return ESP_ERR_INVALID_STATE;
     }
 

components/esp_coex/lib

@@ -75,7 +75,7 @@ typedef uint32_t esp_paddr_t;
  *        - ESP_ERR_NOT_SUPPORTED: Only on ESP32, PSRAM is not a supported physical memory target
  *        - ESP_ERR_NOT_FOUND:     No enough size free block to use
  *        - ESP_ERR_NO_MEM:        Out of memory, this API will allocate some heap memory for internal usage
- *        - ESP_ERR_INVALID_STATE: Paddr is mapped already, this API will return corresponding vaddr_start of the previously mapped block.
+ *        - ESP_ERR_INVALID_STATE: Paddr is mapped already, this API will return corresponding `vaddr_start + new_block_offset` as per the previously mapped block.
  *                                 Only to-be-mapped paddr block is totally enclosed by a previously mapped block will lead to this error. (Identical scenario will behave similarly)
  *                                 new_block_start               new_block_end
  *                                              |-------- New Block --------|

components/esp_mm/esp_mmu_map.c

@@ -1036,7 +1036,7 @@ r_lld_con_pref_slave_evt_dur_set = 0x400010f0;
 r_lld_con_pref_slave_latency_set = 0x400010f4;
 r_lld_con_rssi_get = 0x400010f8;
 r_lld_con_rx = 0x400010fc;
-r_lld_con_rx_channel_assess = 0x40001100;
+/* r_lld_con_rx_channel_assess = 0x40001100; */
 r_lld_con_rx_enc = 0x40001104;
 r_lld_con_rx_isr = 0x40001108;
 r_lld_con_rx_link_info_check = 0x4000110c;

components/esp_mm/include/esp_mmu_map.h

@@ -1309,7 +1309,7 @@ r_lld_con_pref_slave_evt_dur_set = 0x400042b4;
 r_lld_con_pref_slave_latency_set = 0x400042c0;
 r_lld_con_rssi_get = 0x400042cc;
 r_lld_con_rx = 0x400042d8;
-r_lld_con_rx_channel_assess = 0x400042e4;
+/* r_lld_con_rx_channel_assess = 0x400042e4; */
 r_lld_con_rx_enc = 0x400042f0;
 r_lld_con_rx_isr = 0x400042fc;
 r_lld_con_rx_link_info_check = 0x40004308;

components/esp_rom/esp32c3/ld/esp32c3.rom.ld

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2018-2021 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2018-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -41,6 +41,7 @@ typedef enum {
  * (29 - (BLE device name length) - 2). */
 #define MAX_BLE_MANUFACTURER_DATA_LEN 29
 
+#define BLE_ADDR_LEN 6
 /**
  * @brief   This structure maps handler required by protocomm layer to
  *          UUIDs which are used to uniquely identify BLE characteristics
@@ -137,6 +138,10 @@ typedef struct protocomm_ble_config {
      */
     unsigned ble_link_encryption:1;
 
+    /**
+     * BLE address
+     */
+    uint8_t *ble_addr;
 } protocomm_ble_config_t;
 
 /**