Merge branch 'feature/refactor_wifi_power_management' into 'master'

feat(wifi): refactor wifi power management

See merge request sdk/ESP8266_RTOS_SDK!1434

Author: donghengqaz

components/esp8266/Kconfig

@@ -2,7 +2,7 @@ menu "ESP8266-specific"
 
 choice ESP8266_DEFAULT_CPU_FREQ_MHZ
     prompt "CPU frequency"
-    default ESP8266_DEFAULT_CPU_FREQ_80
+    default ESP8266_DEFAULT_CPU_FREQ_160
     help
         CPU frequency to be set on application startup.
 
@@ -298,7 +298,7 @@ config ESP8266_WIFI_RX_BUFFER_NUM
 config ESP8266_WIFI_LEFT_CONTINUOUS_RX_BUFFER_NUM
     int "The min number of WiFi continuous RX buffer"
     range 0 16
-    default 8
+    default 16
     help
         Set the number of WiFi continuous RX buffer num.
         The smaller the value, the easier RX hang will appear. Most of time we should NOT change the default

components/esp8266/include/esp_phy_init.h

@@ -165,6 +165,11 @@ esp_err_t esp_phy_rf_deinit(phy_rf_module_t module);
  */
 void esp_phy_load_cal_and_init(phy_rf_module_t module);
 
+/**
+ * @brief Initializing system hardware clock.
+ */
+void esp_phy_init_clk(void);
+
 #ifdef __cplusplus
 }
 #endif

components/esp8266/include/esp_sleep.h

@@ -15,6 +15,7 @@
 #pragma once
 
 #include <stdint.h>
+#include <stdbool.h>
 #include "esp_err.h"
 #include "driver/gpio.h"
 
@@ -261,6 +262,22 @@ esp_err_t esp_sleep_enable_gpio_wakeup(void);
  */
 esp_err_t esp_sleep_disable_wakeup_source(esp_sleep_source_t source);
 
+/**
+ * @brief Print power consumption information
+ *
+ * @note This function is used to print power consumption data. The current
+ *       when the RF and CPU are both turned on is 70 mA. The current when
+ *       only the CPU is turned on is 18 mA. 900uA when both CPU and RF are off.
+ *       There may be some errors compared to the actual power consumption.
+ *       The power consumption is based on the actual measurement, and the printing
+ *       in the function is for reference only.
+ * 
+ * @param     clear_old_data  - Recalculate power consumption info or not.
+ * 
+ * @return    null
+ */
+void esp_power_consumption_info(bool clear_old_data);
+
 #ifdef __cplusplus
 }
 #endif

components/esp8266/include/internal/esp_wifi_internal.h

@@ -191,6 +191,42 @@ void esp_wifi_set_pm_recv_multi_data(bool enable);
   */
 bool esp_wifi_get_pm_recv_multi_data(void);
 
+/**
+  * @brief     Set max beacon early time.
+  *
+  * @param     max_bcn_early_ms  max beacon early time(2~15ms), default 4ms.
+  */
+void esp_wifi_set_pm_max_bcn_early(uint8_t max_bcn_early_ms);
+
+/**
+  * @brief     get max beacon early time.
+  */
+uint8_t esp_wifi_get_pm_max_bcn_early(void);
+
+/**
+  * @brief     Set max beacon timeout time.
+  *
+  * @param     max_bcn_early_ms  max beacon timeout time(12~32ms), default 24ms.
+  */
+void esp_wifi_set_pm_max_bcn_timeout(uint8_t max_bcn_timeout_ms);
+
+/**
+  * @brief     get max beacon timeout time.
+  */
+uint8_t esp_wifi_get_pm_max_bcn_timeout(void);
+
+/**
+  * @brief     Set max wait tx rx time.
+  *
+  * @param     max_bcn_early_ms  max wait tx rx time(10~2000ms), default 20ms.
+  */
+void esp_wifi_set_pm_wait_tx_rx_time(uint32_t wait_tx_rx_time_ms);
+
+/**
+  * @brief     get max wait tx rx time.
+  */
+uint32_t esp_wifi_get_pm_wait_tx_rx_time();
+
 #ifdef __cplusplus
 }
 #endif

components/esp8266/lib/VERSION

@@ -1,10 +1,10 @@
 gwen:
-    core:       01c569d
-    net80211:   01c569d
-    pp:         01c569d
-    espnow:     01c569d
-    wps:        01c569d
-    wpa2:       01c569d
+    core:       3c69aa1
+    net80211:   3c69aa1
+    pp:         3c69aa1
+    espnow:     3c69aa1
+    wps:        3c69aa1
+    wpa2:       3c69aa1
 
     smartconfig:  2.8.2
     phy:          1163.0

components/esp8266/lib/libcore.a

@@ -146,7 +146,7 @@ static inline uint32_t sleep_rtc_ticks(pm_soc_clk_t *clk)
 
 static inline void update_soc_clk(pm_soc_clk_t *clk)
 {
-    extern uint32_t WdevTimOffSet;
+    extern uint64_t WdevTimOffSet;
 
     uint32_t slept_us;
 

components/esp8266/lib/libcore_dbg.a

@@ -394,3 +394,31 @@ int phy_printf(const char *fmt, ...)
 {
     return 0;
 }
+
+void esp_phy_init_clk(void)
+{
+    uint8_t buf[128];
+    const esp_phy_init_data_t *init_data;
+#ifdef CONFIG_CONSOLE_UART_BAUDRATE
+    const uint32_t uart_baudrate = CONFIG_CONSOLE_UART_BAUDRATE;
+#else
+    const uint32_t uart_baudrate = 74880; // ROM default baudrate
+#endif
+
+    init_data = esp_phy_get_init_data();
+    if (init_data == NULL) {
+        ESP_LOGE(TAG, "failed to obtain PHY init data");
+        abort();
+    }
+    memcpy(buf, init_data->params, 128);
+
+    uart_tx_wait_idle(0);
+    uart_div_modify(0, UART_CLK_FREQ / uart_baudrate);
+
+    uart_tx_wait_idle(1);
+    uart_div_modify(1, UART_CLK_FREQ / uart_baudrate);
+
+    rtc_init_clk(buf);
+
+    esp_phy_release_init_data(init_data);
+}

components/esp8266/lib/libespnow.a

@@ -74,16 +74,10 @@ static void user_init_entry(void *param)
 
     extern void app_main(void);
 
-    extern void phy_close_rf(void);
-
-    extern void esp_sleep_unlock();
-
     /* initialize C++ construture function */
     for (func = &__init_array_start; func < &__init_array_end; func++)
         func[0]();
 
-    phy_get_bb_evm();
-
     /*enable tsf0 interrupt for pwm*/
     REG_WRITE(PERIPHS_DPORT_BASEADDR, (REG_READ(PERIPHS_DPORT_BASEADDR) & ~0x1F) | 0x1);
     REG_WRITE(INT_ENA_WDEV, REG_READ(INT_ENA_WDEV) | WDEV_TSF0_REACH_INT);
@@ -92,12 +86,11 @@ static void user_init_entry(void *param)
     assert(rtc_init() == 0);
     assert(mac_init() == 0);
     assert(base_gpio_init() == 0);
-    esp_phy_load_cal_and_init(0);
-    phy_close_rf();
-    esp_sleep_unlock();
 
     esp_wifi_set_rx_pbuf_mem_type(WIFI_RX_PBUF_DRAM);
 
+    esp_phy_init_clk();
+
 #if CONFIG_RESET_REASON
     esp_reset_reason_init();
 #endif

components/esp8266/lib/libespnow_dbg.a

@@ -144,6 +144,11 @@ void ICACHE_FLASH_ATTR wpa_sta_init()
                  wpa_config_assoc_ie, wpa_install_key, wpa_get_key, wpa_deauthenticate, wpa_neg_complete);
 }
 
+void wpa_sta_deinit(void)
+{
+    wpa_sm_deinit();
+}
+
 void  wpa_sta_connect(uint8_t *bssid)
 {
     wpa_config_profile();

components/esp8266/lib/libnet80211.a

@@ -2009,6 +2009,15 @@ void ICACHE_FLASH_ATTR wpa_register(char* payload, WPA_SEND_FUNC snd_func,
     return true;
 }
 
+/** 
+ *  * wpa_sm_deinit - Deinitialize WPA state machine
+ *    */ 
+void wpa_sm_deinit(void)
+{
+    struct wpa_sm *sm = &gWpaSm;
+    pmksa_cache_deinit(sm->pmksa);
+}
+
 void wpa_set_profile(u32 wpa_proto, u8 auth_mode)
 {
     struct wpa_sm *sm = &gWpaSm;

components/esp8266/lib/libnet80211_dbg.a

@@ -163,6 +163,8 @@ void wpa_register(char * payload, WPA_SEND_FUNC snd_func, \
 
 void eapol_txcb(void *eb);
 
+void wpa_sm_deinit(void);
+
 void wpa_set_profile(u32 wpa_proto, u8 auth_mode);
 
 int wpa_set_bss(char *macddr, char * bssid, u8 pairwise_cipher, u8 group_cipher, char *passphrase, u8 *ssid, size_t ssid_len);