Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 11:10:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(phy): add fe dependency when enable rf with regdma

Browse Source
This commit is contained in:
cjin
2026-09-17 08:38:10 +08:00
parent a530cb2157
commit 602bbd9f8e
5 changed files with 137 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_phy/esp32c5/phy_init_data.c
+41 -22
View File
@@ -276,13 +276,16 @@ const esp_phy_init_data_t phy_init_data= { {
} }; } };
const char __attribute__((section(".rodata"))) phy_init_magic_post[] = PHY_INIT_MAGIC; const char __attribute__((section(".rodata"))) phy_init_magic_post[] = PHY_INIT_MAGIC;
#if SOC_PM_MODEM_RETENTION_BY_REGDMA && (CONFIG_MAC_BB_PD || CONFIG_ESP_PHY_HW_SWITCH_RF)
#include "esp_private/sleep_retention.h"
uint8_t s_phy_fe_retention_ref = 0;
static _lock_t s_phy_fe_retention_lock;
static const char* TAG = "phy_sleep";
#endif // SOC_PM_MODEM_RETENTION_BY_REGDMA && (CONFIG_MAC_BB_PD || CONFIG_ESP_PHY_HW_SWITCH_RF)
#if SOC_PM_MODEM_RETENTION_BY_REGDMA && CONFIG_MAC_BB_PD #if SOC_PM_MODEM_RETENTION_BY_REGDMA && CONFIG_MAC_BB_PD
#include "esp_private/sleep_retention.h"
static const char* TAG = "phy_sleep";
static esp_err_t sleep_retention_wifi_bb_init(void *arg) static esp_err_t sleep_retention_wifi_bb_init(void *arg)
{ {
#define N_REGS_WIFI_AGC() (130) #define N_REGS_WIFI_AGC() (130)
@@ -334,18 +337,19 @@ void esp_phy_sleep_data_deinit(void)
ESP_LOGW(TAG, "WiFi BB sleep retention deinit failed"); ESP_LOGW(TAG, "WiFi BB sleep retention deinit failed");
} }
} }
#endif // SOC_PM_MODEM_RETENTION_BY_REGDMA && CONFIG_MAC_BB_PD
#if SOC_PM_MODEM_RETENTION_BY_REGDMA && (CONFIG_MAC_BB_PD || CONFIG_ESP_PHY_HW_SWITCH_RF)
static esp_err_t sleep_retention_phy_fe_init(void *arg) static esp_err_t sleep_retention_phy_fe_init(void *arg)
{ {
#define N_REGS_FE_COEX() (21) #define N_REGS_FE_COEX() (21)
#define N_REGS_FE_DATA() (35) #define N_REGS_FE_DATA() (35)
#define N_REGS_FE_CTRL() (56) #define N_REGS_FE_CTRL() (56)
#define N_REGS_FE_DATA_WIFI() (22) #define N_REGS_FE_DATA_WIFI() (22)
#define REG_FECOEX_BASE 0x600a0000 #define REG_FECOEX_BASE 0x600a0000
#define REG_FEDATA_BASE 0x600a0400 #define REG_FEDATA_BASE 0x600a0400
#define REG_FECTRL_BASE 0x600a0800 #define REG_FECTRL_BASE 0x600a0800
#define REG_FEDATAWIFI_BASE 0x600a0c00 #define REG_FEDATAWIFI_BASE 0x600a0c00
const static sleep_retention_entries_config_t phy_fe_regs_retention[] = { const static sleep_retention_entries_config_t phy_fe_regs_retention[] = {
[0] = { .config = REGDMA_LINK_CONTINUOUS_INIT(REGDMA_MODEM_FE_LINK(0), REG_FECOEX_BASE, REG_FECOEX_BASE, N_REGS_FE_COEX(), 0, 0), .owner = BIT(0) | BIT(1) }, /* FE COEX */ [0] = { .config = REGDMA_LINK_CONTINUOUS_INIT(REGDMA_MODEM_FE_LINK(0), REG_FECOEX_BASE, REG_FECOEX_BASE, N_REGS_FE_COEX(), 0, 0), .owner = BIT(0) | BIT(1) }, /* FE COEX */
[1] = { .config = REGDMA_LINK_CONTINUOUS_INIT(REGDMA_MODEM_FE_LINK(1), REG_FEDATA_BASE, REG_FEDATA_BASE, N_REGS_FE_DATA(), 0, 0), .owner = BIT(0) | BIT(1) }, /* FE DATA */ [1] = { .config = REGDMA_LINK_CONTINUOUS_INIT(REGDMA_MODEM_FE_LINK(1), REG_FEDATA_BASE, REG_FEDATA_BASE, N_REGS_FE_DATA(), 0, 0), .owner = BIT(0) | BIT(1) }, /* FE DATA */
@@ -358,25 +362,40 @@ static esp_err_t sleep_retention_phy_fe_init(void *arg)
return ESP_OK; return ESP_OK;
} }
void esp_phy_fe_sleep_data_init(void) esp_err_t esp_phy_fe_sleep_data_init(void)
{ {
sleep_retention_module_init_param_t init_param = { _lock_acquire(&s_phy_fe_retention_lock);
.cbs = { .create = { .handle = sleep_retention_phy_fe_init, .arg = NULL } }, if (s_phy_fe_retention_ref++ == 0) {
.attribute = SLEEP_RETENTION_MODULE_ATTR_PASSIVE | SLEEP_RETENTION_MODULE_ATTR_ATTACH sleep_retention_module_init_param_t init_param = {
}; .cbs = { .create = { .handle = sleep_retention_phy_fe_init, .arg = NULL } },
esp_err_t err = sleep_retention_module_init(SLEEP_RETENTION_MODULE_PHY_FE, &init_param); .attribute = SLEEP_RETENTION_MODULE_ATTR_PASSIVE
if (err != ESP_OK) { };
ESP_LOGW(TAG, "PHY FE sleep retention init failed"); esp_err_t err = sleep_retention_module_init(SLEEP_RETENTION_MODULE_PHY_FE, &init_param);
return; if (err != ESP_OK) {
ESP_LOGW(TAG, "PHY FE sleep retention init failed");
s_phy_fe_retention_ref --;
_lock_release(&s_phy_fe_retention_lock);
return err;
}
} }
_lock_release(&s_phy_fe_retention_lock);
return ESP_OK;
} }
void esp_phy_fe_sleep_data_deinit(void) void esp_phy_fe_sleep_data_deinit(void)
{ {
esp_err_t err = sleep_retention_module_deinit(SLEEP_RETENTION_MODULE_PHY_FE); _lock_acquire(&s_phy_fe_retention_lock);
if (err != ESP_OK) { if (s_phy_fe_retention_ref == 0) {
ESP_LOGW(TAG, "PHY FE sleep retention deinit failed"); _lock_release(&s_phy_fe_retention_lock);
return; return;
} }
if (--s_phy_fe_retention_ref == 0) {
esp_err_t err = sleep_retention_module_deinit(SLEEP_RETENTION_MODULE_PHY_FE);
if (err != ESP_OK) {
ESP_LOGW(TAG, "PHY FE sleep retention deinit failed");
}
}
_lock_release(&s_phy_fe_retention_lock);
} }
#endif // SOC_PM_MODEM_RETENTION_BY_REGDMA && CONFIG_MAC_BB_PD #endif // SOC_PM_MODEM_RETENTION_BY_REGDMA && (CONFIG_MAC_BB_PD || CONFIG_ESP_PHY_HW_SWITCH_RF)
components/esp_phy/esp32c6/phy_init_data.c
+35 -15
View File
@@ -148,12 +148,15 @@ const esp_phy_init_data_t phy_init_data= { {
const char __attribute__((section(".rodata"))) phy_init_magic_post[] = PHY_INIT_MAGIC; const char __attribute__((section(".rodata"))) phy_init_magic_post[] = PHY_INIT_MAGIC;
#if SOC_PM_MODEM_RETENTION_BY_REGDMA && CONFIG_MAC_BB_PD #if SOC_PM_MODEM_RETENTION_BY_REGDMA && (CONFIG_MAC_BB_PD || CONFIG_ESP_PHY_HW_SWITCH_RF)
#include "esp_private/sleep_retention.h" #include "esp_private/sleep_retention.h"
static const char* TAG = "phy_sleep"; static const char* TAG = "phy_sleep";
static _lock_t s_phy_fe_retention_lock;
uint8_t s_phy_fe_retention_ref = 0;
#endif // SOC_PM_MODEM_RETENTION_BY_REGDMA && (CONFIG_MAC_BB_PD || CONFIG_ESP_PHY_HW_SWITCH_RF)
#if SOC_PM_MODEM_RETENTION_BY_REGDMA && CONFIG_MAC_BB_PD
static esp_err_t sleep_retention_wifi_bb_init(void *arg) static esp_err_t sleep_retention_wifi_bb_init(void *arg)
{ {
#define N_REGS_WIFI_AGC() (121) #define N_REGS_WIFI_AGC() (121)
@@ -204,7 +207,9 @@ void esp_phy_sleep_data_deinit(void)
ESP_LOGW(TAG, "WiFi BB sleep retention deinit failed"); ESP_LOGW(TAG, "WiFi BB sleep retention deinit failed");
} }
} }
#endif // SOC_PM_MODEM_RETENTION_BY_REGDMA && CONFIG_MAC_BB_PD
#if SOC_PM_MODEM_RETENTION_BY_REGDMA && (CONFIG_MAC_BB_PD || CONFIG_ESP_PHY_HW_SWITCH_RF)
static esp_err_t sleep_retention_phy_fe_init(void *arg) static esp_err_t sleep_retention_phy_fe_init(void *arg)
{ {
#define N_REGS_FE_COEX() (58) #define N_REGS_FE_COEX() (58)
@@ -219,25 +224,40 @@ static esp_err_t sleep_retention_phy_fe_init(void *arg)
return ESP_OK; return ESP_OK;
} }
void esp_phy_fe_sleep_data_init(void) esp_err_t esp_phy_fe_sleep_data_init(void)
{ {
sleep_retention_module_init_param_t init_param = { _lock_acquire(&s_phy_fe_retention_lock);
.cbs = { .create = { .handle = sleep_retention_phy_fe_init, .arg = NULL } }, if (s_phy_fe_retention_ref++ == 0) {
.attribute = SLEEP_RETENTION_MODULE_ATTR_PASSIVE | SLEEP_RETENTION_MODULE_ATTR_ATTACH sleep_retention_module_init_param_t init_param = {
}; .cbs = { .create = { .handle = sleep_retention_phy_fe_init, .arg = NULL } },
esp_err_t err = sleep_retention_module_init(SLEEP_RETENTION_MODULE_PHY_FE, &init_param); .attribute = SLEEP_RETENTION_MODULE_ATTR_PASSIVE
if (err != ESP_OK) { };
ESP_LOGW(TAG, "PHY FE sleep retention init failed"); esp_err_t err = sleep_retention_module_init(SLEEP_RETENTION_MODULE_PHY_FE, &init_param);
return; if (err != ESP_OK) {
ESP_LOGW(TAG, "PHY FE sleep retention init failed");
s_phy_fe_retention_ref --;
_lock_release(&s_phy_fe_retention_lock);
return err;
}
} }
_lock_release(&s_phy_fe_retention_lock);
return ESP_OK;
} }
void esp_phy_fe_sleep_data_deinit(void) void esp_phy_fe_sleep_data_deinit(void)
{ {
esp_err_t err = sleep_retention_module_deinit(SLEEP_RETENTION_MODULE_PHY_FE); _lock_acquire(&s_phy_fe_retention_lock);
if (err != ESP_OK) { if (s_phy_fe_retention_ref == 0) {
ESP_LOGW(TAG, "PHY FE sleep retention deinit failed"); _lock_release(&s_phy_fe_retention_lock);
return; return;
} }
if (--s_phy_fe_retention_ref == 0) {
esp_err_t err = sleep_retention_module_deinit(SLEEP_RETENTION_MODULE_PHY_FE);
if (err != ESP_OK) {
ESP_LOGW(TAG, "PHY FE sleep retention deinit failed");
}
}
_lock_release(&s_phy_fe_retention_lock);
} }
#endif // SOC_PM_MODEM_RETENTION_BY_REGDMA && CONFIG_MAC_BB_PD #endif // SOC_PM_MODEM_RETENTION_BY_REGDMA && (CONFIG_MAC_BB_PD || CONFIG_ESP_PHY_HW_SWITCH_RF)
components/esp_phy/esp32c61/phy_init_data.c
+40 -20
View File
@@ -148,13 +148,15 @@ const esp_phy_init_data_t phy_init_data= { {
} }; } };
const char __attribute__((section(".rodata"))) phy_init_magic_post[] = PHY_INIT_MAGIC; const char __attribute__((section(".rodata"))) phy_init_magic_post[] = PHY_INIT_MAGIC;
#if SOC_PM_MODEM_RETENTION_BY_REGDMA && (CONFIG_MAC_BB_PD || CONFIG_ESP_PHY_HW_SWITCH_RF)
#if SOC_PM_MODEM_RETENTION_BY_REGDMA && CONFIG_MAC_BB_PD
#include "esp_private/sleep_retention.h" #include "esp_private/sleep_retention.h"
static const char* TAG = "phy_sleep"; static const char* TAG = "phy_sleep";
static _lock_t s_phy_fe_retention_lock;
uint8_t s_phy_fe_retention_ref = 0;
#endif // SOC_PM_MODEM_RETENTION_BY_REGDMA && (CONFIG_MAC_BB_PD || CONFIG_ESP_PHY_HW_SWITCH_RF)
#if SOC_PM_MODEM_RETENTION_BY_REGDMA && CONFIG_MAC_BB_PD
static esp_err_t sleep_retention_wifi_bb_init(void *arg) static esp_err_t sleep_retention_wifi_bb_init(void *arg)
{ {
#define N_REGS_WIFI_AGC() (130) #define N_REGS_WIFI_AGC() (130)
@@ -207,12 +209,15 @@ void esp_phy_sleep_data_deinit(void)
} }
} }
#endif // SOC_PM_MODEM_RETENTION_BY_REGDMA && CONFIG_MAC_BB_PD.
#if SOC_PM_MODEM_RETENTION_BY_REGDMA && (CONFIG_MAC_BB_PD || CONFIG_ESP_PHY_HW_SWITCH_RF)
static esp_err_t sleep_retention_phy_fe_init(void *arg) static esp_err_t sleep_retention_phy_fe_init(void *arg)
{ {
#define N_REGS_FE_COEX() (21) #define N_REGS_FE_COEX() (21)
#define N_REGS_FE_DATA() (34) #define N_REGS_FE_DATA() (34)
#define N_REGS_FE_CTRL() (56) #define N_REGS_FE_CTRL() (56)
#define N_REGS_FE_DATA_WIFI() (21) #define N_REGS_FE_DATA_WIFI() (21)
#define REG_FECOEX_BASE 0x600a0000 #define REG_FECOEX_BASE 0x600a0000
#define REG_FEDATA_BASE 0x600a0400 #define REG_FEDATA_BASE 0x600a0400
#define REG_FECTRL_BASE 0x600a0800 #define REG_FECTRL_BASE 0x600a0800
@@ -230,25 +235,40 @@ static esp_err_t sleep_retention_phy_fe_init(void *arg)
return ESP_OK; return ESP_OK;
} }
void esp_phy_fe_sleep_data_init(void) esp_err_t esp_phy_fe_sleep_data_init(void)
{ {
sleep_retention_module_init_param_t init_param = { _lock_acquire(&s_phy_fe_retention_lock);
.cbs = { .create = { .handle = sleep_retention_phy_fe_init, .arg = NULL } }, if (s_phy_fe_retention_ref++ == 0) {
.attribute = SLEEP_RETENTION_MODULE_ATTR_PASSIVE | SLEEP_RETENTION_MODULE_ATTR_ATTACH sleep_retention_module_init_param_t init_param = {
}; .cbs = { .create = { .handle = sleep_retention_phy_fe_init, .arg = NULL } },
esp_err_t err = sleep_retention_module_init(SLEEP_RETENTION_MODULE_PHY_FE, &init_param); .attribute = SLEEP_RETENTION_MODULE_ATTR_PASSIVE
if (err != ESP_OK) { };
ESP_LOGW(TAG, "PHY FE sleep retention init failed"); esp_err_t err = sleep_retention_module_init(SLEEP_RETENTION_MODULE_PHY_FE, &init_param);
return; if (err != ESP_OK) {
ESP_LOGW(TAG, "PHY FE sleep retention init failed");
s_phy_fe_retention_ref --;
_lock_release(&s_phy_fe_retention_lock);
return err;
}
} }
_lock_release(&s_phy_fe_retention_lock);
return ESP_OK;
} }
void esp_phy_fe_sleep_data_deinit(void) void esp_phy_fe_sleep_data_deinit(void)
{ {
esp_err_t err = sleep_retention_module_deinit(SLEEP_RETENTION_MODULE_PHY_FE); _lock_acquire(&s_phy_fe_retention_lock);
if (err != ESP_OK) { if (s_phy_fe_retention_ref == 0) {
ESP_LOGW(TAG, "PHY FE sleep retention deinit failed"); _lock_release(&s_phy_fe_retention_lock);
return; return;
} }
if (--s_phy_fe_retention_ref == 0) {
esp_err_t err = sleep_retention_module_deinit(SLEEP_RETENTION_MODULE_PHY_FE);
if (err != ESP_OK) {
ESP_LOGW(TAG, "PHY FE sleep retention deinit failed");
}
}
_lock_release(&s_phy_fe_retention_lock);
} }
#endif // SOC_PM_MODEM_RETENTION_BY_REGDMA && CONFIG_MAC_BB_PD #endif // SOC_PM_MODEM_RETENTION_BY_REGDMA && (CONFIG_MAC_BB_PD || CONFIG_ESP_PHY_HW_SWITCH_RF)
components/esp_phy/include/esp_private/phy.h
+3 -3
View File
@@ -282,19 +282,19 @@ void phy_wait_freq_hw_hop_done(void);
*/ */
void phy_track_temp_debug(uint8_t debug_flag, uint8_t track_temp); void phy_track_temp_debug(uint8_t debug_flag, uint8_t track_temp);
#endif #endif
#if SOC_PM_MODEM_RETENTION_BY_REGDMA && CONFIG_MAC_BB_PD #if SOC_PM_MODEM_RETENTION_BY_REGDMA && (CONFIG_MAC_BB_PD || CONFIG_ESP_PHY_HW_SWITCH_RF)
/** /**
* @brief PHY module common memory (FE) initialize * @brief PHY module common memory (FE) initialize
* *
*/ */
void esp_phy_fe_sleep_data_init(void); esp_err_t esp_phy_fe_sleep_data_init(void);
/** /**
* @brief PHY module common memory (FE) de-initialize * @brief PHY module common memory (FE) de-initialize
* *
*/ */
void esp_phy_fe_sleep_data_deinit(void); void esp_phy_fe_sleep_data_deinit(void);
#endif // SOC_PM_MODEM_RETENTION_BY_REGDMA && CONFIG_MAC_BB_PD #endif // SOC_PM_MODEM_RETENTION_BY_REGDMA && (CONFIG_MAC_BB_PD || CONFIG_ESP_PHY_HW_SWITCH_RF)
#if CONFIG_ESP_PHY_MULTIPLE_INIT_DATA_BIN #if CONFIG_ESP_PHY_MULTIPLE_INIT_DATA_BIN
/** /**
components/esp_phy/src/btbb_init.c
+18 -1
View File
@@ -68,14 +68,28 @@ void esp_btbb_enable(void)
if (s_btbb_access_ref == 0) { if (s_btbb_access_ref == 0) {
bt_bb_v2_init_cmplx(BTBB_ENABLE_VERSION_PRINT); 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
esp_err_t err = ESP_OK;
#if CONFIG_ESP_PHY_HW_SWITCH_RF
err = esp_phy_fe_sleep_data_init();
if (err != ESP_OK) {
_lock_release(&s_btbb_access_lock);
return;
}
#endif // CONFIG_ESP_PHY_HW_SWITCH_RF
sleep_retention_module_init_param_t init_param = { sleep_retention_module_init_param_t init_param = {
.cbs = { .create = { .handle = btbb_sleep_retention_init, .arg = NULL } }, .cbs = { .create = { .handle = btbb_sleep_retention_init, .arg = NULL } },
.depends = RETENTION_MODULE_BITMAP_INIT(CLOCK_MODEM) .depends = RETENTION_MODULE_BITMAP_INIT(CLOCK_MODEM)
}; };
esp_err_t err = sleep_retention_module_init(SLEEP_RETENTION_MODULE_BT_BB, &init_param); #if CONFIG_ESP_PHY_HW_SWITCH_RF
init_param.depends.bitmap[SLEEP_RETENTION_MODULE_PHY_FE >> 5] |= BIT(SLEEP_RETENTION_MODULE_PHY_FE % 32);
#endif // CONFIG_ESP_PHY_HW_SWITCH_RF
err = sleep_retention_module_init(SLEEP_RETENTION_MODULE_BT_BB, &init_param);
if (err == ESP_OK) { if (err == ESP_OK) {
err = sleep_retention_module_allocate(SLEEP_RETENTION_MODULE_BT_BB); err = sleep_retention_module_allocate(SLEEP_RETENTION_MODULE_BT_BB);
if (err != ESP_OK) { if (err != ESP_OK) {
#if CONFIG_ESP_PHY_HW_SWITCH_RF
esp_phy_fe_sleep_data_deinit();
#endif // CONFIG_ESP_PHY_HW_SWITCH_RF
ESP_LOGW(TAG, "failed to allocate sleep retention linked list for btbb retention"); ESP_LOGW(TAG, "failed to allocate sleep retention linked list for btbb retention");
} }
} else { } else {
@@ -93,6 +107,9 @@ void esp_btbb_disable(void)
if (s_btbb_access_ref && (--s_btbb_access_ref == 0)) { 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
btbb_sleep_retention_deinit(); btbb_sleep_retention_deinit();
#if CONFIG_ESP_PHY_HW_SWITCH_RF
esp_phy_fe_sleep_data_deinit();
#endif // CONFIG_ESP_PHY_HW_SWITCH_RF
#endif // SOC_PM_MODEM_RETENTION_BY_REGDMA && CONFIG_FREERTOS_USE_TICKLESS_IDLE #endif // SOC_PM_MODEM_RETENTION_BY_REGDMA && CONFIG_FREERTOS_USE_TICKLESS_IDLE
} }
_lock_release(&s_btbb_access_lock); _lock_release(&s_btbb_access_lock);