StandaloneMmPkg: build for 32bit arm machines

This change allows to build StandaloneMmPkg components for 32bit Arm
StandaloneMm firmware.

This change mainly moves AArch64/ source files to Arm/ side directory
for several components:  StandaloneMmCpu, StandaloneMmCoreEntryPoint
and StandaloneMmMemLib. The source file is built for both 32b and 64b
Arm targets.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>

4 files changed, 17 insertions, 17 deletions

diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/CreateHobList.c b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHobList.c
index 4d4cf3d5ff..85f8194687 100644
--- a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/CreateHobList.c
+++ b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHobList.c
@@ -14,7 +14,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Guid/MmramMemoryReserve.h>

 #include <Guid/MpInformation.h>

 

-#include <Library/AArch64/StandaloneMmCoreEntryPoint.h>

+#include <Library/Arm/StandaloneMmCoreEntryPoint.h>

 #include <Library/ArmMmuLib.h>

 #include <Library/ArmSvcLib.h>

 #include <Library/DebugLib.h>

diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/SetPermissions.c b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPermissions.c
index 4a380df4a6..cd4b90823e 100644
--- a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/SetPermissions.c
+++ b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPermissions.c
@@ -14,7 +14,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Guid/MmramMemoryReserve.h>

 #include <Guid/MpInformation.h>

 

-#include <Library/AArch64/StandaloneMmCoreEntryPoint.h>

+#include <Library/Arm/StandaloneMmCoreEntryPoint.h>

 #include <Library/ArmMmuLib.h>

 #include <Library/ArmSvcLib.h>

 #include <Library/DebugLib.h>

diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/StandaloneMmCoreEntryPoint.c
index b445d6942e..49cf51a789 100644
--- a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c
+++ b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/StandaloneMmCoreEntryPoint.c
@@ -10,7 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 

 #include <PiMm.h>

 

-#include <Library/AArch64/StandaloneMmCoreEntryPoint.h>

+#include <Library/Arm/StandaloneMmCoreEntryPoint.h>

 

 #include <PiPei.h>

 #include <Guid/MmramMemoryReserve.h>

@@ -182,13 +182,13 @@ DelegatedEventLoop (
     }

 

     if (FfaEnabled) {

-      EventCompleteSvcArgs->Arg0 = ARM_SVC_ID_FFA_MSG_SEND_DIRECT_RESP_AARCH64;

+      EventCompleteSvcArgs->Arg0 = ARM_SVC_ID_FFA_MSG_SEND_DIRECT_RESP;

       EventCompleteSvcArgs->Arg1 = 0;

       EventCompleteSvcArgs->Arg2 = 0;

-      EventCompleteSvcArgs->Arg3 = ARM_SVC_ID_SP_EVENT_COMPLETE_AARCH64;

+      EventCompleteSvcArgs->Arg3 = ARM_SVC_ID_SP_EVENT_COMPLETE;

       EventCompleteSvcArgs->Arg4 = SvcStatus;

     } else {

-      EventCompleteSvcArgs->Arg0 = ARM_SVC_ID_SP_EVENT_COMPLETE_AARCH64;

+      EventCompleteSvcArgs->Arg0 = ARM_SVC_ID_SP_EVENT_COMPLETE;

       EventCompleteSvcArgs->Arg1 = SvcStatus;

     }

   }

@@ -273,13 +273,13 @@ InitArmSvcArgs (
   )

 {

   if (FeaturePcdGet (PcdFfaEnable)) {

-    InitMmFoundationSvcArgs->Arg0 = ARM_SVC_ID_FFA_MSG_SEND_DIRECT_RESP_AARCH64;

+    InitMmFoundationSvcArgs->Arg0 = ARM_SVC_ID_FFA_MSG_SEND_DIRECT_RESP;

     InitMmFoundationSvcArgs->Arg1 = 0;

     InitMmFoundationSvcArgs->Arg2 = 0;

-    InitMmFoundationSvcArgs->Arg3 = ARM_SVC_ID_SP_EVENT_COMPLETE_AARCH64;

+    InitMmFoundationSvcArgs->Arg3 = ARM_SVC_ID_SP_EVENT_COMPLETE;

     InitMmFoundationSvcArgs->Arg4 = *Ret;

   } else {

-    InitMmFoundationSvcArgs->Arg0 = ARM_SVC_ID_SP_EVENT_COMPLETE_AARCH64;

+    InitMmFoundationSvcArgs->Arg0 = ARM_SVC_ID_SP_EVENT_COMPLETE;

     InitMmFoundationSvcArgs->Arg1 = *Ret;

   }

 }

@@ -395,7 +395,7 @@ _ModuleEntryPoint (
   //

   ProcessModuleEntryPointList (HobStart);

 

-  DEBUG ((DEBUG_INFO, "Shared Cpu Driver EP 0x%lx\n", (UINT64) CpuDriverEntryPoint));

+  DEBUG ((DEBUG_INFO, "Shared Cpu Driver EP %p\n", (VOID *) CpuDriverEntryPoint));

 

 finish:

   if (Status == RETURN_UNSUPPORTED) {

diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf
index 4fa426f58e..1762586cfa 100644
--- a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf
+++ b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf
@@ -21,10 +21,10 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)

 #

 

-[Sources.AARCH64]

-  AArch64/StandaloneMmCoreEntryPoint.c

-  AArch64/SetPermissions.c

-  AArch64/CreateHobList.c

+[Sources.AARCH64, Sources.ARM]

+  Arm/StandaloneMmCoreEntryPoint.c

+  Arm/SetPermissions.c

+  Arm/CreateHobList.c

 

 [Sources.X64]

   X64/StandaloneMmCoreEntryPoint.c

@@ -34,14 +34,14 @@
   MdeModulePkg/MdeModulePkg.dec

   StandaloneMmPkg/StandaloneMmPkg.dec

 

-[Packages.AARCH64]

+[Packages.ARM, Packages.AARCH64]

   ArmPkg/ArmPkg.dec

 

 [LibraryClasses]

   BaseLib

   DebugLib

 

-[LibraryClasses.AARCH64]

+[LibraryClasses.ARM, LibraryClasses.AARCH64]

   StandaloneMmMmuLib

   ArmSvcLib

 

@@ -51,7 +51,7 @@
   gEfiStandaloneMmNonSecureBufferGuid

   gEfiArmTfCpuDriverEpDescriptorGuid

 

-[FeaturePcd.AARCH64]

+[FeaturePcd.ARM, FeaturePcd.AARCH64]

   gArmTokenSpaceGuid.PcdFfaEnable

 

 [BuildOptions]