Merge changes I6f4cfd33,Ie54cfdf4
* changes:
test(tftf): test Secure interrupt can preempt Realm EL1
refact(twdog): move trusted wdog API to spm_common
diff --git a/spm/cactus/plat/arm/fvp/fdts/cactus-tertiary.dts b/spm/cactus/plat/arm/fvp/fdts/cactus-tertiary.dts
index a5b0062..a9d5e50 100644
--- a/spm/cactus/plat/arm/fvp/fdts/cactus-tertiary.dts
+++ b/spm/cactus/plat/arm/fvp/fdts/cactus-tertiary.dts
@@ -48,7 +48,7 @@
description = "NS share memory";
pages-count = <1>;
base-address = <0x00008800 0x80001000>;
- attributes = <0x83>; /* NS / read-write */
+ attributes = <0xb>; /* NS / read-write */
};
};
};
diff --git a/tftf/tests/runtime_services/secure_service/test_ffa_memory_sharing.c b/tftf/tests/runtime_services/secure_service/test_ffa_memory_sharing.c
index 9309eba..ea33587 100644
--- a/tftf/tests/runtime_services/secure_service/test_ffa_memory_sharing.c
+++ b/tftf/tests/runtime_services/secure_service/test_ffa_memory_sharing.c
@@ -81,6 +81,8 @@
const uint32_t constituents_count = sizeof(constituents) /
sizeof(struct ffa_memory_region_constituent);
+ VERBOSE("TFTF - Address: %p\n", constituents[0].address);
+
handle = memory_init_and_send((struct ffa_memory_region *)mb.send,
MAILBOX_SIZE, SENDER, RECEIVER,
constituents, constituents_count,
@@ -90,8 +92,7 @@
return TEST_RESULT_FAIL;
}
- VERBOSE("TFTF - Handle: %llx\nTFTF - Address: %p\n",
- handle, constituents[0].address);
+ VERBOSE("TFTF - Handle: %llx\n", handle);
ptr = (uint32_t *)constituents[0].address;