Merge branch 'fix/fix_xip_psram_ptr_check_v5.4' into 'release/v5.4'

psram: fixed psram ptr check issue under xip_psram condition for ESP32P4 (v5.4)

See merge request espressif/esp-idf!39733
This commit is contained in:
morris
2025-06-30 10:29:38 +08:00
7 changed files with 53 additions and 38 deletions
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2020-2023 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2020-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -140,6 +140,18 @@ TEST_CASE("test spi1 flash operation after putting .text and .rodata into psram"
TEST_ESP_OK(gptimer_disable(gptimer));
TEST_ESP_OK(gptimer_del_timer(gptimer));
}
TEST_CASE("test esp_psram_check_ptr_addr with xip rodata and instruction region", "[psram]")
{
bool on_psram = false;
on_psram = esp_psram_check_ptr_addr(s_get_partition);
TEST_ASSERT(on_psram);
on_psram = esp_psram_check_ptr_addr(s_test_buf);
TEST_ASSERT(on_psram);
}
#endif //CONFIG_SPIRAM_FETCH_INSTRUCTIONS && CONFIG_SPIRAM_RODATA
TEST_CASE("test psram unaligned access", "[psram]")