diff options
author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2019-03-21 13:49:23 +0000 |
---|---|---|
committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2019-03-21 13:54:52 +0000 |
commit | 81d507ef3c46760d1a67460eaeaac20cb50ee48c (patch) | |
tree | 18af1e706cd8af726df6a9ca964ba106dd0d132d | |
parent | f2218e7b6a4f8c2c3d6db00703caad95f5e5b157 (diff) | |
download | tf-a-tests-81d507ef3c46760d1a67460eaeaac20cb50ee48c.tar.gz |
SPM-MM: Fix call preemption test
The timer was being set up for 1 ms rather than 1 second.
Change-Id: I16d6ea69d42abf28dc9591e97d6bfb302d5f8127
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
-rw-r--r-- | spm/cactus_mm/cactus_mm.mk | 1 | ||||
-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 | 2 |
4 files changed, 3 insertions, 6 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_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..79f67b934 100644 --- a/tftf/tests/tests-spm-mm.xml +++ b/tftf/tests/tests-spm-mm.xml @@ -10,10 +10,8 @@ <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. |