esp_phy: use spinlock to avoid regi2c access conflicts

components/esp_hw_support/port/esp32/regi2c_ctrl.h

@@ -60,6 +60,10 @@ uint8_t regi2c_ctrl_read_reg_mask(uint8_t block, uint8_t host_id, uint8_t reg_ad
 void regi2c_ctrl_write_reg(uint8_t block, uint8_t host_id, uint8_t reg_add, uint8_t data);
 void regi2c_ctrl_write_reg_mask(uint8_t block, uint8_t host_id, uint8_t reg_add, uint8_t msb, uint8_t lsb, uint8_t data);
 
+/* enter the critical section that protects internal registers. Don't use it in SDK. Use the functions above. */
+void regi2c_enter_critical(void);
+void regi2c_exit_critical(void);
+
 #endif // BOOTLOADER_BUILD
 
 /* Convenience macros for the above functions, these use register definitions

components/esp_hw_support/port/esp32c3/regi2c_ctrl.h

@@ -87,6 +87,10 @@ uint8_t regi2c_ctrl_read_reg_mask(uint8_t block, uint8_t host_id, uint8_t reg_ad
 void regi2c_ctrl_write_reg(uint8_t block, uint8_t host_id, uint8_t reg_add, uint8_t data);
 void regi2c_ctrl_write_reg_mask(uint8_t block, uint8_t host_id, uint8_t reg_add, uint8_t msb, uint8_t lsb, uint8_t data);
 
+/* enter the critical section that protects internal registers. Don't use it in SDK. Use the functions above. */
+void regi2c_enter_critical(void);
+void regi2c_exit_critical(void);
+
 #endif // BOOTLOADER_BUILD
 
 /* Convenience macros for the above functions, these use register definitions

components/esp_hw_support/port/esp32s2/regi2c_ctrl.h

@@ -68,6 +68,10 @@ uint8_t regi2c_ctrl_read_reg_mask(uint8_t block, uint8_t host_id, uint8_t reg_ad
 void regi2c_ctrl_write_reg(uint8_t block, uint8_t host_id, uint8_t reg_add, uint8_t data);
 void regi2c_ctrl_write_reg_mask(uint8_t block, uint8_t host_id, uint8_t reg_add, uint8_t msb, uint8_t lsb, uint8_t data);
 
+/* enter the critical section that protects internal registers. Don't use it in SDK. Use the functions above. */
+void regi2c_enter_critical(void);
+void regi2c_exit_critical(void);
+
 #endif // BOOTLOADER_BUILD
 
 /* Convenience macros for the above functions, these use register definitions

components/esp_hw_support/port/esp32s3/regi2c_ctrl.h

@@ -61,6 +61,10 @@ uint8_t regi2c_ctrl_read_reg_mask(uint8_t block, uint8_t host_id, uint8_t reg_ad
 void regi2c_ctrl_write_reg(uint8_t block, uint8_t host_id, uint8_t reg_add, uint8_t data);
 void regi2c_ctrl_write_reg_mask(uint8_t block, uint8_t host_id, uint8_t reg_add, uint8_t msb, uint8_t lsb, uint8_t data);
 
+/* enter the critical section that protects internal registers. Don't use it in SDK. Use the functions above. */
+void regi2c_enter_critical(void);
+void regi2c_exit_critical(void);
+
 #endif // BOOTLOADER_BUILD
 
 /* Convenience macros for the above functions, these use register definitions

components/esp_hw_support/regi2c_ctrl.c

@@ -48,3 +48,13 @@ void IRAM_ATTR regi2c_ctrl_write_reg_mask(uint8_t block, uint8_t host_id, uint8_
     i2c_write_reg_mask_raw(block, host_id, reg_add, msb, lsb, data);
     portEXIT_CRITICAL_SAFE(&mux);
 }
+
+void IRAM_ATTR regi2c_enter_critical(void)
+{
+    portENTER_CRITICAL_SAFE(&mux);
+}
+
+void IRAM_ATTR regi2c_exit_critical(void)
+{
+    portEXIT_CRITICAL_SAFE(&mux);
+}

components/esp_wifi/CMakeLists.txt

@@ -24,45 +24,33 @@ if(CONFIG_ESP32_SUPPORT_MULTIPLE_PHY_INIT_DATA_BIN)
 endif()
 
 if(CONFIG_ESP32_MULTIPLE_PHY_DATA_BIN_EMBEDDED)
-    idf_component_register(SRCS "src/coexist.c"
+    set(embed_files "${build_dir}/phy_multiple_init_data.bin")
-                            "src/lib_printf.c"
-                            "src/mesh_event.c"
-                            "src/phy_init.c"
-                            "src/smartconfig.c"
-                            "src/smartconfig_ack.c"
-                            "src/wifi_init.c"
-                            "src/wifi_default.c"
-                            "src/wifi_netif.c"
-                            "${idf_target}/esp_adapter.c"
-                INCLUDE_DIRS "include" "${idf_target}/include"
-                PRIV_REQUIRES wpa_supplicant nvs_flash esp_netif driver ${extra_priv_requires}
-                REQUIRES esp_event
-                PRIV_REQUIRES esp_timer esp_pm wpa_supplicant nvs_flash esp_netif ${extra_priv_requires}
-                LDFRAGMENTS "${ldfragments}"
-                EMBED_FILES "${build_dir}/phy_multiple_init_data.bin"
-                )
-else()
-    idf_component_register(SRCS "src/coexist.c"
-                            "src/lib_printf.c"
-                            "src/mesh_event.c"
-                            "src/phy_init.c"
-                            "src/smartconfig.c"
-                            "src/smartconfig_ack.c"
-                            "src/wifi_init.c"
-                            "src/wifi_default.c"
-                            "src/wifi_netif.c"
-                            "${idf_target}/esp_adapter.c"
-                INCLUDE_DIRS "include" "${idf_target}/include"
-                PRIV_REQUIRES wpa_supplicant nvs_flash esp_netif driver ${extra_priv_requires}
-                REQUIRES esp_event
-                PRIV_REQUIRES esp_timer esp_pm wpa_supplicant nvs_flash esp_netif ${extra_priv_requires}
-                LDFRAGMENTS "${ldfragments}"
-                )
 endif()
 
+idf_component_register(SRCS "src/coexist.c"
+                        "src/lib_printf.c"
+                        "src/mesh_event.c"
+                        "src/phy_init.c"
+                        "src/smartconfig.c"
+                        "src/smartconfig_ack.c"
+                        "src/wifi_init.c"
+                        "src/wifi_default.c"
+                        "src/wifi_netif.c"
+                        "${idf_target}/esp_adapter.c"
+                        "src/phy_override.c"
+            INCLUDE_DIRS "include" "${idf_target}/include"
+            PRIV_REQUIRES wpa_supplicant nvs_flash esp_netif driver esp_timer esp_pm ${extra_priv_requires}
+            REQUIRES esp_event
+            LDFRAGMENTS "${ldfragments}"
+            EMBED_FILES ${embed_files}
+            )
+
 set(target_name "${idf_target}")
 target_link_libraries(${COMPONENT_LIB} PUBLIC "-L ${CMAKE_CURRENT_SOURCE_DIR}/lib/${target_name}")
 
+# Override functions in PHY lib with the functions in 'phy_override.c'
+target_link_libraries(${COMPONENT_LIB} INTERFACE "-u include_esp_phy_override")
+
 if(link_binary_libs)
     set(phy phy)
     set(blobs coexist core espnow mesh net80211 pp smartconfig wapi ${phy})

components/esp_wifi/src/phy_override.c

@@ -0,0 +1,52 @@
+/*
+ * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <stdbool.h>
+#include "driver/adc.h"
+
+/*
+ * This file is used to override the hooks provided by the PHY lib for some system features.
+ * Call phy_override() so that this file will be linked.
+ */
+
+static bool s_wifi_adc_xpd_flag;
+
+void include_esp_phy_override(void)
+{
+    /* When this empty function is called, all functions below will be linked. */
+}
+
+/* Coordinate ADC power with other modules. */
+// It seems that it is only required on ESP32, but we still compile it for all chips, in case it is
+// called by PHY unexpectedly.
+void set_xpd_sar(bool en)
+{
+    if (s_wifi_adc_xpd_flag == en) {
+        /* ignore repeated calls to set_xpd_sar when the state is already correct */
+        return;
+    }
+
+    s_wifi_adc_xpd_flag = en;
+    if (en) {
+        adc_power_acquire();
+    } else {
+        adc_power_release();
+    }
+}
+
+//add spinlock protection
+extern void regi2c_enter_critical(void);
+extern void regi2c_exit_critical(void);
+
+void phy_i2c_enter_critical(void)
+{
+    regi2c_enter_critical();
+}
+
+void phy_i2c_exit_critical(void)
+{
+    regi2c_exit_critical();
+}

components/esp_wifi/src/wifi_init.c

@@ -23,7 +23,6 @@
 #include "esp_wpa.h"
 #include "esp_netif.h"
 #include "tcpip_adapter_compatible/tcpip_adapter_compat.h"
-#include "driver/adc.h"
 #include "driver/adc2_wifi_private.h"
 #include "esp_coexist_internal.h"
 #include "esp_phy_init.h"
@@ -64,7 +63,6 @@ uint64_t g_wifi_feature_caps =
 #endif
 0;
 
-static bool s_wifi_adc_xpd_flag;
 
 static const char* TAG = "wifi_init";
 
@@ -290,24 +288,6 @@ void wifi_apb80m_release(void)
 }
 #endif //CONFIG_PM_ENABLE
 
-/* Coordinate ADC power with other modules. This overrides the function from PHY lib. */
-// It seems that it is only required on ESP32, but we still compile it for all chips, in case it is
-// called by PHY unexpectedly.
-void set_xpd_sar(bool en)
-{
-    if (s_wifi_adc_xpd_flag == en) {
-        /* ignore repeated calls to set_xpd_sar when the state is already correct */
-        return;
-    }
-
-    s_wifi_adc_xpd_flag = en;
-    if (en) {
-        adc_power_acquire();
-    } else {
-        adc_power_release();
-    }
-}
-
 #ifndef CONFIG_ESP_WIFI_FTM_ENABLE
 void ieee80211_ftm_attach(void)
 {