blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-10 17:49:10 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix/phy_rtc_cache_disabled' into 'master'

Browse Source 
Fix PHY/RTC functions called in ISR, but stored in flash

See merge request idf/esp-idf!4108
This commit is contained in:
Jiang Jiang Jian 2019-01-18 10:53:52 +08:00
commit 5d7d4ba4f3
2 changed files with 91 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp32/lib

@ -1 +1 @@
Subproject commit 630ff8281b5babb5ba67dffdc6139bdbc4c58f92
Subproject commit 0eef73e06f960afc6403a60bcc2a18cf55e9bbf8

90
components/esp32/test/test_phy_rtc.c Normal file
View File

@ -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);
}