diff options
author | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2019-03-21 15:54:38 +0000 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-03-21 15:54:38 +0000 |
commit | 3b725db7bb951cb43e9119fbd96cf60eb2e23a92 (patch) | |
tree | 98bd1da412d0a9d2845987c763565941b7de2384 | |
parent | b4ddca80b1b20bf2f1870e9623b18e5c11139847 (diff) | |
parent | eb1a41684e7cfd40beeff12a518a5e7c23d9c8c7 (diff) | |
download | tf-a-tests-2.1-rc1.tar.gz |
Merge changes from topic "an/fix-spm-mm"v2.1-rc1
* changes:
SPM-MM: Re-enable disabled tests
SPM-MM: Fix call preemption test
-rw-r--r-- | spm/cactus_mm/cactus_mm.mk | 1 | ||||
-rw-r--r-- | spm/cactus_mm/cactus_mm_main.c | 5 | ||||
-rw-r--r-- | spm/cactus_mm/cactus_mm_service_loop.c | 4 | ||||
-rw-r--r-- | tftf/tests/runtime_services/mm_service/test_secure_service_interrupts.c | 2 | ||||
-rw-r--r-- | tftf/tests/tests-spm-mm.xml | 4 |
5 files changed, 4 insertions, 12 deletions
diff --git a/spm/cactus_mm/cactus_mm.mk b/spm/cactus_mm/cactus_mm.mk index f00d0399f..cd799c190 100644 --- a/spm/cactus_mm/cactus_mm.mk +++ b/spm/cactus_mm/cactus_mm.mk @@ -41,7 +41,6 @@ CACTUS_MM_SOURCES += \ drivers/arm/pl011/${ARCH}/pl011_console.S \ lib/${ARCH}/cache_helpers.S \ lib/${ARCH}/misc_helpers.S \ - ${STDLIB_SOURCES} CACTUS_MM_LINKERFILE := spm/cactus_mm/cactus_mm.ld.S diff --git a/spm/cactus_mm/cactus_mm_main.c b/spm/cactus_mm/cactus_mm_main.c index 8452e656f..bd64cccd0 100644 --- a/spm/cactus_mm/cactus_mm_main.c +++ b/spm/cactus_mm/cactus_mm_main.c @@ -114,10 +114,7 @@ void __dead2 cactus_main(void *el3_el0_buffer, size_t el3_el0_buffer_size) */ misc_tests(); system_setup_tests(); - /* - * TODO: The following tests fail in the CI: - * mem_attr_changes_tests(boot_info); - */ + mem_attr_changes_tests(boot_info); /* * Handle secure service requests. diff --git a/spm/cactus_mm/cactus_mm_service_loop.c b/spm/cactus_mm/cactus_mm_service_loop.c index 0ad60b62b..dbec190e6 100644 --- a/spm/cactus_mm/cactus_mm_service_loop.c +++ b/spm/cactus_mm/cactus_mm_service_loop.c @@ -43,8 +43,8 @@ static int32_t cactus_handle_fast_request(int cc, sps->data_size); return SPM_INVALID_PARAMETER; } - int duration_sec = sps->data[0]; - sp_sleep(duration_sec); + uint32_t duration_sec = sps->data[0]; + sp_sleep(duration_sec * 1000); /* * Write back to the communication buffer to acknowledge the diff --git a/tftf/tests/runtime_services/mm_service/test_secure_service_interrupts.c b/tftf/tests/runtime_services/mm_service/test_secure_service_interrupts.c index 50c3df670..81268bc71 100644 --- a/tftf/tests/runtime_services/mm_service/test_secure_service_interrupts.c +++ b/tftf/tests/runtime_services/mm_service/test_secure_service_interrupts.c @@ -83,7 +83,7 @@ test_result_t test_secure_partition_interrupt_by_ns(void) INFO("Sending MM_COMMUNICATE_AARCH64 to Cactus\n"); - uint8_t timer_delay = 1; + uint8_t timer_delay = 1; /* 1 s */ sps_request = create_sps_request(SPS_TIMER_SLEEP, &timer_delay, sizeof(timer_delay)); smc_args mm_communicate_smc = { diff --git a/tftf/tests/tests-spm-mm.xml b/tftf/tests/tests-spm-mm.xml index fc7d98e15..3447385b7 100644 --- a/tftf/tests/tests-spm-mm.xml +++ b/tftf/tests/tests-spm-mm.xml @@ -10,16 +10,12 @@ <testsuite name="SPM tests" description="Test SPM APIs"> -<!-- TODO: This test fails in the CI. <testcase name="SPM NS interrupts test" function="test_secure_partition_interrupt_by_ns" /> ---> <testcase name="SPM secondary CPUs sequential test" function="test_secure_partition_secondary_cores_seq" /> -<!-- TODO: This test fails in the CI. <testcase name="SPM secondary CPUs simultaneous test" function="test_secure_partition_secondary_cores_sim" /> ---> </testsuite> </testsuites> |