alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/tw20575_fix_potential_phy_calibration_bug_v2.1' into 'release/v2.1'

Browse Source 
esp32: fix potential PHY calibration bug

See merge request idf/esp-idf!2357
This commit is contained in:
Jiang Jiang Jian 2018-05-09 21:22:45 +08:00
commit c70a613127
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
components/esp32/phy_init.c
View File

@ -241,19 +241,34 @@ static esp_err_t store_cal_data_to_nvs_handle(nvs_handle handle,
const esp_phy_calibration_data_t* cal_data) const esp_phy_calibration_data_t* cal_data)
{ {
esp_err_t err; esp_err_t err;
uint32_t cal_format_version = phy_get_rf_cal_version() & (~BIT(16));
ESP_LOGV(TAG, "phy_get_rf_cal_version: %d\n", cal_format_version); err = nvs_set_blob(handle, PHY_CAL_DATA_KEY, cal_data, sizeof(*cal_data));
err = nvs_set_u32(handle, PHY_CAL_VERSION_KEY, cal_format_version);
if (err != ESP_OK) { if (err != ESP_OK) {
ESP_LOGE(TAG, "%s: store calibration data failed(0x%x)\n", __func__, err);
return err; return err;
} }
uint8_t sta_mac[6]; uint8_t sta_mac[6];
esp_efuse_mac_get_default(sta_mac); esp_efuse_mac_get_default(sta_mac);
err = nvs_set_blob(handle, PHY_CAL_MAC_KEY, sta_mac, sizeof(sta_mac)); err = nvs_set_blob(handle, PHY_CAL_MAC_KEY, sta_mac, sizeof(sta_mac));
if (err != ESP_OK) { if (err != ESP_OK) {
ESP_LOGE(TAG, "%s: store calibration mac failed(0x%x)\n", __func__, err);
return err; return err;
} }
err = nvs_set_blob(handle, PHY_CAL_DATA_KEY, cal_data, sizeof(*cal_data));
uint32_t cal_format_version = phy_get_rf_cal_version() & (~BIT(16));
ESP_LOGV(TAG, "phy_get_rf_cal_version: %d\n", cal_format_version);
err = nvs_set_u32(handle, PHY_CAL_VERSION_KEY, cal_format_version);
if (err != ESP_OK) {
ESP_LOGE(TAG, "%s: store calibration version failed(0x%x)\n", __func__, err);
return err;
}
err = nvs_commit(handle);
if (err != ESP_OK) {
ESP_LOGE(TAG, "%s: store calibration nvs commit failed(0x%x)\n", __func__, err);
}
return err; return err;
} }
@ -266,17 +281,18 @@ void esp_phy_load_cal_and_init(void)
abort(); abort();
} }
#ifdef CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE
esp_phy_calibration_mode_t calibration_mode = PHY_RF_CAL_PARTIAL;
if (rtc_get_reset_reason(0) == DEEPSLEEP_RESET) {
calibration_mode = PHY_RF_CAL_NONE;
}
const esp_phy_init_data_t* init_data = esp_phy_get_init_data(); const esp_phy_init_data_t* init_data = esp_phy_get_init_data();
if (init_data == NULL) { if (init_data == NULL) {
ESP_LOGE(TAG, "failed to obtain PHY init data"); ESP_LOGE(TAG, "failed to obtain PHY init data");
abort(); abort();
} }
#ifdef CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE
esp_phy_calibration_mode_t calibration_mode = PHY_RF_CAL_PARTIAL;
if (rtc_get_reset_reason(0) == DEEPSLEEP_RESET) {
calibration_mode = PHY_RF_CAL_NONE;
}
esp_err_t err = esp_phy_load_cal_data_from_nvs(cal_data); esp_err_t err = esp_phy_load_cal_data_from_nvs(cal_data);
if (err != ESP_OK) { if (err != ESP_OK) {
ESP_LOGW(TAG, "failed to load RF calibration data (0x%x), falling back to full calibration", err); ESP_LOGW(TAG, "failed to load RF calibration data (0x%x), falling back to full calibration", err);
@ -292,7 +308,7 @@ void esp_phy_load_cal_and_init(void)
} }
esp_phy_release_init_data(init_data); esp_phy_release_init_data(init_data);
#else #else
esp_phy_rf_init(NULL, PHY_RF_CAL_FULL, cal_data); esp_phy_rf_init(init_data, PHY_RF_CAL_FULL, cal_data);
#endif #endif
free(cal_data); // PHY maintains a copy of calibration data, so we can free this free(cal_data); // PHY maintains a copy of calibration data, so we can free this