diff options
| author | J-Alves <joao.alves@arm.com> | 2023-05-05 14:36:09 +0100 |
|---|---|---|
| committer | J-Alves <joao.alves@arm.com> | 2023-10-13 14:08:49 +0100 |
| commit | 5e07e7eb18d5b21e1e356b1d040fc9008b8ad221 (patch) | |
| tree | 2340fad9f8c4ec95fc92dd649b1896f70241ffba /spm | |
| parent | d13d760570e9d0f640e8bd83bcfbc21240949156 (diff) | |
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>
Diffstat (limited to 'spm')
| -rw-r--r-- | spm/cactus/cactus_tests/cactus_test_memory_sharing.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spm/cactus/cactus_tests/cactus_test_memory_sharing.c b/spm/cactus/cactus_tests/cactus_test_memory_sharing.c index d9467b4..15ab0f1 100644 --- a/spm/cactus/cactus_tests/cactus_test_memory_sharing.c +++ b/spm/cactus/cactus_tests/cactus_test_memory_sharing.c @@ -80,7 +80,6 @@ CACTUS_CMD_HANDLER(mem_send_cmd, CACTUS_MEM_SEND_CMD) ffa_memory_region_flags_t retrv_flags = cactus_mem_send_get_retrv_flags(*args); uint32_t words_to_write = cactus_mem_send_words_to_write(*args); - bool non_secure = cactus_mem_send_get_non_secure(*args); expect(memory_retrieve(mb, &m, handle, source, vm_id, retrv_flags, mem_func), true); @@ -101,7 +100,8 @@ CACTUS_CMD_HANDLER(mem_send_cmd, CACTUS_MEM_SEND_CMD) mem_attrs = MT_RW_DATA | MT_EXECUTE_NEVER; - if (non_secure) { + if (ffa_get_memory_security_attr(m->attributes) == + FFA_MEMORY_SECURITY_NON_SECURE) { mem_attrs |= MT_NS; } @@ -237,7 +237,7 @@ CACTUS_CMD_HANDLER(req_mem_send_cmd, CACTUS_REQ_MEM_SEND_CMD) } ffa_ret = cactus_mem_send_cmd(vm_id, receiver, mem_func, handle, - 0, non_secure, 10); + 0, 10); if (!is_ffa_direct_response(ffa_ret)) { return cactus_error_resp(vm_id, source, CACTUS_ERROR_FFA_CALL); |