From 024b040300d07414346eedf8e2f5a9ebf07ab9c2 Mon Sep 17 00:00:00 2001 From: Mahavir Jain Date: Thu, 11 Apr 2024 13:41:17 +0530 Subject: [PATCH] test(memprot): enable memory protection tests for P4 --- components/soc/esp32p4/include/soc/soc.h | 3 +++ tools/test_apps/system/panic/pytest_panic.py | 23 +++++++++++-------- .../system/panic/sdkconfig.ci.memprot_esp32p4 | 8 +++++++ 3 files changed, 24 insertions(+), 10 deletions(-) create mode 100644 tools/test_apps/system/panic/sdkconfig.ci.memprot_esp32p4 diff --git a/components/soc/esp32p4/include/soc/soc.h b/components/soc/esp32p4/include/soc/soc.h index a6653173c9..a54594832e 100644 --- a/components/soc/esp32p4/include/soc/soc.h +++ b/components/soc/esp32p4/include/soc/soc.h @@ -189,6 +189,9 @@ #define SOC_DIRAM_DRAM_HIGH 0x4ffc0000 #define SOC_DIRAM_ROM_RESERVE_HIGH 0x4ff40000 +#define MAP_DRAM_TO_IRAM(addr) (addr) +#define MAP_IRAM_TO_DRAM(addr) (addr) + // Region of memory accessible via DMA. See esp_ptr_dma_capable(). #define SOC_DMA_LOW 0x4ff00000 #define SOC_DMA_HIGH 0x4ffc0000 diff --git a/tools/test_apps/system/panic/pytest_panic.py b/tools/test_apps/system/panic/pytest_panic.py index 6898ede25d..b0b48da20c 100644 --- a/tools/test_apps/system/panic/pytest_panic.py +++ b/tools/test_apps/system/panic/pytest_panic.py @@ -552,7 +552,8 @@ CONFIGS_MEMPROT_IDRAM = [ pytest.param('memprot_esp32c3', marks=[pytest.mark.esp32c3]), pytest.param('memprot_esp32c2', marks=[pytest.mark.esp32c2]), pytest.param('memprot_esp32c6', marks=[pytest.mark.esp32c6]), - pytest.param('memprot_esp32h2', marks=[pytest.mark.esp32h2]) + pytest.param('memprot_esp32h2', marks=[pytest.mark.esp32h2]), + pytest.param('memprot_esp32p4', marks=[pytest.mark.esp32p4]) ] CONFIGS_MEMPROT_DCACHE = [ @@ -563,7 +564,8 @@ CONFIGS_MEMPROT_RTC_FAST_MEM = [ pytest.param('memprot_esp32s2', marks=[pytest.mark.esp32s2]), pytest.param('memprot_esp32c3', marks=[pytest.mark.esp32c3]), pytest.param('memprot_esp32c6', marks=[pytest.mark.esp32c6]), - pytest.param('memprot_esp32h2', marks=[pytest.mark.esp32h2]) + pytest.param('memprot_esp32h2', marks=[pytest.mark.esp32h2]), + pytest.param('memprot_esp32p4', marks=[pytest.mark.esp32p4]) ] CONFIGS_MEMPROT_RTC_SLOW_MEM = [ @@ -572,7 +574,8 @@ CONFIGS_MEMPROT_RTC_SLOW_MEM = [ CONFIGS_MEMPROT_FLASH_IDROM = [ pytest.param('memprot_esp32c6', marks=[pytest.mark.esp32c6]), - pytest.param('memprot_esp32h2', marks=[pytest.mark.esp32h2]) + pytest.param('memprot_esp32h2', marks=[pytest.mark.esp32h2]), + pytest.param('memprot_esp32p4', marks=[pytest.mark.esp32p4]) ] @@ -609,7 +612,7 @@ def test_iram_reg1_write_violation(dut: PanicTestDut, test_func_name: str) -> No dut.expect_backtrace() elif dut.target == 'esp32c3': dut.expect_exact(r'Test error: Test function has returned') - elif dut.target in ['esp32c2', 'esp32c6', 'esp32h2']: + elif dut.target in ['esp32c2', 'esp32c6', 'esp32h2', 'esp32p4']: dut.expect_gme('Store access fault') dut.expect_reg_dump(0) dut.expect_stack_dump() @@ -634,7 +637,7 @@ def test_iram_reg2_write_violation(dut: PanicTestDut, test_func_name: str) -> No dut.expect(r' operation type: (\S+)') dut.expect_reg_dump(0) dut.expect_stack_dump() - elif dut.target in ['esp32c2', 'esp32c6', 'esp32h2']: + elif dut.target in ['esp32c2', 'esp32c6', 'esp32h2', 'esp32p4']: dut.expect_gme('Store access fault') dut.expect_reg_dump(0) dut.expect_stack_dump() @@ -659,7 +662,7 @@ def test_iram_reg3_write_violation(dut: PanicTestDut, test_func_name: str) -> No dut.expect(r' operation type: (\S+)') dut.expect_reg_dump(0) dut.expect_stack_dump() - elif dut.target in ['esp32c2', 'esp32c6', 'esp32h2']: + elif dut.target in ['esp32c2', 'esp32c6', 'esp32h2', 'esp32p4']: dut.expect_gme('Store access fault') dut.expect_reg_dump(0) dut.expect_stack_dump() @@ -706,7 +709,7 @@ def test_dram_reg1_execute_violation(dut: PanicTestDut, test_func_name: str) -> dut.expect(r'Unknown operation at address [0-9xa-f]+ not permitted \((\S+)\)') dut.expect_reg_dump(0) dut.expect_corrupted_backtrace() - elif dut.target in ['esp32c3', 'esp32c2', 'esp32c6', 'esp32h2']: + elif dut.target in ['esp32c3', 'esp32c2', 'esp32c6', 'esp32h2', 'esp32p4']: dut.expect_gme('Instruction access fault') dut.expect_reg_dump(0) dut.expect_stack_dump() @@ -725,7 +728,7 @@ def test_dram_reg2_execute_violation(dut: PanicTestDut, test_func_name: str) -> dut.expect_gme('InstructionFetchError') dut.expect_reg_dump(0) dut.expect_corrupted_backtrace() - elif dut.target in ['esp32c3', 'esp32c2', 'esp32c6', 'esp32h2']: + elif dut.target in ['esp32c3', 'esp32c2', 'esp32c6', 'esp32h2', 'esp32p4']: dut.expect_gme('Instruction access fault') dut.expect_reg_dump(0) dut.expect_stack_dump() @@ -743,7 +746,7 @@ def test_rtc_fast_reg1_execute_violation(dut: PanicTestDut, test_func_name: str) @pytest.mark.parametrize('config', CONFIGS_MEMPROT_RTC_FAST_MEM, indirect=True) @pytest.mark.generic -@pytest.mark.skipif('config.getvalue("target") in ["esp32c6", "esp32h2"]', reason='Not a violation condition because it does not have PMS peripheral') +@pytest.mark.skipif('config.getvalue("target") in ["esp32c6", "esp32h2", "esp32p4"]', reason='Not a violation condition, no PMS peripheral case') def test_rtc_fast_reg2_execute_violation(dut: PanicTestDut, test_func_name: str) -> None: dut.run_test_func(test_func_name) dut.expect_gme('Memory protection fault') @@ -781,7 +784,7 @@ def test_rtc_fast_reg3_execute_violation(dut: PanicTestDut, test_func_name: str) dut.expect(r' operation type: (\S+)') dut.expect_reg_dump(0) dut.expect_stack_dump() - elif dut.target in ['esp32c6', 'esp32h2']: + elif dut.target in ['esp32c6', 'esp32h2', 'esp32p4']: dut.expect_gme('Instruction access fault') dut.expect_reg_dump(0) dut.expect_stack_dump() diff --git a/tools/test_apps/system/panic/sdkconfig.ci.memprot_esp32p4 b/tools/test_apps/system/panic/sdkconfig.ci.memprot_esp32p4 new file mode 100644 index 0000000000..bfe815e677 --- /dev/null +++ b/tools/test_apps/system/panic/sdkconfig.ci.memprot_esp32p4 @@ -0,0 +1,8 @@ +# Restricting to ESP32P4 +CONFIG_IDF_TARGET="esp32p4" + +# Enabling memory protection +CONFIG_ESP_SYSTEM_PMP_IDRAM_SPLIT=y + +# Enable memprot test +CONFIG_TEST_MEMPROT=y