efi_loader: Rename and correct values for ARM_SMC_MM_*

Instead of adding the definition for the specific MM SVC used in
StandAloneMM we added the one used in the standard SMC calls.
So change the value from -4 to -5 to match the correct one defined in
EDK2 and rename them to avoid future confusion

Fixes 23a397d2e2fb: ("efi_loader: Add headers for EDK2 StandAloneMM communication")
Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>

diff --git a/include/mm_communication.h b/include/mm_communication.h
index f9c05bb7f104cfa1ef36c597b448bfb971517102..e464cbb48e22d2f2704d2124de8e790d6dfb35cc 100644 (file)
--- a/include/mm_communication.h
+++ b/include/mm_communication.h
@@ -52,14 +52,14 @@ struct efi_mm_communicate_header {
 #define MM_COMMUNICATE_HEADER_SIZE \
        (sizeof(struct efi_mm_communicate_header))
 
-/* Defined in EDK2 ArmPkg/Include/IndustryStandard/ArmStdSmc.h */
-
-/* MM return error codes */
-#define ARM_SMC_MM_RET_SUCCESS              0
-#define ARM_SMC_MM_RET_NOT_SUPPORTED       -1
-#define ARM_SMC_MM_RET_INVALID_PARAMS      -2
-#define ARM_SMC_MM_RET_DENIED              -3
-#define ARM_SMC_MM_RET_NO_MEMORY           -4
+/* Defined in EDK2 ArmPkg/Include/IndustryStandard/ArmMmSvc.h */
+
+/* SPM return error codes */
+#define ARM_SVC_SPM_RET_SUCCESS               0
+#define ARM_SVC_SPM_RET_NOT_SUPPORTED        -1
+#define ARM_SVC_SPM_RET_INVALID_PARAMS       -2
+#define ARM_SVC_SPM_RET_DENIED               -3
+#define ARM_SVC_SPM_RET_NO_MEMORY            -5
 
 /* Defined in EDK2 MdeModulePkg/Include/Guid/SmmVariableCommon.h */
 

diff --git a/lib/efi_loader/efi_variable_tee.c b/lib/efi_loader/efi_variable_tee.c
index c0423489388a3acda86e8e01e9078a17fad8cddf..5f4aae60bf23f53b09cb0d9214993774f4cff19e 100644 (file)
--- a/lib/efi_loader/efi_variable_tee.c
+++ b/lib/efi_loader/efi_variable_tee.c
@@ -106,19 +106,19 @@ static efi_status_t optee_mm_communicate(void *comm_buf, ulong dsize)
        tee_close_session(conn.tee, conn.session);
 
        switch (param[1].u.value.a) {
-       case ARM_SMC_MM_RET_SUCCESS:
+       case ARM_SVC_SPM_RET_SUCCESS:
                ret = EFI_SUCCESS;
                break;
 
-       case ARM_SMC_MM_RET_INVALID_PARAMS:
+       case ARM_SVC_SPM_RET_INVALID_PARAMS:
                ret = EFI_INVALID_PARAMETER;
                break;
 
-       case ARM_SMC_MM_RET_DENIED:
+       case ARM_SVC_SPM_RET_DENIED:
                ret = EFI_ACCESS_DENIED;
                break;
 
-       case ARM_SMC_MM_RET_NO_MEMORY:
+       case ARM_SVC_SPM_RET_NO_MEMORY:
                ret = EFI_OUT_OF_RESOURCES;
                break;