Commit 756a2a0e authored by Sandrine Bailleux's avatar Sandrine Bailleux
Browse files

SPM: Rename SP_COMMUNICATE macros

Rename SP_COMMUNICATE_AARCH32/AARCH64 into MM_COMMUNICATE_AARCH32/AARCH64
to align with the MM specification [1].

[1] http://infocenter.arm.com/help/topic/com.arm.doc.den0060a/DEN0060A_ARM_MM_Interface_Specification.pdf



Change-Id: I478aa4024ace7507d14a5d366aa8e20681075b03
Signed-off-by: default avatarSandrine Bailleux <sandrine.bailleux@arm.com>
parent fa0ed2b9
...@@ -59,8 +59,8 @@ ...@@ -59,8 +59,8 @@
#define SP_VERSION_AARCH64 U(0xC4000040) #define SP_VERSION_AARCH64 U(0xC4000040)
#define SP_VERSION_AARCH32 U(0x84000040) #define SP_VERSION_AARCH32 U(0x84000040)
#define SP_COMMUNICATE_AARCH64 U(0xC4000041) #define MM_COMMUNICATE_AARCH64 U(0xC4000041)
#define SP_COMMUNICATE_AARCH32 U(0x84000041) #define MM_COMMUNICATE_AARCH32 U(0x84000041)
/* SPM error codes. */ /* SPM error codes. */
#define SPM_SUCCESS 0 #define SPM_SUCCESS 0
......
...@@ -418,8 +418,8 @@ uint64_t spm_smc_handler(uint32_t smc_fid, ...@@ -418,8 +418,8 @@ uint64_t spm_smc_handler(uint32_t smc_fid,
case SP_VERSION_AARCH32: case SP_VERSION_AARCH32:
SMC_RET1(handle, SP_VERSION_COMPILED); SMC_RET1(handle, SP_VERSION_COMPILED);
case SP_COMMUNICATE_AARCH32: case MM_COMMUNICATE_AARCH32:
case SP_COMMUNICATE_AARCH64: case MM_COMMUNICATE_AARCH64:
/* Save the Normal world context */ /* Save the Normal world context */
cm_el1_sysregs_context_save(NON_SECURE); cm_el1_sysregs_context_save(NON_SECURE);
...@@ -436,7 +436,7 @@ uint64_t spm_smc_handler(uint32_t smc_fid, ...@@ -436,7 +436,7 @@ uint64_t spm_smc_handler(uint32_t smc_fid,
assert(x1 == 0); assert(x1 == 0);
if (x3 != 0) { if (x3 != 0) {
VERBOSE("SP_COMMUNICATE_AARCH32/64: X3 is not 0 as recommended.\n"); VERBOSE("MM_COMMUNICATE_AARCH32/64: X3 is not 0 as recommended.\n");
} }
SMC_RET4(&sp_ctx.cpu_ctx, smc_fid, x1, x2, x3); SMC_RET4(&sp_ctx.cpu_ctx, smc_fid, x1, x2, x3);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment