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: Sandrine Bailleux <sandrine.bailleux@arm.com>

diff --git a/include/services/spm_svc.h b/include/services/spm_svc.h
index 30e760baf2845d9cc2e5cb63881157ac0be64118..738979eb277fe37456f9452af60077981726f08a 100644 (file)
--- a/include/services/spm_svc.h
+++ b/include/services/spm_svc.h
@@ -59,8 +59,8 @@
 #define SP_VERSION_AARCH64             U(0xC4000040)
 #define SP_VERSION_AARCH32             U(0x84000040)
 
-#define SP_COMMUNICATE_AARCH64         U(0xC4000041)
-#define SP_COMMUNICATE_AARCH32         U(0x84000041)
+#define MM_COMMUNICATE_AARCH64         U(0xC4000041)
+#define MM_COMMUNICATE_AARCH32         U(0x84000041)
 
 /* SPM error codes. */
 #define SPM_SUCCESS            0

diff --git a/services/std_svc/spm/spm_main.c b/services/std_svc/spm/spm_main.c
index 01b5733c49f167328f916a13fe8efc7114df5545..00f3a30c37b3c7b9231394d45ff14e58fe1d4dc5 100644 (file)
--- a/services/std_svc/spm/spm_main.c
+++ b/services/std_svc/spm/spm_main.c
@@ -418,8 +418,8 @@ uint64_t spm_smc_handler(uint32_t smc_fid,
                case  SP_VERSION_AARCH32:
                        SMC_RET1(handle, SP_VERSION_COMPILED);
 
-               case SP_COMMUNICATE_AARCH32:
-               case SP_COMMUNICATE_AARCH64:
+               case MM_COMMUNICATE_AARCH32:
+               case MM_COMMUNICATE_AARCH64:
 
                        /* Save the Normal world context */
                        cm_el1_sysregs_context_save(NON_SECURE);
@@ -436,7 +436,7 @@ uint64_t spm_smc_handler(uint32_t smc_fid,
                        assert(x1 == 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);