ArmPkg: Update SMC calls to use the new ArmCallSmc0/1/2/3 functions

New SMC helper functions have been added to reduce the amount of
template code. Update ArmSmcPsciResetSystemLib and
Smbios/ProcessorSubClassDxe to use them.

Signed-off-by: Rebecca Cran <rebecca@nuviainc.com>
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

diff --git a/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.c b/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.c
index 6688fca37a8bc9b86d18384640c8f68f759397fc..af6738459e43d690583df4602322ed64f5a45804 100644 (file)
--- a/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.c
+++ b/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.c
@@ -31,11 +31,8 @@ ResetCold (
   VOID\r
   )\r
 {\r
-  ARM_SMC_ARGS  ArmSmcArgs;\r
-\r
   // Send a PSCI 0.2 SYSTEM_RESET command\r
-  ArmSmcArgs.Arg0 = ARM_SMC_ID_PSCI_SYSTEM_RESET;\r
-  ArmCallSmc (&ArmSmcArgs);\r
+  ArmCallSmc0 (ARM_SMC_ID_PSCI_SYSTEM_RESET, NULL, NULL, NULL);\r
 }\r
 \r
 /**\r
@@ -66,11 +63,8 @@ ResetShutdown (
   VOID\r
   )\r
 {\r
-  ARM_SMC_ARGS  ArmSmcArgs;\r
-\r
   // Send a PSCI 0.2 SYSTEM_OFF command\r
-  ArmSmcArgs.Arg0 = ARM_SMC_ID_PSCI_SYSTEM_OFF;\r
-  ArmCallSmc (&ArmSmcArgs);\r
+  ArmCallSmc0 (ARM_SMC_ID_PSCI_SYSTEM_OFF, NULL, NULL, NULL);\r
 }\r
 \r
 /**\r

diff --git a/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArmCommon.c b/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArmCommon.c
index 7a8c3ca56784b49b766b1e581829ca165a65f7c5..e0010a40e489ea8c35f4aa574fdd85fddbcd61dc 100644 (file)
--- a/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArmCommon.c
+++ b/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArmCommon.c
@@ -88,22 +88,18 @@ HasSmcArm64SocId (
   VOID\r
   )\r
 {\r
-  ARM_SMC_ARGS  Args;\r
-  INT32         SmcCallStatus;\r
-  BOOLEAN       Arm64SocIdSupported;\r
+  INT32    SmcCallStatus;\r
+  BOOLEAN  Arm64SocIdSupported;\r
+  UINTN    SmcParam;\r
 \r
   Arm64SocIdSupported = FALSE;\r
 \r
-  Args.Arg0 = SMCCC_VERSION;\r
-  ArmCallSmc (&Args);\r
-  SmcCallStatus = (INT32)Args.Arg0;\r
+  SmcCallStatus = ArmCallSmc0 (SMCCC_VERSION, NULL, NULL, NULL);\r
 \r
   if ((SmcCallStatus < 0) || ((SmcCallStatus >> 16) >= 1)) {\r
-    Args.Arg0 = SMCCC_ARCH_FEATURES;\r
-    Args.Arg1 = SMCCC_ARCH_SOC_ID;\r
-    ArmCallSmc (&Args);\r
-\r
-    if (Args.Arg0 >= 0) {\r
+    SmcParam      = SMCCC_ARCH_SOC_ID;\r
+    SmcCallStatus = ArmCallSmc1 (SMCCC_ARCH_FEATURES, &SmcParam, NULL, NULL);\r
+    if (SmcCallStatus >= 0) {\r
       Arm64SocIdSupported = TRUE;\r
     }\r
   }\r
@@ -125,30 +121,26 @@ SmbiosGetSmcArm64SocId (
   OUT INT32  *SocRevision\r
   )\r
 {\r
-  ARM_SMC_ARGS  Args;\r
-  INT32         SmcCallStatus;\r
-  EFI_STATUS    Status;\r
+  INT32       SmcCallStatus;\r
+  EFI_STATUS  Status;\r
+  UINTN       SmcParam;\r
 \r
   Status = EFI_SUCCESS;\r
 \r
-  Args.Arg0 = SMCCC_ARCH_SOC_ID;\r
-  Args.Arg1 = 0;\r
-  ArmCallSmc (&Args);\r
-  SmcCallStatus = (INT32)Args.Arg0;\r
+  SmcParam      = 0;\r
+  SmcCallStatus = ArmCallSmc1 (SMCCC_ARCH_SOC_ID, &SmcParam, NULL, NULL);\r
 \r
   if (SmcCallStatus >= 0) {\r
-    *Jep106Code = (INT32)Args.Arg0;\r
+    *Jep106Code = (INT32)SmcParam;\r
   } else {\r
     Status = EFI_UNSUPPORTED;\r
   }\r
 \r
-  Args.Arg0 = SMCCC_ARCH_SOC_ID;\r
-  Args.Arg1 = 1;\r
-  ArmCallSmc (&Args);\r
-  SmcCallStatus = (INT32)Args.Arg0;\r
+  SmcParam      = 1;\r
+  SmcCallStatus = ArmCallSmc1 (SMCCC_ARCH_SOC_ID, &SmcParam, NULL, NULL);\r
 \r
   if (SmcCallStatus >= 0) {\r
-    *SocRevision = (INT32)Args.Arg0;\r
+    *SocRevision = (INT32)SmcParam;\r
   } else {\r
     Status = EFI_UNSUPPORTED;\r
   }\r