bugfix(wifi): fix incomplete phy initialization due to absence of bb clocks at coexistence scenarios

components/soc/esp32/include/soc/periph_defs.h

@@ -25,6 +25,7 @@ typedef enum {
     PERIPH_BT_MODULE,
     PERIPH_WIFI_BT_COMMON_MODULE,
     PERIPH_BT_BASEBAND_MODULE,
+    PERIPH_PHY_CALIBRATION_MODULE,
     PERIPH_MODULE_MAX
 } shared_periph_module_t;
 

components/soc/esp32c2/include/soc/periph_defs.h

@@ -20,6 +20,7 @@ typedef enum {
     PERIPH_BT_MODULE,
     PERIPH_WIFI_BT_COMMON_MODULE,
     PERIPH_SYSTIMER_MODULE,
+    PERIPH_PHY_CALIBRATION_MODULE,
     PERIPH_MODULE_MAX
 } shared_periph_module_t;
 

components/soc/esp32c2/register/soc/syscon_reg.h

@@ -178,6 +178,8 @@ extern "C" {
 #define SYSTEM_WIFI_CLK_BT_EN_S  0
 /* Mask for clock bits used by both WIFI and Bluetooth, 0, 1, 2, 3, 7, 8, 9, 10, 19, 20, 21, 22, 23 */
 #define SYSTEM_WIFI_CLK_WIFI_BT_COMMON_M 0x78078F
+/* Mask for clock bits used by phy calibration, bit 22, 29, 30, 31 */
+#define SYSTEM_WIFI_CLK_PHY_EN_M    0xE0400000
 
 /* Digital team to check */
 //bluetooth baseband bit11

components/soc/esp32c3/include/soc/periph_defs.h

@@ -22,6 +22,7 @@ typedef enum {
     PERIPH_BT_MODULE,
     PERIPH_WIFI_BT_COMMON_MODULE,
     PERIPH_SYSTIMER_MODULE,
+    PERIPH_PHY_CALIBRATION_MODULE,
     PERIPH_MODULE_MAX
 } shared_periph_module_t;
 

components/soc/esp32c3/register/soc/syscon_reg.h

@@ -177,6 +177,8 @@ extern "C" {
 #define SYSTEM_WIFI_CLK_BT_EN_S  0
 /* Mask for clock bits used by both WIFI and Bluetooth, 0, 1, 2, 3, 7, 8, 9, 10, 19, 20, 21, 22, 23 */
 #define SYSTEM_WIFI_CLK_WIFI_BT_COMMON_M 0x78078F
+/* Mask for clock bits used by phy calibration, bit 22 */
+#define SYSTEM_WIFI_CLK_PHY_EN_M    0x400000
 
 /* Digital team to check */
 //bluetooth baseband bit11

components/soc/esp32c6/include/soc/periph_defs.h

@@ -36,12 +36,13 @@ typedef enum {
     PERIPH_ANA_I2C_MASTER_MODULE,
     PERIPH_MODEM_ETM_MODULE,
     PERIPH_MODEM_ADC_COMMON_FE_MODULE,
+    PERIPH_PHY_CALIBRATION_MODULE,
     PERIPH_MODULE_MAX
     /*  !!! Don't append soc modules here !!! */
 } shared_periph_module_t;
 
 #define PERIPH_MODEM_MODULE_MIN PERIPH_WIFI_MODULE
-#define PERIPH_MODEM_MODULE_MAX PERIPH_MODEM_ADC_COMMON_FE_MODULE
+#define PERIPH_MODEM_MODULE_MAX PERIPH_PHY_CALIBRATION_MODULE
 #define PERIPH_MODEM_MODULE_NUM (PERIPH_MODEM_MODULE_MAX - PERIPH_MODEM_MODULE_MIN + 1)
 #define IS_MODEM_MODULE(periph)  ((periph>=PERIPH_MODEM_MODULE_MIN) && (periph<=PERIPH_MODEM_MODULE_MAX))
 

components/soc/esp32h2/include/soc/periph_defs.h

@@ -34,12 +34,13 @@ typedef enum {
     PERIPH_ANA_I2C_MASTER_MODULE,
     PERIPH_MODEM_ETM_MODULE,
     PERIPH_MODEM_ADC_COMMON_FE_MODULE,
+    PERIPH_PHY_CALIBRATION_MODULE,
     PERIPH_MODULE_MAX
     /*  !!! Don't append soc modules here !!! */
 } shared_periph_module_t;
 
 #define PERIPH_MODEM_MODULE_MIN PERIPH_BT_MODULE
-#define PERIPH_MODEM_MODULE_MAX PERIPH_MODEM_ADC_COMMON_FE_MODULE
+#define PERIPH_MODEM_MODULE_MAX PERIPH_PHY_CALIBRATION_MODULE
 #define PERIPH_MODEM_MODULE_NUM (PERIPH_MODEM_MODULE_MAX - PERIPH_MODEM_MODULE_MIN + 1)
 #define IS_MODEM_MODULE(periph)  ((periph>=PERIPH_MODEM_MODULE_MIN) && (periph<=PERIPH_MODEM_MODULE_MAX))
 

components/soc/esp32h21/include/soc/periph_defs.h

@@ -26,12 +26,13 @@ typedef enum {
     PERIPH_ANA_I2C_MASTER_MODULE,
     PERIPH_MODEM_ETM_MODULE,
     PERIPH_MODEM_ADC_COMMON_FE_MODULE,
+    PERIPH_PHY_CALIBRATION_MODULE,
     PERIPH_MODULE_MAX
     /*  !!! Don't append soc modules here !!! */
 } shared_periph_module_t;
 
 #define PERIPH_MODEM_MODULE_MIN PERIPH_BT_MODULE
-#define PERIPH_MODEM_MODULE_MAX PERIPH_MODEM_ADC_COMMON_FE_MODULE
+#define PERIPH_MODEM_MODULE_MAX PERIPH_PHY_CALIBRATION_MODULE
 #define PERIPH_MODEM_MODULE_NUM (PERIPH_MODEM_MODULE_MAX - PERIPH_MODEM_MODULE_MIN + 1)
 #define IS_MODEM_MODULE(periph)  ((periph>=PERIPH_MODEM_MODULE_MIN) && (periph<=PERIPH_MODEM_MODULE_MAX))
 

components/soc/esp32h4/include/soc/periph_defs.h

@@ -26,12 +26,13 @@ typedef enum {
     PERIPH_ANA_I2C_MASTER_MODULE,
     PERIPH_MODEM_ETM_MODULE,
     PERIPH_MODEM_ADC_COMMON_FE_MODULE,
+    PERIPH_PHY_CALIBRATION_MODULE,
     PERIPH_MODULE_MAX
     /*  !!! Don't append soc modules here !!! */
 } shared_periph_module_t;
 
 #define PERIPH_MODEM_MODULE_MIN PERIPH_BT_MODULE
-#define PERIPH_MODEM_MODULE_MAX PERIPH_MODEM_ADC_COMMON_FE_MODULE
+#define PERIPH_MODEM_MODULE_MAX PERIPH_PHY_CALIBRATION_MODULE
 #define PERIPH_MODEM_MODULE_NUM (PERIPH_MODEM_MODULE_MAX - PERIPH_MODEM_MODULE_MIN + 1)
 #define IS_MODEM_MODULE(periph)  ((periph>=PERIPH_MODEM_MODULE_MIN) && (periph<=PERIPH_MODEM_MODULE_MAX))
 

components/soc/esp32s2/include/soc/periph_defs.h

@@ -22,6 +22,7 @@ typedef enum {
     PERIPH_WIFI_MODULE,
     PERIPH_WIFI_BT_COMMON_MODULE,
     PERIPH_SYSTIMER_MODULE,
+    PERIPH_PHY_CALIBRATION_MODULE,
     PERIPH_MODULE_MAX
 } shared_periph_module_t;
 

components/soc/esp32s2/register/soc/syscon_reg.h

@@ -445,6 +445,9 @@ extern "C" {
 /* Mask for clock bits used by both WIFI and Bluetooth, bit 0, 3, 6, 7, 8, 9 */
 #define SYSTEM_WIFI_CLK_WIFI_BT_COMMON_M 0x000003c9
 #define DPORT_WIFI_CLK_WIFI_BT_COMMON_M SYSTEM_WIFI_CLK_WIFI_BT_COMMON_M
+/* Mask for clock bits used by phy calibration, bit 22 */
+#define SYSTEM_WIFI_CLK_PHY_EN_M    0x400000
+#define DPORT_WIFI_CLK_PHY_EN_M     SYSTEM_WIFI_CLK_PHY_EN_M
 
 /* Digital team to check */
 //bluetooth baseband bit11

components/soc/esp32s3/include/soc/periph_defs.h

@@ -24,6 +24,7 @@ typedef enum {
     PERIPH_BT_MODULE,
     PERIPH_WIFI_BT_COMMON_MODULE,
     PERIPH_SYSTIMER_MODULE,
+    PERIPH_PHY_CALIBRATION_MODULE,
     PERIPH_MODULE_MAX
 } shared_periph_module_t;
 

components/soc/esp32s3/register/soc/syscon_reg.h

@@ -178,6 +178,8 @@ extern "C" {
 #define SYSTEM_WIFI_CLK_BT_EN_S  0
 /* Mask for clock bits used by both WIFI and Bluetooth, 0, 1, 2, 3, 7, 8, 9, 10, 19, 20, 21, 22, 23 */
 #define SYSTEM_WIFI_CLK_WIFI_BT_COMMON_M 0x78078F
+/* Mask for clock bits used by phy calibration, bit 22 */
+#define SYSTEM_WIFI_CLK_PHY_EN_M    0x400000
 
 //bluetooth baseband bit11
 #define SYSTEM_BT_BASEBAND_EN BIT(11)