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>
diff --git a/spm/cactus_mm/cactus_mm.mk b/spm/cactus_mm/cactus_mm.mk
index f00d039..cd799c1 100644
--- a/spm/cactus_mm/cactus_mm.mk
+++ b/spm/cactus_mm/cactus_mm.mk
@@ -41,7 +41,6 @@
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 0ad60b6..dbec190 100644
--- a/spm/cactus_mm/cactus_mm_service_loop.c
+++ b/spm/cactus_mm/cactus_mm_service_loop.c
@@ -43,8 +43,8 @@
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 50c3df6..81268bc 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 @@
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 fc7d98e..79f67b9 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.