From d585861d228ac408a7e3ed3a7428c9616dd139a0 Mon Sep 17 00:00:00 2001 From: Lou Tianhao Date: Mon, 26 Jun 2023 11:09:16 +0800 Subject: [PATCH] TODO: IDF-7555 --- components/esp_phy/src/btbb_init.c | 14 +++++++------- components/esp_pm/test_apps/esp_pm/main/test_pm.c | 2 ++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/components/esp_phy/src/btbb_init.c b/components/esp_phy/src/btbb_init.c index efe7b19013..1853f9dcb6 100644 --- a/components/esp_phy/src/btbb_init.c +++ b/components/esp_phy/src/btbb_init.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -17,7 +17,7 @@ static _lock_t s_btbb_access_lock; static uint8_t s_btbb_access_ref = 0; -#if SOC_PM_MODEM_RETENTION_BY_REGDMA && CONFIG_FREERTOS_USE_TICKLESS_IDLE +#if SOC_PM_MODEM_RETENTION_BY_REGDMA && CONFIG_FREERTOS_USE_TICKLESS_IDLE && !CONFIG_IDF_TARGET_ESP32H2 #include "esp_private/sleep_retention.h" #include "btbb_retention_reg.h" static const char* TAG = "btbb_init"; @@ -45,7 +45,7 @@ static void btbb_sleep_retention_deinit(void) { sleep_retention_entries_destroy(SLEEP_RETENTION_MODULE_BLE_BB); } -#endif // SOC_PM_MODEM_RETENTION_BY_REGDMA && CONFIG_FREERTOS_USE_TICKLESS_IDLE +#endif // SOC_PM_MODEM_RETENTION_BY_REGDMA && CONFIG_FREERTOS_USE_TICKLESS_IDLE && !CONFIG_IDF_TARGET_ESP32H2 void esp_btbb_enable(void) @@ -53,9 +53,9 @@ void esp_btbb_enable(void) _lock_acquire(&s_btbb_access_lock); if (s_btbb_access_ref == 0) { bt_bb_v2_init_cmplx(BTBB_ENABLE_VERSION_PRINT); -#if SOC_PM_MODEM_RETENTION_BY_REGDMA && CONFIG_FREERTOS_USE_TICKLESS_IDLE +#if SOC_PM_MODEM_RETENTION_BY_REGDMA && CONFIG_FREERTOS_USE_TICKLESS_IDLE && !CONFIG_IDF_TARGET_ESP32H2 btbb_sleep_retention_init(); -#endif // SOC_PM_MODEM_RETENTION_BY_REGDMA && CONFIG_FREERTOS_USE_TICKLESS_IDLE +#endif // SOC_PM_MODEM_RETENTION_BY_REGDMA && CONFIG_FREERTOS_USE_TICKLESS_IDLE && !CONFIG_IDF_TARGET_ESP32H2 } s_btbb_access_ref++; _lock_release(&s_btbb_access_lock); @@ -65,9 +65,9 @@ void esp_btbb_disable(void) { _lock_acquire(&s_btbb_access_lock); if (s_btbb_access_ref && (--s_btbb_access_ref == 0)) { -#if SOC_PM_MODEM_RETENTION_BY_REGDMA && CONFIG_FREERTOS_USE_TICKLESS_IDLE +#if SOC_PM_MODEM_RETENTION_BY_REGDMA && CONFIG_FREERTOS_USE_TICKLESS_IDLE && !CONFIG_IDF_TARGET_ESP32H2 btbb_sleep_retention_deinit(); -#endif // SOC_PM_MODEM_RETENTION_BY_REGDMA && CONFIG_FREERTOS_USE_TICKLESS_IDLE +#endif // SOC_PM_MODEM_RETENTION_BY_REGDMA && CONFIG_FREERTOS_USE_TICKLESS_IDLE && !CONFIG_IDF_TARGET_ESP32H2 } _lock_release(&s_btbb_access_lock); } diff --git a/components/esp_pm/test_apps/esp_pm/main/test_pm.c b/components/esp_pm/test_apps/esp_pm/main/test_pm.c index 5245c7527a..d3bc4ea1c7 100644 --- a/components/esp_pm/test_apps/esp_pm/main/test_pm.c +++ b/components/esp_pm/test_apps/esp_pm/main/test_pm.c @@ -111,6 +111,7 @@ static void light_sleep_disable(void) ESP_ERROR_CHECK( esp_pm_configure(&pm_config) ); } +#if !CONFIG_IDF_TARGET_ESP32H2 // ESP32H2-TODO: IDF-7555 TEST_CASE("Automatic light occurs when tasks are suspended", "[pm]") { gptimer_handle_t gptimer = NULL; @@ -165,6 +166,7 @@ TEST_CASE("Automatic light occurs when tasks are suspended", "[pm]") TEST_ESP_OK(gptimer_disable(gptimer)); TEST_ESP_OK(gptimer_del_timer(gptimer)); } +#endif #if CONFIG_ULP_COPROC_TYPE_FSM #if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3)