From 7f3cc181982450125afe54e3512b612815f0467b Mon Sep 17 00:00:00 2001 From: Jin Chen Date: Thu, 11 Dec 2025 16:23:20 +0800 Subject: [PATCH 1/6] fix(ble): add soc caps config for pawr feat on ESP32C6 (cherry picked from commit 4e4b863299164bfb78fa2c4142e0a57a2894232f) Co-authored-by: cjin --- components/bt/controller/esp32c6/Kconfig.in | 2 +- components/bt/host/nimble/Kconfig.in | 2 +- components/soc/esp32c6/include/soc/Kconfig.soc_caps.in | 4 ++++ components/soc/esp32c6/include/soc/soc_caps.h | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/components/bt/controller/esp32c6/Kconfig.in b/components/bt/controller/esp32c6/Kconfig.in index a2f5ec997b1..41d954c7e7a 100644 --- a/components/bt/controller/esp32c6/Kconfig.in +++ b/components/bt/controller/esp32c6/Kconfig.in @@ -239,7 +239,7 @@ config BT_LE_CTE_FEATURE_ENABLED config BT_LE_PERIODIC_ADV_WITH_RESPONSE_ENABLED bool "Enable BLE periodic advertising with response" - depends on BT_LE_50_FEATURE_SUPPORT + depends on BT_LE_50_FEATURE_SUPPORT && SOC_BLE_PERIODIC_ADV_WITH_RESPONSE default n help This enables BLE periodic advertising with response feature diff --git a/components/bt/host/nimble/Kconfig.in b/components/bt/host/nimble/Kconfig.in index 86c85c00f2b..37cdaeccfe4 100644 --- a/components/bt/host/nimble/Kconfig.in +++ b/components/bt/host/nimble/Kconfig.in @@ -592,7 +592,7 @@ menu "BLE 5.x Features" config BT_NIMBLE_PERIODIC_ADV_WITH_RESPONSES bool "Enable Periodic Advertisement with Response (EXPERIMENTAL)" - depends on BT_NIMBLE_ENABLE_PERIODIC_ADV + depends on BT_NIMBLE_ENABLE_PERIODIC_ADV && SOC_BLE_PERIODIC_ADV_WITH_RESPONSE default n help This enables controller PAwR (Periodic Advertisement with Response). diff --git a/components/soc/esp32c6/include/soc/Kconfig.soc_caps.in b/components/soc/esp32c6/include/soc/Kconfig.soc_caps.in index 67b6feabc37..5ab9920de89 100644 --- a/components/soc/esp32c6/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32c6/include/soc/Kconfig.soc_caps.in @@ -1483,6 +1483,10 @@ config SOC_BLE_MULTI_CONN_OPTIMIZATION bool default y +config SOC_BLE_PERIODIC_ADV_WITH_RESPONSE + bool + default y + config SOC_BLE_USE_WIFI_PWR_CLK_WORKAROUND bool default y diff --git a/components/soc/esp32c6/include/soc/soc_caps.h b/components/soc/esp32c6/include/soc/soc_caps.h index f62e33fe3a1..bd6036a5923 100644 --- a/components/soc/esp32c6/include/soc/soc_caps.h +++ b/components/soc/esp32c6/include/soc/soc_caps.h @@ -598,6 +598,7 @@ #define SOC_BLE_PERIODIC_ADV_ENH_SUPPORTED (1) /*!< Support For BLE Periodic Adv Enhancements */ #define SOC_BLUFI_SUPPORTED (1) /*!< Support BLUFI */ #define SOC_BLE_MULTI_CONN_OPTIMIZATION (1) /*!< Support multiple connections optimization */ +#define SOC_BLE_PERIODIC_ADV_WITH_RESPONSE (1) /*!< Support Bluetooth LE Periodic Advertising with Response (PAwR) */ #define SOC_BLE_USE_WIFI_PWR_CLK_WORKAROUND (1) From bf7d2e1a22424578fbade2fc0cf93188d60c4f64 Mon Sep 17 00:00:00 2001 From: Jin Chen Date: Thu, 11 Dec 2025 16:23:21 +0800 Subject: [PATCH 2/6] fix(ble): add soc caps config for pawr feat on ESP32H2 (cherry picked from commit 2eb79c71f10766c94176fe206024777183750d53) Co-authored-by: cjin --- components/bt/controller/esp32h2/Kconfig.in | 2 +- components/soc/esp32h2/include/soc/Kconfig.soc_caps.in | 4 ++++ components/soc/esp32h2/include/soc/soc_caps.h | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/components/bt/controller/esp32h2/Kconfig.in b/components/bt/controller/esp32h2/Kconfig.in index 679f7c28645..c3d7df55e0b 100644 --- a/components/bt/controller/esp32h2/Kconfig.in +++ b/components/bt/controller/esp32h2/Kconfig.in @@ -242,7 +242,7 @@ config BT_LE_CTE_FEATURE_ENABLED config BT_LE_PERIODIC_ADV_WITH_RESPONSE_ENABLED bool "Enable BLE periodic advertising with response" - depends on BT_LE_50_FEATURE_SUPPORT + depends on BT_LE_50_FEATURE_SUPPORT && SOC_BLE_PERIODIC_ADV_WITH_RESPONSE default n help This enables BLE periodic advertising with response feature diff --git a/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in b/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in index 751b38e9a06..031eb64781f 100644 --- a/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in @@ -1439,6 +1439,10 @@ config SOC_BLE_CTE_SUPPORTED bool default y +config SOC_BLE_PERIODIC_ADV_WITH_RESPONSE + bool + default y + config SOC_DEBUG_HAVE_OCD_STUB_BINS bool default y diff --git a/components/soc/esp32h2/include/soc/soc_caps.h b/components/soc/esp32h2/include/soc/soc_caps.h index 990eb88fc8f..c93bdabc45e 100644 --- a/components/soc/esp32h2/include/soc/soc_caps.h +++ b/components/soc/esp32h2/include/soc/soc_caps.h @@ -596,6 +596,7 @@ #define SOC_BLE_MULTI_CONN_OPTIMIZATION (1) /*!< Support multiple connections optimization */ #define SOC_BLE_PERIODIC_ADV_ENH_SUPPORTED (1) /*!< Support For BLE Periodic Adv Enhancements */ #define SOC_BLE_CTE_SUPPORTED (1) /*!< Support Bluetooth LE Constant Tone Extension (CTE) */ +#define SOC_BLE_PERIODIC_ADV_WITH_RESPONSE (1) /*!< Support Bluetooth LE Periodic Advertising with Response (PAwR) */ /*------------------------------------- DEBUG CAPS -------------------------------------*/ #define SOC_DEBUG_HAVE_OCD_STUB_BINS (1) From 77ef80081d61a36b31f2cf77300b3021e366e1e0 Mon Sep 17 00:00:00 2001 From: Jin Chen Date: Thu, 11 Dec 2025 16:23:22 +0800 Subject: [PATCH 3/6] fix(ble): add soc caps config for pawr feat on ESP32C5 (cherry picked from commit 19130df4f39b45a88d51baf9b7a0381bb73db063) Co-authored-by: cjin --- components/bt/controller/esp32c5/Kconfig.in | 2 +- components/soc/esp32c5/include/soc/Kconfig.soc_caps.in | 4 ++++ components/soc/esp32c5/include/soc/soc_caps.h | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/components/bt/controller/esp32c5/Kconfig.in b/components/bt/controller/esp32c5/Kconfig.in index 84335624f58..ee5e390b2b7 100644 --- a/components/bt/controller/esp32c5/Kconfig.in +++ b/components/bt/controller/esp32c5/Kconfig.in @@ -198,7 +198,7 @@ config BT_LE_POWER_CONTROL_ENABLED config BT_LE_PERIODIC_ADV_WITH_RESPONSE_ENABLED bool "Enable BLE periodic advertising with response" - depends on BT_LE_50_FEATURE_SUPPORT + depends on BT_LE_50_FEATURE_SUPPORT && SOC_BLE_PERIODIC_ADV_WITH_RESPONSE default n help This enables BLE periodic advertising with response feature diff --git a/components/soc/esp32c5/include/soc/Kconfig.soc_caps.in b/components/soc/esp32c5/include/soc/Kconfig.soc_caps.in index 39ce24737e7..5b63294f160 100644 --- a/components/soc/esp32c5/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32c5/include/soc/Kconfig.soc_caps.in @@ -1723,6 +1723,10 @@ config SOC_BLE_CTE_SUPPORTED bool default y +config SOC_BLE_PERIODIC_ADV_WITH_RESPONSE + bool + default y + config SOC_PHY_CALIBRATION_CLOCK_IS_INDEPENDENT bool default y diff --git a/components/soc/esp32c5/include/soc/soc_caps.h b/components/soc/esp32c5/include/soc/soc_caps.h index c2dff771865..1925ca83450 100644 --- a/components/soc/esp32c5/include/soc/soc_caps.h +++ b/components/soc/esp32c5/include/soc/soc_caps.h @@ -682,6 +682,7 @@ #define SOC_BLE_MULTI_CONN_OPTIMIZATION (1) /*!< Support multiple connections optimization */ #define SOC_BLE_PERIODIC_ADV_ENH_SUPPORTED (1) /*!< Support For BLE Periodic Adv Enhancements */ #define SOC_BLE_CTE_SUPPORTED (1) /*!< Support Bluetooth LE Constant Tone Extension (CTE) */ +#define SOC_BLE_PERIODIC_ADV_WITH_RESPONSE (1) /*!< Support Bluetooth LE Periodic Advertising with Response (PAwR) */ /*------------------------------------- PHY CAPS -------------------------------------*/ // #define SOC_PHY_COMBO_MODULE (1) /*!< Support Wi-Fi, BLE and 15.4*/ From 5c6a0f4c8cbf6bcb3187dcad6c6674577aae9bcb Mon Sep 17 00:00:00 2001 From: Jin Chen Date: Thu, 11 Dec 2025 16:23:22 +0800 Subject: [PATCH 4/6] fix(ble): add soc caps config for pawr feat on ESP32C61 (cherry picked from commit d667a418261d00a0f5c8a9a359324f72d64447ff) Co-authored-by: cjin --- components/soc/esp32c61/include/soc/Kconfig.soc_caps.in | 4 ++++ components/soc/esp32c61/include/soc/soc_caps.h | 1 + 2 files changed, 5 insertions(+) diff --git a/components/soc/esp32c61/include/soc/Kconfig.soc_caps.in b/components/soc/esp32c61/include/soc/Kconfig.soc_caps.in index 4db0ed97667..d58e7f1a34c 100644 --- a/components/soc/esp32c61/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32c61/include/soc/Kconfig.soc_caps.in @@ -1283,6 +1283,10 @@ config SOC_BLE_CTE_SUPPORTED bool default y +config SOC_BLE_PERIODIC_ADV_WITH_RESPONSE + bool + default y + config SOC_PHY_COMBO_MODULE bool default y diff --git a/components/soc/esp32c61/include/soc/soc_caps.h b/components/soc/esp32c61/include/soc/soc_caps.h index 26132f13643..74542d20fb8 100644 --- a/components/soc/esp32c61/include/soc/soc_caps.h +++ b/components/soc/esp32c61/include/soc/soc_caps.h @@ -521,6 +521,7 @@ #define SOC_BLUFI_SUPPORTED (1) /*!< Support BLUFI */ #define SOC_BLE_MULTI_CONN_OPTIMIZATION (1) /*!< Support multiple connections optimization */ #define SOC_BLE_CTE_SUPPORTED (1) /*!< Support Bluetooth LE Constant Tone Extension (CTE) */ +#define SOC_BLE_PERIODIC_ADV_WITH_RESPONSE (1) /*!< Support Bluetooth LE Periodic Advertising with Response (PAwR) */ /*------------------------------------- PHY CAPS -------------------------------------*/ #define SOC_PHY_COMBO_MODULE (1) /*!< Support Wi-Fi, BLE and 15.4*/ From 7d9375c342f87e3921e57dc48bdeb9110f820a83 Mon Sep 17 00:00:00 2001 From: Jin Chen Date: Thu, 11 Dec 2025 16:23:24 +0800 Subject: [PATCH 5/6] fix(ble): remove target dependency on power control config on ESP32C6 (cherry picked from commit f29f500ac8a2ea0e8de2005f08e7c0e79c3c4adc) Co-authored-by: cjin --- components/bt/controller/esp32c6/Kconfig.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/esp32c6/Kconfig.in b/components/bt/controller/esp32c6/Kconfig.in index 41d954c7e7a..bffab12e669 100644 --- a/components/bt/controller/esp32c6/Kconfig.in +++ b/components/bt/controller/esp32c6/Kconfig.in @@ -222,7 +222,7 @@ config BT_LE_MAX_PERIODIC_ADVERTISER_LIST config BT_LE_POWER_CONTROL_ENABLED bool "Enable controller support for BLE Power Control" - depends on BT_LE_50_FEATURE_SUPPORT && !BT_NIMBLE_ENABLED && IDF_TARGET_ESP32C6 + depends on BT_LE_50_FEATURE_SUPPORT && !BT_NIMBLE_ENABLED default n help Set this option to enable the Power Control feature on controller From 350c255efdc14f7ff1baff42eac0b72722bdade4 Mon Sep 17 00:00:00 2001 From: Jin Chen Date: Thu, 11 Dec 2025 16:23:25 +0800 Subject: [PATCH 6/6] fix(ble): remove target dependency on power control config on ESP32C5 (cherry picked from commit 82da79224e571b1630f0e360af06e536c5ea68f3) Co-authored-by: cjin --- components/bt/controller/esp32c5/Kconfig.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/esp32c5/Kconfig.in b/components/bt/controller/esp32c5/Kconfig.in index ee5e390b2b7..cfcef62e17e 100644 --- a/components/bt/controller/esp32c5/Kconfig.in +++ b/components/bt/controller/esp32c5/Kconfig.in @@ -191,7 +191,7 @@ config BT_LE_MAX_PERIODIC_ADVERTISER_LIST config BT_LE_POWER_CONTROL_ENABLED bool "Enable controller support for BLE Power Control" - depends on BT_LE_50_FEATURE_SUPPORT && !BT_NIMBLE_ENABLED && IDF_TARGET_ESP32C6 + depends on BT_LE_50_FEATURE_SUPPORT && !BT_NIMBLE_ENABLED default n help Set this option to enable the Power Control feature on controller