components/bt/controller/esp32/Kconfig.in

@@ -491,7 +491,7 @@ config BTDM_BLE_VS_QA_SUPPORT
         This enables BLE vendor HCI command and event for QA.
 
 config BTDM_CTRL_CONTROLLER_DEBUG_MODE_1
-    bool "Enable Bluetooth controller debugging mode 1 (for internal use only)"
+    bool "Enable Bluetooth controller debugging mode 1 (for internal use only)" if n
     default n
     depends on BT_ENABLED
     help

components/bt/host/bluedroid/btc/profile/std/spp/btc_spp.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -909,9 +909,6 @@ static void btc_spp_write(btc_spp_args_t *arg)
         } else {
             if (fixed_queue_enqueue(slot->tx.queue, arg->write.p_data, 0)) {
                 BTA_JvRfcommWrite(arg->write.handle, slot->id, arg->write.len, arg->write.p_data);
-                // The TX queue of SPP will handle this memory properly.
-                // Set it to NULL here to prevent deep free handler from releasing it.
-                arg->write.p_data = NULL;
             } else {
                 ret = ESP_SPP_NO_RESOURCE;
             }
@@ -969,13 +966,6 @@ void btc_spp_arg_deep_free(btc_msg_t *msg)
     case BTC_SPP_ACT_START_DISCOVERY:
         if (arg->start_discovery.p_uuid_list) {
             osi_free(arg->start_discovery.p_uuid_list);
-            arg->start_discovery.p_uuid_list = NULL;
-        }
-        break;
-    case BTC_SPP_ACT_WRITE:
-        if (arg->write.p_data) {
-            osi_free(arg->write.p_data);
-            arg->write.p_data = NULL;
         }
         break;
     default:

components/bt/host/nimble/nimble

@@ -1 +1 @@
-Subproject commit 4ebc169ca60071f4bfe35b992d3a770bbd86d36e
+Subproject commit 56bb929ce7c8dba24a0d60493e0627f0fb3f20b5

components/esp_rom/patches/esp_rom_spiflash.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -18,6 +18,8 @@
 
 #define SPI_IDX   1
 
+#if CONFIG_SPI_FLASH_ROM_DRIVER_PATCH
+
 #if CONFIG_IDF_TARGET_ESP32
 
 extern esp_rom_spiflash_chip_t g_rom_spiflash_chip;
@@ -103,12 +105,6 @@ __attribute__((__unused__)) esp_rom_spiflash_result_t esp_rom_spiflash_clear_bp(
 }
 esp_rom_spiflash_result_t esp_rom_spiflash_unlock(void) __attribute__((alias("esp_rom_spiflash_clear_bp")));
 
-#endif // CONFIG_IDF_TARGET_ESP32
-
-#if CONFIG_SPI_FLASH_ROM_DRIVER_PATCH
-
-#if CONFIG_IDF_TARGET_ESP32
-
 static esp_rom_spiflash_result_t esp_rom_spiflash_enable_write(esp_rom_spiflash_chip_t *spi);
 
 //only support spi1

components/spi_flash/spi_flash_chip_generic.c

@@ -829,6 +829,11 @@ esp_err_t spi_flash_common_set_io_mode(esp_flash_t *chip, esp_flash_wrsr_func_t
 
 esp_err_t spi_flash_chip_generic_suspend_cmd_conf(esp_flash_t *chip)
 {
+    // Only XMC support auto-suspend
+    if (chip->chip_id >> 16 != 0x20) {
+        ESP_EARLY_LOGE(TAG, "The flash you use doesn't support auto suspend, only \'XMC\' is supported");
+        return ESP_ERR_NOT_SUPPORTED;
+    }
     spi_flash_sus_cmd_conf sus_conf = {
         .sus_mask = 0x80,
         .cmd_rdsr = CMD_RDSR2,

components/spi_flash/test_apps/esp_flash/sdkconfig.ci.rom_patch

@@ -1 +0,0 @@
-CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=n

examples/bluetooth/nimble/ble_spp/spp_client/main/main.c

@@ -67,27 +67,11 @@ static void
 ble_spp_client_set_handle(const struct peer *peer)
 {
     const struct peer_chr *chr;
-    const struct peer_dsc *dsc;
-    uint8_t value[2];
     chr = peer_chr_find_uuid(peer,
                              BLE_UUID16_DECLARE(GATT_SPP_SVC_UUID),
                              BLE_UUID16_DECLARE(GATT_SPP_CHR_UUID));
     attribute_handle[peer->conn_handle] = chr->chr.val_handle;
-    MODLOG_DFLT(INFO, "attribute_handle %x\n", attribute_handle[peer->conn_handle]);
 
-    dsc = peer_dsc_find_uuid(peer,
-                             BLE_UUID16_DECLARE(GATT_SPP_SVC_UUID),
-                             BLE_UUID16_DECLARE(GATT_SPP_CHR_UUID),
-                             BLE_UUID16_DECLARE(BLE_GATT_DSC_CLT_CFG_UUID16));
-    if (dsc == NULL) {
-        MODLOG_DFLT(ERROR, "Error: Peer lacks a CCCD for the subscribable characteristic\n");
-	return;
-    }
-
-    value[0] = 1;
-    value[1] = 0;
-    ble_gattc_write_flat(peer->conn_handle, dsc->dsc.handle,
-                            value, sizeof(value), NULL, NULL);
 }