From 9825d0004fafc66d5e9acc6ab5799c159f268dc5 Mon Sep 17 00:00:00 2001
From: dongyou <dongyou@espressif.com>
Date: Thu, 20 Aug 2020 20:02:46 +0800
Subject: [PATCH] Add IRAM_ATTR wifi_bt_common_module_enable/disable() Deleted
 duplicated spinlock and counter.

---
 .../driver/include/driver/periph_ctrl.h       | 23 +++++++++
 components/driver/periph_ctrl.c               | 23 +++++++++
 components/esp32/phy_init.c                   | 50 +------------------
 3 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/components/driver/include/driver/periph_ctrl.h b/components/driver/include/driver/periph_ctrl.h
index 9689a8cb2..1d010c0c2 100644
--- a/components/driver/include/driver/periph_ctrl.h
+++ b/components/driver/include/driver/periph_ctrl.h
@@ -62,6 +62,29 @@ void periph_module_disable(periph_module_t periph);
  */
 void periph_module_reset(periph_module_t periph);
 
+/**
+ * @brief      enable wifi bt common module
+ *
+ * @note If wifi_bt_common_module_enable is called a number of times,
+ *       wifi_bt_common_module_disable has to be called the same number of times
+ *       in order to put the peripheral into disabled state.
+ *
+ * @return     NULL 
+ * 
+ */
+void wifi_bt_common_module_enable(void);
+
+/**
+ * @brief      disable wifi bt common module
+ *
+ * @note If wifi_bt_common_module_enable is called a number of times,
+ *       wifi_bt_common_module_disable has to be called the same number of times
+ *       in order to put the peripheral into disabled state.
+ *
+ * @return     NULL 
+ * 
+ */
+void wifi_bt_common_module_disable(void);
 
 #ifdef __cplusplus
 }
diff --git a/components/driver/periph_ctrl.c b/components/driver/periph_ctrl.c
index e877aa9b2..9083ccf95 100644
--- a/components/driver/periph_ctrl.c
+++ b/components/driver/periph_ctrl.c
@@ -20,6 +20,7 @@
 #include "driver/periph_ctrl.h"
 
 static portMUX_TYPE periph_spinlock = portMUX_INITIALIZER_UNLOCKED;
+static uint8_t ref_counts = 0;
 
 /* Static functions to return register address & mask for clk_en / rst of each peripheral */
 static uint32_t get_clk_en_mask(periph_module_t periph);
@@ -257,4 +258,26 @@ static uint32_t get_rst_en_reg(periph_module_t periph)
     }
 }
 
+IRAM_ATTR void wifi_bt_common_module_enable(void)
+{
+    portENTER_CRITICAL_SAFE(&periph_spinlock);
+    if (ref_counts == 0) {
+        DPORT_SET_PERI_REG_MASK(DPORT_WIFI_CLK_EN_REG,DPORT_WIFI_CLK_WIFI_BT_COMMON_M);
+        DPORT_CLEAR_PERI_REG_MASK(DPORT_CORE_RST_EN_REG,0);
+    }
+    
+    ref_counts++;
+    portEXIT_CRITICAL_SAFE(&periph_spinlock);
+}
 
+IRAM_ATTR void wifi_bt_common_module_disable(void)
+{
+    portENTER_CRITICAL_SAFE(&periph_spinlock);
+    ref_counts--;
+    if (ref_counts == 0) {
+        DPORT_CLEAR_PERI_REG_MASK(DPORT_WIFI_CLK_EN_REG,DPORT_WIFI_CLK_WIFI_BT_COMMON_M);
+        DPORT_SET_PERI_REG_MASK(DPORT_CORE_RST_EN_REG,0);
+    }
+
+    portEXIT_CRITICAL_SAFE(&periph_spinlock);
+} 
\ No newline at end of file
diff --git a/components/esp32/phy_init.c b/components/esp32/phy_init.c
index 5968fef50..15bdff74b 100644
--- a/components/esp32/phy_init.c
+++ b/components/esp32/phy_init.c
@@ -52,12 +52,6 @@ static uint32_t s_module_phy_rf_init = 0;
 /* Whether modem sleep is turned on */
 static volatile bool s_is_phy_rf_en = false;
 
-/* Whether WiFi/BT common clock enabled reference */
-static volatile int32_t s_common_clock_enable_ref = 0;
-
-/* PHY spinlock mux */
-static portMUX_TYPE s_phy_spin_lock = portMUX_INITIALIZER_UNLOCKED;
-
 /* Bit mask of modules needing to enter modem sleep mode */
 static uint32_t s_modem_sleep_module_enter = 0;
 
@@ -121,56 +115,16 @@ static inline void phy_update_wifi_mac_time(bool en_clock_stopped, int64_t now)
     }
 }
 
-IRAM_ATTR static inline void phy_spin_lock(void)
-{
-    if (xPortInIsrContext()) {
-        portENTER_CRITICAL_ISR(&s_phy_spin_lock);
-    } else {
-        portENTER_CRITICAL(&s_phy_spin_lock);
-    }
-}
-
-IRAM_ATTR static inline void phy_spin_unlock(void)
-{
-    if (xPortInIsrContext()) {
-        portEXIT_CRITICAL_ISR(&s_phy_spin_lock);
-    } else {
-        portEXIT_CRITICAL(&s_phy_spin_lock);
-    }
-}
-
 IRAM_ATTR void esp_phy_common_clock_enable(void)
 {
-    phy_spin_lock();
-
-    if (s_common_clock_enable_ref == 0) {
-        // Enable WiFi/BT common clock
-        periph_module_enable(PERIPH_WIFI_BT_COMMON_MODULE);
-    }
-
-    s_common_clock_enable_ref++;
-    phy_spin_unlock();
+    wifi_bt_common_module_enable();
 }
 
 IRAM_ATTR void esp_phy_common_clock_disable(void)
 {
-    phy_spin_lock();
-
-    if (s_common_clock_enable_ref > 0) {
-        s_common_clock_enable_ref --;
-
-        if (s_common_clock_enable_ref == 0) {
-             // Disable WiFi/BT common clock
-             periph_module_disable(PERIPH_WIFI_BT_COMMON_MODULE);
-        }
-    } else {
-        abort();
-    }
-
-    phy_spin_unlock();
+    wifi_bt_common_module_disable();
 }
 
-
 esp_err_t esp_phy_rf_init(const esp_phy_init_data_t* init_data, esp_phy_calibration_mode_t mode, 
                           esp_phy_calibration_data_t* calibration_data, phy_rf_module_t module)
 {