From: Tian Hao <tianhao@espressif.com>
Date: Sun, 13 Jan 2019 08:05:12 +0000 (+0800)
Subject: Fix some bugs in phy
X-Git-Tag: v3.2-beta3~42^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a953f73c6439482a3690a3b5c5ccb6cffde26fd7;p=esp-idf

Fix some bugs in phy

1. fix bug PHY/RTC functions called in ISR (update phy to v4007)
2. add UnitTest to test it
3. fix task watchdog bug when wifi change channel
4. disable/enable agc to mac deinit/init
---

diff --git a/components/esp32/lib b/components/esp32/lib
index ec07b86b54..8bbce98da5 160000
--- a/components/esp32/lib
+++ b/components/esp32/lib
@@ -1 +1 @@
-Subproject commit ec07b86b54373052c84c8fdb631317273c5e6afe
+Subproject commit 8bbce98da549392214eb852210b50087bb272cc3
diff --git a/components/esp32/test/test_phy_rtc.c b/components/esp32/test/test_phy_rtc.c
new file mode 100644
index 0000000000..947555bc5a
--- /dev/null
+++ b/components/esp32/test/test_phy_rtc.c
@@ -0,0 +1,90 @@
+/*
+ Tests for the Wi-Fi
+*/
+#include "string.h"
+#include "esp_system.h"
+#include "unity.h"
+#include "esp_log.h"
+#include "nvs_flash.h"
+#include "test_utils.h"
+#include "esp_phy_init.h"
+#include <freertos/FreeRTOS.h>
+#include <freertos/task.h>
+#include <freertos/semphr.h>
+
+
+//Function just extern, need not test
+extern void bt_bb_init_cmplx(void);
+extern void IRAM_ATTR spi_flash_disable_interrupts_caches_and_other_cpu();
+extern void IRAM_ATTR spi_flash_enable_interrupts_caches_and_other_cpu();
+
+//Functions in librtc.a called by WIFI or Blutooth directly in ISR
+extern void bt_bb_init_cmplx_reg(void);
+extern void force_wifi_mode(int);
+extern void unforce_wifi_mode(void);
+extern void bt_track_pll_cap(void);
+
+static const char* TAG = "test_phy_rtc";
+
+static SemaphoreHandle_t semphr_done;
+
+//Functions in libphy.a called by WIFI or Blutooth directly in ISR
+static void test_phy_rtc_init(void)
+{
+    esp_err_t ret = nvs_flash_init();
+    if (ret == ESP_ERR_NVS_NO_FREE_PAGES || ret == ESP_ERR_NVS_NEW_VERSION_FOUND) {
+        ESP_LOGI(TAG, "no free pages or nvs version mismatch, erase..");
+        TEST_ESP_OK(nvs_flash_erase());
+        ret = nvs_flash_init();
+    }
+    TEST_ESP_OK(ret);
+
+    esp_phy_load_cal_and_init(PHY_BT_MODULE);
+    esp_phy_load_cal_and_init(PHY_WIFI_MODULE);
+
+    //must run here, not blocking in above code
+    TEST_ASSERT(1);
+}
+
+static IRAM_ATTR void test_phy_rtc_cache_task(void *arg)
+{
+    test_phy_rtc_init();
+
+    ESP_LOGI(TAG, "Test bt_bb_init_cmplx_reg()...");
+    spi_flash_disable_interrupts_caches_and_other_cpu();
+    bt_bb_init_cmplx_reg();
+    spi_flash_enable_interrupts_caches_and_other_cpu();
+
+    for (int i = 0; i < 2; i++) {
+        ESP_LOGI(TAG, "Test force_wifi_mode(%d)...", i);
+        spi_flash_disable_interrupts_caches_and_other_cpu();
+        force_wifi_mode(i);
+        spi_flash_enable_interrupts_caches_and_other_cpu();
+
+        ESP_LOGI(TAG, "Test unforce_wifi_mode()...");
+        spi_flash_disable_interrupts_caches_and_other_cpu();
+        unforce_wifi_mode();
+        spi_flash_enable_interrupts_caches_and_other_cpu();
+    }
+
+    ESP_LOGI(TAG, "Test bt_track_pll_cap()...");
+    spi_flash_disable_interrupts_caches_and_other_cpu();
+    bt_track_pll_cap();
+    spi_flash_enable_interrupts_caches_and_other_cpu();
+
+    TEST_ASSERT( xSemaphoreGive(semphr_done) );
+
+    vTaskDelete(NULL);
+}
+
+TEST_CASE("Test PHY/RTC functions called when cache is disabled", "[phy_rtc][cache_disabled]")
+{
+    semphr_done = xSemaphoreCreateCounting(1, 0);
+
+    xTaskCreatePinnedToCore(test_phy_rtc_cache_task, "phy_rtc_test_task", 2048,
+                            NULL, configMAX_PRIORITIES-1, NULL, 0);
+
+    TEST_ASSERT( xSemaphoreTake(semphr_done, portMAX_DELAY) );
+
+    vSemaphoreDelete(semphr_done);
+}