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

Author: Jason2866

components/bt/controller/lib_esp32c3_family

@@ -2,7 +2,7 @@
 
 /*
  * SPDX-FileCopyrightText: 2017 Intel Corporation
- * SPDX-FileContributor: 2018-2023 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileContributor: 2018-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -967,18 +967,36 @@ int bt_mesh_net_send(struct bt_mesh_net_tx *tx, struct net_buf *buf,
     }
 
     /* Deliver to local network interface if necessary */
-    if (IS_ENABLED(CONFIG_BLE_MESH_NODE) && bt_mesh_is_provisioned() &&
-        (bt_mesh_fixed_group_match(tx->ctx->addr) ||
-            bt_mesh_elem_find(tx->ctx->addr))) {
-        if (cb && cb->start) {
-            cb->start(0, 0, cb_data);
-        }
-        net_buf_slist_put(&bt_mesh.local_queue, net_buf_ref(buf));
-        if (cb && cb->end) {
-            cb->end(0, cb_data);
+    if (((IS_ENABLED(CONFIG_BLE_MESH_NODE) && bt_mesh_is_provisioned()) ||
+        (IS_ENABLED(CONFIG_BLE_MESH_PROVISIONER) && bt_mesh_is_provisioner_en())) &&
+        (bt_mesh_fixed_group_match(tx->ctx->addr) || bt_mesh_elem_find(tx->ctx->addr))) {
+        /**
+         * If the target address isn't a unicast address, then the callback function
+         * will be called by `adv task` in place of here, to avoid the callback function
+         * being called twice.
+         * See BLEMESH24-76 for more details.
+         */
+        if (BLE_MESH_ADDR_IS_UNICAST(tx->ctx->addr)) {
+            if (cb && cb->start) {
+                cb->start(0, 0, cb_data);
+            }
+
+            net_buf_slist_put(&bt_mesh.local_queue, net_buf_ref(buf));
+
+            if (cb && cb->end) {
+                cb->end(0, cb_data);
+            }
+
+            k_work_submit(&bt_mesh.local_work);
+
+            goto done;
+        } else {
+            net_buf_slist_put(&bt_mesh.local_queue, net_buf_ref(buf));
+            k_work_submit(&bt_mesh.local_work);
         }
-        k_work_submit(&bt_mesh.local_work);
-    } else if (tx->ctx->send_ttl != 1U) {
+    }
+
+    if (tx->ctx->send_ttl != 1U) {
         /* Deliver to the advertising network interface. Mesh spec
          * 3.4.5.2: "The output filter of the interface connected to
          * advertising or GATT bearers shall drop all messages with

components/bt/esp_ble_mesh/mesh_core/net.c

@@ -5332,6 +5332,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

@@ -493,7 +493,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

@@ -76,7 +76,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

@@ -249,20 +249,36 @@ extern const wpa_crypto_funcs_t g_wifi_default_wpa_crypto_funcs;
 #define WIFI_ENABLE_GMAC 0
 #endif
 
+#if CONFIG_ESP_WIFI_11R_SUPPORT
+#define WIFI_ENABLE_11R (1<<6)
+#else
+#define WIFI_ENABLE_11R 0
+#endif
+
+#if CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT
+#define WIFI_ENABLE_ENTERPRISE (1<<7)
+#else
+#define WIFI_ENABLE_ENTERPRISE 0
+#endif
+
 #define CONFIG_FEATURE_WPA3_SAE_BIT     (1<<0)
 #define CONFIG_FEATURE_CACHE_TX_BUF_BIT (1<<1)
 #define CONFIG_FEATURE_FTM_INITIATOR_BIT (1<<2)
 #define CONFIG_FEATURE_FTM_RESPONDER_BIT (1<<3)
 #define CONFIG_FEATURE_GCMP_BIT (1<<4)
 #define CONFIG_FEATURE_GMAC_BIT (1<<5)
+#define CONFIG_FEATURE_11R_BIT (1<<6)
+#define CONFIG_FEATURE_WIFI_ENT_BIT (1<<7)
 
 /* Set additional WiFi features and capabilities */
 #define WIFI_FEATURE_CAPS (WIFI_ENABLE_WPA3_SAE | \
                            WIFI_ENABLE_SPIRAM  | \
                            WIFI_FTM_INITIATOR | \
                            WIFI_FTM_RESPONDER | \
                            WIFI_ENABLE_GCMP | \
-                           WIFI_ENABLE_GMAC)
+                           WIFI_ENABLE_GMAC | \
+                           WIFI_ENABLE_11R  | \
+                           WIFI_ENABLE_ENTERPRISE)
 
 #define WIFI_INIT_CONFIG_DEFAULT() { \
     .osi_funcs = &g_wifi_osi_funcs, \