feat(cactus): use security state attribute
Cactus uses security attribute from memory transaction
descriptor in the shared memory related tests.
Change-Id: I7c4f3ef2c72e36236d23e5a061e27a2ea60fa2d6
Signed-off-by: J-Alves <joao.alves@arm.com>
diff --git a/include/runtime_services/cactus_test_cmds.h b/include/runtime_services/cactus_test_cmds.h
index 9dc0d90..a12a588 100644
--- a/include/runtime_services/cactus_test_cmds.h
+++ b/include/runtime_services/cactus_test_cmds.h
@@ -201,15 +201,10 @@
static inline struct ffa_value cactus_mem_send_cmd(
ffa_id_t source, ffa_id_t dest, uint32_t mem_func,
ffa_memory_handle_t handle, ffa_memory_region_flags_t retrieve_flags,
- bool non_secure, uint16_t word_to_write)
+ uint16_t word_to_write)
{
- /*
- * `non_secure` and `word_to_write` are packed in the same register.
- * Packed in a 32-bit value to support AArch32 platforms (eg Juno).
- */
- uint32_t val3 = ((uint32_t)non_secure << 16) | word_to_write;
return cactus_send_cmd(source, dest, CACTUS_MEM_SEND_CMD, mem_func,
- handle, retrieve_flags, val3);
+ handle, retrieve_flags, word_to_write);
}
static inline ffa_memory_handle_t cactus_mem_send_get_handle(
@@ -229,11 +224,6 @@
return (uint16_t)ret.arg7;
}
-static inline bool cactus_mem_send_get_non_secure(struct ffa_value ret)
-{
- return (bool)(ret.arg7 >> 16);
-}
-
/**
* Command to request a memory management operation. The 'mem_func' argument
* identifies the operation that is to be performend, and 'receiver' is the id