From 0253d825e9db9771c578dab8ef9f842964da2a11 Mon Sep 17 00:00:00 2001 From: gengyuchao Date: Fri, 26 Feb 2021 20:31:47 +0800 Subject: [PATCH 1/4] Fix IRAM_ATTR missing --- components/bt/controller/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib b/components/bt/controller/lib index d1115cabc2..f1709b80f8 160000 --- a/components/bt/controller/lib +++ b/components/bt/controller/lib @@ -1 +1 @@ -Subproject commit d1115cabc2fe9d80bf715ba74d58ca829590c515 +Subproject commit f1709b80f8ea2f0afff978eb7d374514bedaafe5 From b449909b352fb68ff49f79c0edd0b49dd064b2f6 Mon Sep 17 00:00:00 2001 From: baohongde Date: Fri, 5 Mar 2021 11:25:03 +0800 Subject: [PATCH 2/4] Fix controller task watchdog in Wi-Fi test --- components/bt/controller/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib b/components/bt/controller/lib index f1709b80f8..950f7886b6 160000 --- a/components/bt/controller/lib +++ b/components/bt/controller/lib @@ -1 +1 @@ -Subproject commit f1709b80f8ea2f0afff978eb7d374514bedaafe5 +Subproject commit 950f7886b6a28734c625f979c2a73752db1dfb19 From e6ace495b4685274cd7e0e00e07c3f4f4823223e Mon Sep 17 00:00:00 2001 From: baohongde Date: Tue, 9 Mar 2021 13:49:59 +0800 Subject: [PATCH 3/4] Fix issues during light sleep and DFS --- components/bt/controller/esp32c3/bt.c | 7 +++++-- components/bt/controller/lib | 2 +- components/esp_system/sleep_modes.c | 8 ++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/components/bt/controller/esp32c3/bt.c b/components/bt/controller/esp32c3/bt.c index b8632bccac..1a47519c2e 100644 --- a/components/bt/controller/esp32c3/bt.c +++ b/components/bt/controller/esp32c3/bt.c @@ -740,13 +740,16 @@ static void IRAM_ATTR btdm_sleep_exit_phase0(void *param) } #endif - btdm_wakeup_request(); + int event = (int) param; + if (event == BTDM_ASYNC_WAKEUP_SRC_VHCI || event == BTDM_ASYNC_WAKEUP_SRC_DISA) { + btdm_wakeup_request(); + } if (s_lp_cntl.wakeup_timer_required && s_lp_stat.wakeup_timer_started) { esp_timer_stop(s_btdm_slp_tmr); s_lp_stat.wakeup_timer_started = 0; } - int event = (int) param; + if (event == BTDM_ASYNC_WAKEUP_SRC_VHCI || event == BTDM_ASYNC_WAKEUP_SRC_DISA) { semphr_give_wrapper(s_wakeup_req_sem); } diff --git a/components/bt/controller/lib b/components/bt/controller/lib index 950f7886b6..bcb2eef8e6 160000 --- a/components/bt/controller/lib +++ b/components/bt/controller/lib @@ -1 +1 @@ -Subproject commit 950f7886b6a28734c625f979c2a73752db1dfb19 +Subproject commit bcb2eef8e649b3708ab036379ba4efaa59cf6eea diff --git a/components/esp_system/sleep_modes.c b/components/esp_system/sleep_modes.c index 68d73e43e4..8c8e9dd6b4 100644 --- a/components/esp_system/sleep_modes.c +++ b/components/esp_system/sleep_modes.c @@ -458,15 +458,15 @@ static uint32_t IRAM_ATTR esp_sleep_start(uint32_t pd_flags) suspend_uarts(); } -#if CONFIG_MAC_BB_PD - mac_bb_power_down_cb_execute(); -#endif - // Save current frequency and switch to XTAL rtc_cpu_freq_config_t cpu_freq_config; rtc_clk_cpu_freq_get_config(&cpu_freq_config); rtc_clk_cpu_freq_set_xtal(); +#if CONFIG_MAC_BB_PD + mac_bb_power_down_cb_execute(); +#endif + #if SOC_PM_SUPPORT_EXT_WAKEUP // Configure pins for external wakeup if (s_config.wakeup_triggers & RTC_EXT0_TRIG_EN) { From d01efe4b8cd2052b9516ec1ba80f79c2e3f5e0ab Mon Sep 17 00:00:00 2001 From: Chinmay Chhajed Date: Tue, 9 Mar 2021 19:45:00 +0530 Subject: [PATCH 4/4] Fix for C2H flow control param check when only BLE mode is configured. --- components/bt/controller/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib b/components/bt/controller/lib index bcb2eef8e6..5ba6226876 160000 --- a/components/bt/controller/lib +++ b/components/bt/controller/lib @@ -1 +1 @@ -Subproject commit bcb2eef8e649b3708ab036379ba4efaa59cf6eea +Subproject commit 5ba622687683fb898194d42eed020a60070887d6