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

fix(esp_pm): update CPU frequency immediately after updating pm_config

Browse Source 
Closes https://github.com/espressif/esp-idf/issues/13492
This commit is contained in:
wuzhenghui 2024-04-01 17:49:34 +08:00
parent f231b262b9
commit 1a676d1e77
No known key found for this signature in database
GPG Key ID: 3EFEDECDEBA39BB9
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/esp_pm/pm_impl.c
View File

@ -468,6 +468,7 @@ esp_err_t esp_pm_configure(const void* vconfig)
s_config_changed = true;
portEXIT_CRITICAL(&s_switch_lock);
do_switch(PM_MODE_CPU_MAX);
return ESP_OK;
}
@ -617,7 +618,7 @@ static void IRAM_ATTR do_switch(pm_mode_t new_mode)
#endif
portEXIT_CRITICAL_ISR(&s_switch_lock);
} while (true);
if (new_mode == s_mode) {
if ((new_mode == s_mode) && !s_config_changed) {
portEXIT_CRITICAL_ISR(&s_switch_lock);
return;
}

10
components/esp_pm/test_apps/esp_pm/main/test_pm.c
View File

@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Unlicense OR CC0-1.0
*/
@ -54,12 +54,8 @@ static void switch_freq(int mhz)
.min_freq_mhz = MIN(mhz, xtal_freq_mhz),
};
ESP_ERROR_CHECK( esp_pm_configure(&pm_config) );
printf("Waiting for frequency to be set to %d MHz...\n", mhz);
while (esp_clk_cpu_freq() / MHZ != mhz)
{
vTaskDelay(pdMS_TO_TICKS(200));
printf("Frequency is %d MHz\n", esp_clk_cpu_freq() / MHZ);
}
TEST_ASSERT_EQUAL_UINT32(mhz, esp_clk_cpu_freq() / MHZ);
printf("Frequency is %d MHz\n", esp_clk_cpu_freq() / MHZ);
}
#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6