[PATCH v4 1/5] ArmPkg/IndustryStandard: 32b/64b agnostic FF-A, Mm SVC and Std SMC IDs

[PATCH v4 1/5] ArmPkg/IndustryStandard: 32b/64b agnostic FF-A, Mm SVC and Std SMC IDs

[Etienne Carriere]

Defines ARM_SVC_ID_FFA_* and ARM_SVC_ID_SP_* identifiers for 32bit
function IDs as per SMCCC specification. Defines also generic ARM
SVC identifier macros to wrap 32bit or 64bit identifiers upon target
built architecture.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

---
Changes since v3:
- Remove Cc tags and apply review tag.

No change since v2

Changes since v1:
- Define ARM_SMC_ID_MM_COMMUNICATE 32b/64b agnostic helper ID in
  ArmStdSmc.h, as expected by few following commits in this series.
---
 ArmPkg/Include/IndustryStandard/ArmFfaSvc.h | 12 ++++++++++++
 ArmPkg/Include/IndustryStandard/ArmMmSvc.h  | 15 +++++++++++++++
 ArmPkg/Include/IndustryStandard/ArmStdSmc.h |  8 ++++++++
 3 files changed, 35 insertions(+)

diff --git a/ArmPkg/Include/IndustryStandard/ArmFfaSvc.h b/ArmPkg/Include/IndustryStandard/ArmFfaSvc.h
index 65b8343ade..ebcb54b28b 100644
--- a/ArmPkg/Include/IndustryStandard/ArmFfaSvc.h
+++ b/ArmPkg/Include/IndustryStandard/ArmFfaSvc.h
@@ -17,9 +17,21 @@
 #define ARM_FFA_SVC_H_
 
 #define ARM_SVC_ID_FFA_VERSION_AARCH32                  0x84000063
+#define ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ_AARCH32      0x8400006F
+#define ARM_SVC_ID_FFA_MSG_SEND_DIRECT_RESP_AARCH32     0x84000070
 #define ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ_AARCH64      0xC400006F
 #define ARM_SVC_ID_FFA_MSG_SEND_DIRECT_RESP_AARCH64     0xC4000070
 
+/* Generic IDs when using AArch32 or AArch64 execution state */
+#ifdef MDE_CPU_AARCH64
+#define ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ     ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ_AARCH64
+#define ARM_SVC_ID_FFA_MSG_SEND_DIRECT_RESP    ARM_SVC_ID_FFA_MSG_SEND_DIRECT_RESP_AARCH64
+#endif
+#ifdef MDE_CPU_ARM
+#define ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ     ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ_AARCH32
+#define ARM_SVC_ID_FFA_MSG_SEND_DIRECT_RESP    ARM_SVC_ID_FFA_MSG_SEND_DIRECT_RESP_AARCH32
+#endif
+
 #define SPM_MAJOR_VERSION_FFA                           1
 #define SPM_MINOR_VERSION_FFA                           0
 
diff --git a/ArmPkg/Include/IndustryStandard/ArmMmSvc.h b/ArmPkg/Include/IndustryStandard/ArmMmSvc.h
index 33d60ccf17..deb3bc99d2 100644
--- a/ArmPkg/Include/IndustryStandard/ArmMmSvc.h
+++ b/ArmPkg/Include/IndustryStandard/ArmMmSvc.h
@@ -15,10 +15,25 @@
  * privileged operations on its behalf.
  */
 #define ARM_SVC_ID_SPM_VERSION_AARCH32             0x84000060
+#define ARM_SVC_ID_SP_EVENT_COMPLETE_AARCH32       0x84000061
+#define ARM_SVC_ID_SP_GET_MEM_ATTRIBUTES_AARCH32   0x84000064
+#define ARM_SVC_ID_SP_SET_MEM_ATTRIBUTES_AARCH32   0x84000065
 #define ARM_SVC_ID_SP_EVENT_COMPLETE_AARCH64       0xC4000061
 #define ARM_SVC_ID_SP_GET_MEM_ATTRIBUTES_AARCH64   0xC4000064
 #define ARM_SVC_ID_SP_SET_MEM_ATTRIBUTES_AARCH64   0xC4000065
 
+/* Generic IDs when using AArch32 or AArch64 execution state */
+#ifdef MDE_CPU_AARCH64
+#define ARM_SVC_ID_SP_EVENT_COMPLETE               ARM_SVC_ID_SP_EVENT_COMPLETE_AARCH64
+#define ARM_SVC_ID_SP_GET_MEM_ATTRIBUTES       ARM_SVC_ID_SP_GET_MEM_ATTRIBUTES_AARCH64
+#define ARM_SVC_ID_SP_SET_MEM_ATTRIBUTES       ARM_SVC_ID_SP_SET_MEM_ATTRIBUTES_AARCH64
+#endif
+#ifdef MDE_CPU_ARM
+#define ARM_SVC_ID_SP_EVENT_COMPLETE               ARM_SVC_ID_SP_EVENT_COMPLETE_AARCH32
+#define ARM_SVC_ID_SP_GET_MEM_ATTRIBUTES       ARM_SVC_ID_SP_GET_MEM_ATTRIBUTES_AARCH32
+#define ARM_SVC_ID_SP_SET_MEM_ATTRIBUTES       ARM_SVC_ID_SP_SET_MEM_ATTRIBUTES_AARCH32
+#endif
+
 #define SET_MEM_ATTR_DATA_PERM_MASK       0x3
 #define SET_MEM_ATTR_DATA_PERM_SHIFT        0
 #define SET_MEM_ATTR_DATA_PERM_NO_ACCESS    0
diff --git a/ArmPkg/Include/IndustryStandard/ArmStdSmc.h b/ArmPkg/Include/IndustryStandard/ArmStdSmc.h
index 67afb0ea2d..9116a291da 100644
--- a/ArmPkg/Include/IndustryStandard/ArmStdSmc.h
+++ b/ArmPkg/Include/IndustryStandard/ArmStdSmc.h
@@ -49,6 +49,14 @@
 #define ARM_SMC_ID_MM_COMMUNICATE_AARCH32          0x84000041
 #define ARM_SMC_ID_MM_COMMUNICATE_AARCH64          0xC4000041
 
+/* Generic ID when using AArch32 or AArch64 execution state */
+#ifdef MDE_CPU_AARCH64
+#define ARM_SMC_ID_MM_COMMUNICATE   ARM_SMC_ID_MM_COMMUNICATE_AARCH64
+#endif
+#ifdef MDE_CPU_ARM
+#define ARM_SMC_ID_MM_COMMUNICATE   ARM_SMC_ID_MM_COMMUNICATE_AARCH32
+#endif
+
 /* MM return error codes */
 #define ARM_SMC_MM_RET_SUCCESS              0
 #define ARM_SMC_MM_RET_NOT_SUPPORTED       -1
-- 
2.17.1

[PATCH v4 2/5] ArmPkg: prepare 32bit ARM build of StandaloneMmPkg

[Etienne Carriere]

Changes in ArmPkg to prepare building StandaloneMm firmware for
32bit Arm architectures.

Adds MmCommunicationDxe driver and ArmMmuPeiLib and
ArmmmuStandaloneMmLib libraries to the list of the standard
components build for ArmPkg on when ARM architectures.

Changes path of source file AArch64/ArmMmuStandaloneMmLib.c
and compile it for both 32bit and 64bit architectures.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

---
Changes since v3:
- Remove Cc tags and apply review tag.

No change since v2
No change since v1
---
 ArmPkg/ArmPkg.dec                                                       |  2 +-
 ArmPkg/ArmPkg.dsc                                                       |  2 +-
 ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.c                     |  2 +-
 ArmPkg/Library/StandaloneMmMmuLib/{AArch64 => }/ArmMmuStandaloneMmLib.c | 15 ++++++++-------
 ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf             |  6 +++---
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec
index 214b2f5892..6ed51edd03 100644
--- a/ArmPkg/ArmPkg.dec
+++ b/ArmPkg/ArmPkg.dec
@@ -137,7 +137,7 @@
   # hardware coherency (i.e., no virtualization or cache coherent DMA)
   gArmTokenSpaceGuid.PcdNormalMemoryNonshareableOverride|FALSE|BOOLEAN|0x00000043
 
-[PcdsFeatureFlag.AARCH64]
+[PcdsFeatureFlag.AARCH64, PcdsFeatureFlag.ARM]
   ## Used to select method for requesting services from S-EL1.<BR><BR>
   #   TRUE  - Selects FF-A calls for communication between S-EL0 and SPMC.<BR>
   #   FALSE - Selects SVC calls for communication between S-EL0 and SPMC.<BR>
diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc
index 926986cf7f..4c79dadf9e 100644
--- a/ArmPkg/ArmPkg.dsc
+++ b/ArmPkg/ArmPkg.dsc
@@ -158,7 +158,7 @@
   ArmPkg/Universal/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf
   ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLibNull.inf
 
-[Components.AARCH64]
+[Components.AARCH64, Components.ARM]
   ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.inf
   ArmPkg/Library/ArmMmuLib/ArmMmuPeiLib.inf
   ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf
diff --git a/ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.c b/ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.c
index b1e3095809..4ae38a9f22 100644
--- a/ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.c
+++ b/ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.c
@@ -125,7 +125,7 @@ MmCommunication2Communicate (
   }
 
   // SMC Function ID
-  CommunicateSmcArgs.Arg0 = ARM_SMC_ID_MM_COMMUNICATE_AARCH64;
+  CommunicateSmcArgs.Arg0 = ARM_SMC_ID_MM_COMMUNICATE;
 
   // Cookie
   CommunicateSmcArgs.Arg1 = 0;
diff --git a/ArmPkg/Library/StandaloneMmMmuLib/AArch64/ArmMmuStandaloneMmLib.c b/ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.c
similarity index 92%
rename from ArmPkg/Library/StandaloneMmMmuLib/AArch64/ArmMmuStandaloneMmLib.c
rename to ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.c
index dd014beec8..20f873e680 100644
--- a/ArmPkg/Library/StandaloneMmMmuLib/AArch64/ArmMmuStandaloneMmLib.c
+++ b/ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.c
@@ -2,6 +2,7 @@
   File managing the MMU for ARMv8 architecture in S-EL0
 
   Copyright (c) 2017 - 2021, Arm Limited. All rights reserved.<BR>
+  Copyright (c) 2021, Linaro Limited
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
   @par Reference(s):
@@ -62,7 +63,7 @@ SendMemoryPermissionRequest (
     // for other Direct Request calls which are not atomic
     // We therefore check only for Direct Response by the
     // callee.
-    if (SvcArgs->Arg0 == ARM_SVC_ID_FFA_MSG_SEND_DIRECT_RESP_AARCH64) {
+    if (SvcArgs->Arg0 == ARM_SVC_ID_FFA_MSG_SEND_DIRECT_RESP) {
       // A Direct Response means FF-A success
       // Now check the payload for errors
       // The callee sends back the return value
@@ -164,13 +165,13 @@ GetMemoryPermissions (
   ZeroMem (&SvcArgs, sizeof (ARM_SVC_ARGS));
   if (FeaturePcdGet (PcdFfaEnable)) {
     // See [2], Section 10.2 FFA_MSG_SEND_DIRECT_REQ.
-    SvcArgs.Arg0 = ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ_AARCH64;
+    SvcArgs.Arg0 = ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ;
     SvcArgs.Arg1 = ARM_FFA_DESTINATION_ENDPOINT_ID;
     SvcArgs.Arg2 = 0;
-    SvcArgs.Arg3 = ARM_SVC_ID_SP_GET_MEM_ATTRIBUTES_AARCH64;
+    SvcArgs.Arg3 = ARM_SVC_ID_SP_GET_MEM_ATTRIBUTES;
     SvcArgs.Arg4 = BaseAddress;
   } else {
-    SvcArgs.Arg0 = ARM_SVC_ID_SP_GET_MEM_ATTRIBUTES_AARCH64;
+    SvcArgs.Arg0 = ARM_SVC_ID_SP_GET_MEM_ATTRIBUTES;
     SvcArgs.Arg1 = BaseAddress;
     SvcArgs.Arg2 = 0;
     SvcArgs.Arg3 = 0;
@@ -219,15 +220,15 @@ RequestMemoryPermissionChange (
   ZeroMem (&SvcArgs, sizeof (ARM_SVC_ARGS));
   if (FeaturePcdGet (PcdFfaEnable)) {
     // See [2], Section 10.2 FFA_MSG_SEND_DIRECT_REQ.
-    SvcArgs.Arg0 = ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ_AARCH64;
+    SvcArgs.Arg0 = ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ;
     SvcArgs.Arg1 = ARM_FFA_DESTINATION_ENDPOINT_ID;
     SvcArgs.Arg2 = 0;
-    SvcArgs.Arg3 = ARM_SVC_ID_SP_SET_MEM_ATTRIBUTES_AARCH64;
+    SvcArgs.Arg3 = ARM_SVC_ID_SP_SET_MEM_ATTRIBUTES;
     SvcArgs.Arg4 = BaseAddress;
     SvcArgs.Arg5 = EFI_SIZE_TO_PAGES (Length);
     SvcArgs.Arg6 = Permissions;
   } else {
-    SvcArgs.Arg0 = ARM_SVC_ID_SP_SET_MEM_ATTRIBUTES_AARCH64;
+    SvcArgs.Arg0 = ARM_SVC_ID_SP_SET_MEM_ATTRIBUTES;
     SvcArgs.Arg1 = BaseAddress;
     SvcArgs.Arg2 = EFI_SIZE_TO_PAGES (Length);
     SvcArgs.Arg3 = Permissions;
diff --git a/ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf b/ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf
index 6c71fe0023..ff20e58980 100644
--- a/ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf
+++ b/ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf
@@ -16,14 +16,14 @@
   LIBRARY_CLASS                  = StandaloneMmMmuLib
   PI_SPECIFICATION_VERSION       = 0x00010032
 
-[Sources.AARCH64]
-  AArch64/ArmMmuStandaloneMmLib.c
+[Sources]
+  ArmMmuStandaloneMmLib.c
 
 [Packages]
   ArmPkg/ArmPkg.dec
   MdePkg/MdePkg.dec
 
-[FeaturePcd.AARCH64]
+[FeaturePcd.ARM, FeaturePcd.AARCH64]
   gArmTokenSpaceGuid.PcdFfaEnable
 
 [LibraryClasses]
-- 
2.17.1

[PATCH v4 3/5] GenFv: Arm: support images entered in Thumb mode

[Etienne Carriere]

Change GenFv for Arm architecture to generate a specific jump
instruction as image entry instruction, when the target entry label
is assembled with Thumb instruction set. This is possible since
SecCoreEntryAddress value fetched from the PE32 has its LSBit set when
the entry instruction executes in Thumb mode.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Acked-by: Liming Gao <gaoliming@byosoft.com.cn>
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

---
Changes since v3:
- Removed Cc tags and apply review tags.

Changes since v2:
- Fix missing parentheses in expression.

Changes since v1:
- Fix typos in commit log and inline comments
- Change if() test operand to be an explicit boolean
---
 BaseTools/Source/C/GenFv/GenFvInternalLib.c | 38 +++++++++++++++-----
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
index 6e296b8ad6..6cf9c84e73 100644
--- a/BaseTools/Source/C/GenFv/GenFvInternalLib.c
+++ b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
@@ -34,9 +34,27 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include "FvLib.h"
 #include "PeCoffLib.h"
 
-#define ARMT_UNCONDITIONAL_JUMP_INSTRUCTION       0xEB000000
 #define ARM64_UNCONDITIONAL_JUMP_INSTRUCTION      0x14000000
 
+/*
+ * Arm instruction to jump to Fv entry instruction in Arm or Thumb mode.
+ * From ARM Arch Ref Manual versions b/c/d, section A8.8.25 BL, BLX (immediate)
+ * BLX (encoding A2) branches to offset in Thumb instruction set mode.
+ * BL (encoding A1) branches to offset in Arm instruction set mode.
+ */
+#define ARM_JUMP_OFFSET_MAX        0xffffff
+#define ARM_JUMP_TO_ARM(Offset)    (0xeb000000 | ((Offset - 8) >> 2))
+
+#define _ARM_JUMP_TO_THUMB(Imm32)  (0xfa000000 | \
+                                    (((Imm32) & (1 << 1)) << (24 - 1)) | \
+                                    (((Imm32) >> 2) & 0x7fffff))
+#define ARM_JUMP_TO_THUMB(Offset)  _ARM_JUMP_TO_THUMB((Offset) - 8)
+
+/*
+ * Arm instruction to retrun from exception (MOVS PC, LR)
+ */
+#define ARM_RETURN_FROM_EXCEPTION  0xE1B0F07E
+
 BOOLEAN mArm = FALSE;
 BOOLEAN mRiscV = FALSE;
 STATIC UINT32   MaxFfsAlignment = 0;
@@ -2203,23 +2221,25 @@ Returns:
     // if we found an SEC core entry point then generate a branch instruction
     // to it and populate a debugger SWI entry as well
     if (UpdateVectorSec) {
+      UINT32                    EntryOffset;
 
       VerboseMsg("UpdateArmResetVectorIfNeeded updating ARM SEC vector");
 
-      // B SecEntryPoint - signed_immed_24 part +/-32MB offset
-      // on ARM, the PC is always 8 ahead, so we're not really jumping from the base address, but from base address + 8
-      ResetVector[0] = (INT32)(SecCoreEntryAddress - FvInfo->BaseAddress - 8) >> 2;
+      EntryOffset = (INT32)(SecCoreEntryAddress - FvInfo->BaseAddress);
 
-      if (ResetVector[0] > 0x00FFFFFF) {
-        Error(NULL, 0, 3000, "Invalid", "SEC Entry point must be within 32MB of the start of the FV");
+      if (EntryOffset > ARM_JUMP_OFFSET_MAX) {
+          Error(NULL, 0, 3000, "Invalid", "SEC Entry point offset above 1MB of the start of the FV");
         return EFI_ABORTED;
       }
 
-      // Add opcode for an unconditional branch with no link. i.e.: " B SecEntryPoint"
-      ResetVector[0] |= ARMT_UNCONDITIONAL_JUMP_INSTRUCTION;
+      if ((SecCoreEntryAddress & 1) != 0) {
+        ResetVector[0] = ARM_JUMP_TO_THUMB(EntryOffset);
+      } else {
+        ResetVector[0] = ARM_JUMP_TO_ARM(EntryOffset);
+      }
 
       // SWI handler movs   pc,lr. Just in case a debugger uses SWI
-      ResetVector[2] = 0xE1B0F07E;
+      ResetVector[2] = ARM_RETURN_FROM_EXCEPTION;
 
       // Place holder to support a common interrupt handler from ROM.
       // Currently not supported. For this to be used the reset vector would not be in this FV
-- 
2.17.1

[PATCH v4 4/5] StandaloneMmPkg: fix pointer/int casts against 32bit architectures

[Etienne Carriere]

Use intermediate (UINTN) cast when casting int from/to pointer. This
is needed as UINT64 values cast from/to 32bit pointer for 32bit
architectures.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Acked-by: Jiewen Yao <Jiewen.yao@intel.com>
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
---
Changes since v3:
- Remove Cc tags and apply review tags.

No change since v2
No change since v1
---
 StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.c                       |  8 ++++----
 StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/CreateHobList.c              | 14 +++++++-------
 StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.c b/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.c
index 6884095c49..d4590bcd19 100644
--- a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.c
+++ b/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.c
@@ -164,8 +164,8 @@ StandaloneMmCpuInitialize (
 
   // Share the entry point of the CPU driver
   DEBUG ((DEBUG_INFO, "Sharing Cpu Driver EP *0x%lx = 0x%lx\n",
-          (UINT64) CpuDriverEntryPointDesc->ArmTfCpuDriverEpPtr,
-          (UINT64) PiMmStandaloneArmTfCpuDriverEntry));
+          (UINTN) CpuDriverEntryPointDesc->ArmTfCpuDriverEpPtr,
+          (UINTN) PiMmStandaloneArmTfCpuDriverEntry));
   *(CpuDriverEntryPointDesc->ArmTfCpuDriverEpPtr) = PiMmStandaloneArmTfCpuDriverEntry;
 
   // Find the descriptor that contains the whereabouts of the buffer for
@@ -180,8 +180,8 @@ StandaloneMmCpuInitialize (
     return Status;
   }
 
-  DEBUG ((DEBUG_INFO, "mNsCommBuffer.PhysicalStart - 0x%lx\n", (UINT64) NsCommBufMmramRange->PhysicalStart));
-  DEBUG ((DEBUG_INFO, "mNsCommBuffer.PhysicalSize - 0x%lx\n", (UINT64) NsCommBufMmramRange->PhysicalSize));
+  DEBUG ((DEBUG_INFO, "mNsCommBuffer.PhysicalStart - 0x%lx\n", (UINTN) NsCommBufMmramRange->PhysicalStart));
+  DEBUG ((DEBUG_INFO, "mNsCommBuffer.PhysicalSize - 0x%lx\n", (UINTN) NsCommBufMmramRange->PhysicalSize));
 
   CopyMem (&mNsCommBuffer, NsCommBufMmramRange, sizeof(EFI_MMRAM_DESCRIPTOR));
   DEBUG ((DEBUG_INFO, "mNsCommBuffer: 0x%016lx - 0x%lx\n", mNsCommBuffer.CpuStart, mNsCommBuffer.PhysicalSize));
diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/CreateHobList.c b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/CreateHobList.c
index e8fb96bd6e..4d4cf3d5ff 100644
--- a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/CreateHobList.c
+++ b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/CreateHobList.c
@@ -72,14 +72,14 @@ CreateHobListFromBootInfo (
 
   // Create a hoblist with a PHIT and EOH
   HobStart = HobConstructor (
-               (VOID *) PayloadBootInfo->SpMemBase,
+               (VOID *) (UINTN) PayloadBootInfo->SpMemBase,
                (UINTN)  PayloadBootInfo->SpMemLimit - PayloadBootInfo->SpMemBase,
-               (VOID *) PayloadBootInfo->SpHeapBase,
-               (VOID *) (PayloadBootInfo->SpHeapBase + PayloadBootInfo->SpHeapSize)
+               (VOID *) (UINTN) PayloadBootInfo->SpHeapBase,
+               (VOID *) (UINTN) (PayloadBootInfo->SpHeapBase + PayloadBootInfo->SpHeapSize)
                );
 
   // Check that the Hoblist starts at the bottom of the Heap
-  ASSERT (HobStart == (VOID *) PayloadBootInfo->SpHeapBase);
+  ASSERT (HobStart == (VOID *) (UINTN) PayloadBootInfo->SpHeapBase);
 
   // Build a Boot Firmware Volume HOB
   BuildFvHob (PayloadBootInfo->SpImageBase, PayloadBootInfo->SpImageSize);
@@ -190,9 +190,9 @@ CreateHobListFromBootInfo (
   MmramRanges[3].RegionState   = EFI_CACHEABLE | EFI_ALLOCATED;
 
   // Base and size of heap memory shared by all cpus
-  MmramRanges[4].PhysicalStart = (EFI_PHYSICAL_ADDRESS) HobStart;
-  MmramRanges[4].CpuStart      = (EFI_PHYSICAL_ADDRESS) HobStart;
-  MmramRanges[4].PhysicalSize  = HobStart->EfiFreeMemoryBottom - (EFI_PHYSICAL_ADDRESS) HobStart;
+  MmramRanges[4].PhysicalStart = (EFI_PHYSICAL_ADDRESS) (UINTN) HobStart;
+  MmramRanges[4].CpuStart      = (EFI_PHYSICAL_ADDRESS) (UINTN) HobStart;
+  MmramRanges[4].PhysicalSize  = HobStart->EfiFreeMemoryBottom - (EFI_PHYSICAL_ADDRESS) (UINTN) HobStart;
   MmramRanges[4].RegionState   = EFI_CACHEABLE | EFI_ALLOCATED;
 
   // Base and size of heap memory shared by all cpus
diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c
index 6c50f470aa..b445d6942e 100644
--- a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c
+++ b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c
@@ -328,7 +328,7 @@ _ModuleEntryPoint (
 
   // Locate PE/COFF File information for the Standalone MM core module
   Status = LocateStandaloneMmCorePeCoffData (
-             (EFI_FIRMWARE_VOLUME_HEADER *) PayloadBootInfo->SpImageBase,
+             (EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) PayloadBootInfo->SpImageBase,
              &TeData,
              &TeDataSize
              );
-- 
2.17.1

[PATCH v4 5/5] StandaloneMmPkg: build for 32bit arm machines

[Etienne Carriere]

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>
---
Changes since v3:
- Fix BuildOptions.ARM in StandaloneMmPkg.
- Remove Cc tags.

No change since v2

Changes since v1:
- ARM_SMC_ID_MM_COMMUNICATE 32b/64b agnostic helper ID is defined
  in ArmStdSmc.h (see 1st commit in this series) instead of being
  local to EventHandle.c.
- Fix void occurrence to VOID.
- Fix path in StandaloneMmPkg/StandaloneMmPkg.dsc
---
 StandaloneMmPkg/Core/StandaloneMmCore.inf                                                                            |  2 +-
 StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64 => }/EventHandle.c                                                  |  5 +++--
 StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64 => }/StandaloneMmCpu.c                                              |  2 +-
 StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64 => }/StandaloneMmCpu.h                                              |  0
 StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64 => }/StandaloneMmCpu.inf                                            |  0
 StandaloneMmPkg/Include/Library/{AArch64 => Arm}/StandaloneMmCoreEntryPoint.h                                        |  0
 StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/{AArch64 => Arm}/CreateHobList.c                                  |  2 +-
 StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/{AArch64 => Arm}/SetPermissions.c                                 |  2 +-
 StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/{AArch64 => Arm}/StandaloneMmCoreEntryPoint.c                     | 16 ++++++++--------
 StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf                                    | 14 +++++++-------
 StandaloneMmPkg/Library/StandaloneMmCoreHobLib/{AArch64 => Arm}/StandaloneMmCoreHobLib.c                             |  0
 StandaloneMmPkg/Library/StandaloneMmCoreHobLib/{AArch64 => Arm}/StandaloneMmCoreHobLibInternal.c                     |  0
 StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreHobLib.inf                                            |  8 ++++----
 StandaloneMmPkg/Library/StandaloneMmMemLib/{AArch64/StandaloneMmMemLibInternal.c => ArmStandaloneMmMemLibInternal.c} |  9 ++++++++-
 StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.inf                                                    |  6 +++---
 StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf                                                |  2 +-
 StandaloneMmPkg/StandaloneMmPkg.dsc                                                                                  | 12 ++++++++----
 17 files changed, 46 insertions(+), 34 deletions(-)

diff --git a/StandaloneMmPkg/Core/StandaloneMmCore.inf b/StandaloneMmPkg/Core/StandaloneMmCore.inf
index 87bf6e9440..56042b7b39 100644
--- a/StandaloneMmPkg/Core/StandaloneMmCore.inf
+++ b/StandaloneMmPkg/Core/StandaloneMmCore.inf
@@ -17,7 +17,7 @@
   PI_SPECIFICATION_VERSION       = 0x00010032
   ENTRY_POINT                    = StandaloneMmMain
 
-#  VALID_ARCHITECTURES           = IA32 X64 AARCH64
+#  VALID_ARCHITECTURES           = IA32 X64 AARCH64 ARM
 
 [Sources]
   StandaloneMmCore.c
diff --git a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c b/StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c
similarity index 95%
rename from StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
rename to StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c
index 63fbe26642..165d696f99 100644
--- a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
+++ b/StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c
@@ -2,6 +2,7 @@
 
   Copyright (c) 2016 HP Development Company, L.P.
   Copyright (c) 2016 - 2021, Arm Limited. All rights reserved.
+  Copyright (c) 2021, Linaro Limited
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -92,8 +93,8 @@ PiMmStandaloneArmTfCpuDriverEntry (
   // receipt of a synchronous MM request. Use the Event ID to distinguish
   // between synchronous and asynchronous events.
   //
-  if ((ARM_SMC_ID_MM_COMMUNICATE_AARCH64 != EventId) &&
-      (ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ_AARCH64 != EventId)) {
+  if ((ARM_SMC_ID_MM_COMMUNICATE != EventId) &&
+      (ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ != EventId)) {
     DEBUG ((DEBUG_INFO, "UnRecognized Event - 0x%x\n", EventId));
     return EFI_INVALID_PARAMETER;
   }
diff --git a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.c b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c
similarity index 96%
rename from StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.c
rename to StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c
index d4590bcd19..10097f792f 100644
--- a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.c
+++ b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c
@@ -10,7 +10,7 @@
 
 #include <Base.h>
 #include <Pi/PiMmCis.h>
-#include <Library/AArch64/StandaloneMmCoreEntryPoint.h>
+#include <Library/Arm/StandaloneMmCoreEntryPoint.h>
 #include <Library/DebugLib.h>
 #include <Library/ArmSvcLib.h>
 #include <Library/ArmLib.h>
diff --git a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.h b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.h
similarity index 100%
rename from StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.h
rename to StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.h
diff --git a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.inf b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf
similarity index 100%
rename from StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.inf
rename to StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf
diff --git a/StandaloneMmPkg/Include/Library/AArch64/StandaloneMmCoreEntryPoint.h b/StandaloneMmPkg/Include/Library/Arm/StandaloneMmCoreEntryPoint.h
similarity index 100%
rename from StandaloneMmPkg/Include/Library/AArch64/StandaloneMmCoreEntryPoint.h
rename to StandaloneMmPkg/Include/Library/Arm/StandaloneMmCoreEntryPoint.h
diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/CreateHobList.c b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHobList.c
similarity index 97%
rename from StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/CreateHobList.c
rename to 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
similarity index 96%
rename from StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/SetPermissions.c
rename to 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
similarity index 94%
rename from StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c
rename to 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]
diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/StandaloneMmCoreHobLib.c b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneMmCoreHobLib.c
similarity index 100%
rename from StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/StandaloneMmCoreHobLib.c
rename to StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneMmCoreHobLib.c
diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/StandaloneMmCoreHobLibInternal.c b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneMmCoreHobLibInternal.c
similarity index 100%
rename from StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/StandaloneMmCoreHobLibInternal.c
rename to StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneMmCoreHobLibInternal.c
diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreHobLib.inf b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreHobLib.inf
index a2559920e8..34ed536480 100644
--- a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreHobLib.inf
+++ b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreHobLib.inf
@@ -22,7 +22,7 @@
   LIBRARY_CLASS                  = HobLib|MM_CORE_STANDALONE
 
 #
-#  VALID_ARCHITECTURES           = X64 AARCH64
+#  VALID_ARCHITECTURES           = X64 AARCH64 ARM
 #
 [Sources.common]
   Common.c
@@ -30,9 +30,9 @@
 [Sources.X64]
   X64/StandaloneMmCoreHobLib.c
 
-[Sources.AARCH64]
-  AArch64/StandaloneMmCoreHobLib.c
-  AArch64/StandaloneMmCoreHobLibInternal.c
+[Sources.AARCH64, Sources.ARM]
+  Arm/StandaloneMmCoreHobLib.c
+  Arm/StandaloneMmCoreHobLibInternal.c
 
 [Packages]
   MdePkg/MdePkg.dec
diff --git a/StandaloneMmPkg/Library/StandaloneMmMemLib/AArch64/StandaloneMmMemLibInternal.c b/StandaloneMmPkg/Library/StandaloneMmMemLib/ArmStandaloneMmMemLibInternal.c
similarity index 86%
rename from StandaloneMmPkg/Library/StandaloneMmMemLib/AArch64/StandaloneMmMemLibInternal.c
rename to StandaloneMmPkg/Library/StandaloneMmMemLib/ArmStandaloneMmMemLibInternal.c
index 4124959e04..fa7df46413 100644
--- a/StandaloneMmPkg/Library/StandaloneMmMemLib/AArch64/StandaloneMmMemLibInternal.c
+++ b/StandaloneMmPkg/Library/StandaloneMmMemLib/ArmStandaloneMmMemLibInternal.c
@@ -20,6 +20,13 @@
 //
 extern EFI_PHYSICAL_ADDRESS  mMmMemLibInternalMaximumSupportAddress;
 
+#ifdef MDE_CPU_AARCH64
+#define ARM_PHYSICAL_ADDRESS_BITS 36
+#endif
+#ifdef MDE_CPU_ARM
+#define ARM_PHYSICAL_ADDRESS_BITS 32
+#endif
+
 /**
   Calculate and save the maximum support address.
 
@@ -31,7 +38,7 @@ MmMemLibInternalCalculateMaximumSupportAddress (
 {
   UINT8        PhysicalAddressBits;
 
-  PhysicalAddressBits = 36;
+  PhysicalAddressBits = ARM_PHYSICAL_ADDRESS_BITS;
 
   //
   // Save the maximum support address in one global variable
diff --git a/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.inf b/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.inf
index 062b0d7a11..b29d97a746 100644
--- a/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.inf
+++ b/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.inf
@@ -28,7 +28,7 @@
 #
 # The following information is for reference only and not required by the build tools.
 #
-#  VALID_ARCHITECTURES           = IA32 X64 AARCH64
+#  VALID_ARCHITECTURES           = IA32 X64 AARCH64 ARM
 #
 
 [Sources.Common]
@@ -37,8 +37,8 @@
 [Sources.IA32, Sources.X64]
   X86StandaloneMmMemLibInternal.c
 
-[Sources.AARCH64]
-  AArch64/StandaloneMmMemLibInternal.c
+[Sources.AARCH64, Sources.ARM]
+  ArmStandaloneMmMemLibInternal.c
 
 [Packages]
   MdePkg/MdePkg.dec
diff --git a/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf b/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf
index a2a059c5d6..ffb2a6d083 100644
--- a/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf
+++ b/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf
@@ -20,7 +20,7 @@
 #
 # The following information is for reference only and not required by the build tools.
 #
-#  VALID_ARCHITECTURES           = AARCH64
+#  VALID_ARCHITECTURES           = AARCH64|ARM
 #
 #
 
diff --git a/StandaloneMmPkg/StandaloneMmPkg.dsc b/StandaloneMmPkg/StandaloneMmPkg.dsc
index 0c45df95e2..8012f93b7d 100644
--- a/StandaloneMmPkg/StandaloneMmPkg.dsc
+++ b/StandaloneMmPkg/StandaloneMmPkg.dsc
@@ -20,7 +20,7 @@
   PLATFORM_VERSION               = 1.0
   DSC_SPECIFICATION              = 0x00010011
   OUTPUT_DIRECTORY               = Build/StandaloneMm
-  SUPPORTED_ARCHITECTURES        = AARCH64|X64
+  SUPPORTED_ARCHITECTURES        = AARCH64|X64|ARM
   BUILD_TARGETS                  = DEBUG|RELEASE
   SKUID_IDENTIFIER               = DEFAULT
 
@@ -60,7 +60,7 @@
   StandaloneMmDriverEntryPoint|MdePkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.inf
   VariableMmDependency|StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf
 
-[LibraryClasses.AARCH64]
+[LibraryClasses.AARCH64, LibraryClasses.ARM]
   ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
   StandaloneMmMmuLib|ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf
   ArmSvcLib|ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf
@@ -118,8 +118,8 @@
   StandaloneMmPkg/Library/StandaloneMmMemoryAllocationLib/StandaloneMmMemoryAllocationLib.inf
   StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf
 
-[Components.AARCH64]
-  StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.inf
+[Components.AARCH64, Components.ARM]
+  StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf
   StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMmPeCoffExtraActionLib.inf
 
 ###################################################################################################
@@ -135,6 +135,10 @@
 GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000 -march=armv8-a+nofp -mstrict-align
 GCC:*_*_*_CC_FLAGS = -mstrict-align
 
+[BuildOptions.ARM]
+GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000 -march=armv7-a
+GCC:*_*_*_CC_FLAGS = -fno-stack-protector
+
 [BuildOptions.X64]
   MSFT:*_*_*_DLINK_FLAGS = /ALIGN:4096
   GCC:*_GCC*_*_DLINK_FLAGS = -z common-page-size=0x1000
-- 
2.17.1

Re: [PATCH v4 5/5] StandaloneMmPkg: build for 32bit arm machines

[Sami Mujawar]

Hi Etienn,

This patch looks good to me.

Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

Regards,

Sami Mujawar

On 19/05/2021 08:14 AM, Etienne Carriere wrote:
> 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>
> ---
> Changes since v3:
> - Fix BuildOptions.ARM in StandaloneMmPkg.
> - Remove Cc tags.
>
> No change since v2
>
> Changes since v1:
> - ARM_SMC_ID_MM_COMMUNICATE 32b/64b agnostic helper ID is defined
>    in ArmStdSmc.h (see 1st commit in this series) instead of being
>    local to EventHandle.c.
> - Fix void occurrence to VOID.
> - Fix path in StandaloneMmPkg/StandaloneMmPkg.dsc
> ---
>   StandaloneMmPkg/Core/StandaloneMmCore.inf                                                                            |  2 +-
>   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64 => }/EventHandle.c                                                  |  5 +++--
>   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64 => }/StandaloneMmCpu.c                                              |  2 +-
>   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64 => }/StandaloneMmCpu.h                                              |  0
>   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64 => }/StandaloneMmCpu.inf                                            |  0
>   StandaloneMmPkg/Include/Library/{AArch64 => Arm}/StandaloneMmCoreEntryPoint.h                                        |  0
>   StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/{AArch64 => Arm}/CreateHobList.c                                  |  2 +-
>   StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/{AArch64 => Arm}/SetPermissions.c                                 |  2 +-
>   StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/{AArch64 => Arm}/StandaloneMmCoreEntryPoint.c                     | 16 ++++++++--------
>   StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf                                    | 14 +++++++-------
>   StandaloneMmPkg/Library/StandaloneMmCoreHobLib/{AArch64 => Arm}/StandaloneMmCoreHobLib.c                             |  0
>   StandaloneMmPkg/Library/StandaloneMmCoreHobLib/{AArch64 => Arm}/StandaloneMmCoreHobLibInternal.c                     |  0
>   StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreHobLib.inf                                            |  8 ++++----
>   StandaloneMmPkg/Library/StandaloneMmMemLib/{AArch64/StandaloneMmMemLibInternal.c => ArmStandaloneMmMemLibInternal.c} |  9 ++++++++-
>   StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.inf                                                    |  6 +++---
>   StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf                                                |  2 +-
>   StandaloneMmPkg/StandaloneMmPkg.dsc                                                                                  | 12 ++++++++----
>   17 files changed, 46 insertions(+), 34 deletions(-)
>
> diff --git a/StandaloneMmPkg/Core/StandaloneMmCore.inf b/StandaloneMmPkg/Core/StandaloneMmCore.inf
> index 87bf6e9440..56042b7b39 100644
> --- a/StandaloneMmPkg/Core/StandaloneMmCore.inf
> +++ b/StandaloneMmPkg/Core/StandaloneMmCore.inf
> @@ -17,7 +17,7 @@
>     PI_SPECIFICATION_VERSION       = 0x00010032
>     ENTRY_POINT                    = StandaloneMmMain
>   
> -#  VALID_ARCHITECTURES           = IA32 X64 AARCH64
> +#  VALID_ARCHITECTURES           = IA32 X64 AARCH64 ARM
>   
>   [Sources]
>     StandaloneMmCore.c
> diff --git a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c b/StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c
> similarity index 95%
> rename from StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
> rename to StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c
> index 63fbe26642..165d696f99 100644
> --- a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
> +++ b/StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c
> @@ -2,6 +2,7 @@
>   
>     Copyright (c) 2016 HP Development Company, L.P.
>     Copyright (c) 2016 - 2021, Arm Limited. All rights reserved.
> +  Copyright (c) 2021, Linaro Limited
>   
>     SPDX-License-Identifier: BSD-2-Clause-Patent
>   
> @@ -92,8 +93,8 @@ PiMmStandaloneArmTfCpuDriverEntry (
>     // receipt of a synchronous MM request. Use the Event ID to distinguish
>     // between synchronous and asynchronous events.
>     //
> -  if ((ARM_SMC_ID_MM_COMMUNICATE_AARCH64 != EventId) &&
> -      (ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ_AARCH64 != EventId)) {
> +  if ((ARM_SMC_ID_MM_COMMUNICATE != EventId) &&
> +      (ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ != EventId)) {
>       DEBUG ((DEBUG_INFO, "UnRecognized Event - 0x%x\n", EventId));
>       return EFI_INVALID_PARAMETER;
>     }
> diff --git a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.c b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c
> similarity index 96%
> rename from StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.c
> rename to StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c
> index d4590bcd19..10097f792f 100644
> --- a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.c
> +++ b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c
> @@ -10,7 +10,7 @@
>   
>   #include <Base.h>
>   #include <Pi/PiMmCis.h>
> -#include <Library/AArch64/StandaloneMmCoreEntryPoint.h>
> +#include <Library/Arm/StandaloneMmCoreEntryPoint.h>
>   #include <Library/DebugLib.h>
>   #include <Library/ArmSvcLib.h>
>   #include <Library/ArmLib.h>
> diff --git a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.h b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.h
> similarity index 100%
> rename from StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.h
> rename to StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.h
> diff --git a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.inf b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf
> similarity index 100%
> rename from StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.inf
> rename to StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf
> diff --git a/StandaloneMmPkg/Include/Library/AArch64/StandaloneMmCoreEntryPoint.h b/StandaloneMmPkg/Include/Library/Arm/StandaloneMmCoreEntryPoint.h
> similarity index 100%
> rename from StandaloneMmPkg/Include/Library/AArch64/StandaloneMmCoreEntryPoint.h
> rename to StandaloneMmPkg/Include/Library/Arm/StandaloneMmCoreEntryPoint.h
> diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/CreateHobList.c b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHobList.c
> similarity index 97%
> rename from StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/CreateHobList.c
> rename to 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
> similarity index 96%
> rename from StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/SetPermissions.c
> rename to 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
> similarity index 94%
> rename from StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c
> rename to 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]
> diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/StandaloneMmCoreHobLib.c b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneMmCoreHobLib.c
> similarity index 100%
> rename from StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/StandaloneMmCoreHobLib.c
> rename to StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneMmCoreHobLib.c
> diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/StandaloneMmCoreHobLibInternal.c b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneMmCoreHobLibInternal.c
> similarity index 100%
> rename from StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/StandaloneMmCoreHobLibInternal.c
> rename to StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneMmCoreHobLibInternal.c
> diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreHobLib.inf b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreHobLib.inf
> index a2559920e8..34ed536480 100644
> --- a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreHobLib.inf
> +++ b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreHobLib.inf
> @@ -22,7 +22,7 @@
>     LIBRARY_CLASS                  = HobLib|MM_CORE_STANDALONE
>   
>   #
> -#  VALID_ARCHITECTURES           = X64 AARCH64
> +#  VALID_ARCHITECTURES           = X64 AARCH64 ARM
>   #
>   [Sources.common]
>     Common.c
> @@ -30,9 +30,9 @@
>   [Sources.X64]
>     X64/StandaloneMmCoreHobLib.c
>   
> -[Sources.AARCH64]
> -  AArch64/StandaloneMmCoreHobLib.c
> -  AArch64/StandaloneMmCoreHobLibInternal.c
> +[Sources.AARCH64, Sources.ARM]
> +  Arm/StandaloneMmCoreHobLib.c
> +  Arm/StandaloneMmCoreHobLibInternal.c
>   
>   [Packages]
>     MdePkg/MdePkg.dec
> diff --git a/StandaloneMmPkg/Library/StandaloneMmMemLib/AArch64/StandaloneMmMemLibInternal.c b/StandaloneMmPkg/Library/StandaloneMmMemLib/ArmStandaloneMmMemLibInternal.c
> similarity index 86%
> rename from StandaloneMmPkg/Library/StandaloneMmMemLib/AArch64/StandaloneMmMemLibInternal.c
> rename to StandaloneMmPkg/Library/StandaloneMmMemLib/ArmStandaloneMmMemLibInternal.c
> index 4124959e04..fa7df46413 100644
> --- a/StandaloneMmPkg/Library/StandaloneMmMemLib/AArch64/StandaloneMmMemLibInternal.c
> +++ b/StandaloneMmPkg/Library/StandaloneMmMemLib/ArmStandaloneMmMemLibInternal.c
> @@ -20,6 +20,13 @@
>   //
>   extern EFI_PHYSICAL_ADDRESS  mMmMemLibInternalMaximumSupportAddress;
>   
> +#ifdef MDE_CPU_AARCH64
> +#define ARM_PHYSICAL_ADDRESS_BITS 36
> +#endif
> +#ifdef MDE_CPU_ARM
> +#define ARM_PHYSICAL_ADDRESS_BITS 32
> +#endif
> +
>   /**
>     Calculate and save the maximum support address.
>   
> @@ -31,7 +38,7 @@ MmMemLibInternalCalculateMaximumSupportAddress (
>   {
>     UINT8        PhysicalAddressBits;
>   
> -  PhysicalAddressBits = 36;
> +  PhysicalAddressBits = ARM_PHYSICAL_ADDRESS_BITS;
>   
>     //
>     // Save the maximum support address in one global variable
> diff --git a/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.inf b/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.inf
> index 062b0d7a11..b29d97a746 100644
> --- a/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.inf
> +++ b/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.inf
> @@ -28,7 +28,7 @@
>   #
>   # The following information is for reference only and not required by the build tools.
>   #
> -#  VALID_ARCHITECTURES           = IA32 X64 AARCH64
> +#  VALID_ARCHITECTURES           = IA32 X64 AARCH64 ARM
>   #
>   
>   [Sources.Common]
> @@ -37,8 +37,8 @@
>   [Sources.IA32, Sources.X64]
>     X86StandaloneMmMemLibInternal.c
>   
> -[Sources.AARCH64]
> -  AArch64/StandaloneMmMemLibInternal.c
> +[Sources.AARCH64, Sources.ARM]
> +  ArmStandaloneMmMemLibInternal.c
>   
>   [Packages]
>     MdePkg/MdePkg.dec
> diff --git a/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf b/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf
> index a2a059c5d6..ffb2a6d083 100644
> --- a/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf
> +++ b/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf
> @@ -20,7 +20,7 @@
>   #
>   # The following information is for reference only and not required by the build tools.
>   #
> -#  VALID_ARCHITECTURES           = AARCH64
> +#  VALID_ARCHITECTURES           = AARCH64|ARM
>   #
>   #
>   
> diff --git a/StandaloneMmPkg/StandaloneMmPkg.dsc b/StandaloneMmPkg/StandaloneMmPkg.dsc
> index 0c45df95e2..8012f93b7d 100644
> --- a/StandaloneMmPkg/StandaloneMmPkg.dsc
> +++ b/StandaloneMmPkg/StandaloneMmPkg.dsc
> @@ -20,7 +20,7 @@
>     PLATFORM_VERSION               = 1.0
>     DSC_SPECIFICATION              = 0x00010011
>     OUTPUT_DIRECTORY               = Build/StandaloneMm
> -  SUPPORTED_ARCHITECTURES        = AARCH64|X64
> +  SUPPORTED_ARCHITECTURES        = AARCH64|X64|ARM
>     BUILD_TARGETS                  = DEBUG|RELEASE
>     SKUID_IDENTIFIER               = DEFAULT
>   
> @@ -60,7 +60,7 @@
>     StandaloneMmDriverEntryPoint|MdePkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.inf
>     VariableMmDependency|StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf
>   
> -[LibraryClasses.AARCH64]
> +[LibraryClasses.AARCH64, LibraryClasses.ARM]
>     ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
>     StandaloneMmMmuLib|ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf
>     ArmSvcLib|ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf
> @@ -118,8 +118,8 @@
>     StandaloneMmPkg/Library/StandaloneMmMemoryAllocationLib/StandaloneMmMemoryAllocationLib.inf
>     StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf
>   
> -[Components.AARCH64]
> -  StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.inf
> +[Components.AARCH64, Components.ARM]
> +  StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf
>     StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMmPeCoffExtraActionLib.inf
>   
>   ###################################################################################################
> @@ -135,6 +135,10 @@
>   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000 -march=armv8-a+nofp -mstrict-align
>   GCC:*_*_*_CC_FLAGS = -mstrict-align
>   
> +[BuildOptions.ARM]
> +GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000 -march=armv7-a
> +GCC:*_*_*_CC_FLAGS = -fno-stack-protector
> +
>   [BuildOptions.X64]
>     MSFT:*_*_*_DLINK_FLAGS = /ALIGN:4096
>     GCC:*_GCC*_*_DLINK_FLAGS = -z common-page-size=0x1000

回复: [edk2-devel] [PATCH v4 5/5] StandaloneMmPkg: build for 32bit arm machines

[gaoliming]

Hi, all
  This patch set has passed code review. How about merge it for this stable tag edk2 202108?

Thanks
Liming
> -----邮件原件-----
> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Sami
> Mujawar
> 发送时间: 2021年5月19日 17:58
> 收件人: Etienne Carriere <etienne.carriere@linaro.org>;
> devel@edk2.groups.io
> 抄送: Achin Gupta <achin.gupta@arm.com>; Ard Biesheuvel
> <ardb+tianocore@kernel.org>; Jiewen Yao <jiewen.yao@intel.com>; Leif
> Lindholm <leif@nuviainc.com>; Sughosh Ganu <sughosh.ganu@linaro.org>;
> nd@arm.com
> 主题: Re: [edk2-devel] [PATCH v4 5/5] StandaloneMmPkg: build for 32bit arm
> machines
> 
> Hi Etienn,
> 
> This patch looks good to me.
> 
> Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
> 
> Regards,
> 
> Sami Mujawar
> 
> On 19/05/2021 08:14 AM, Etienne Carriere wrote:
> > 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>
> > ---
> > Changes since v3:
> > - Fix BuildOptions.ARM in StandaloneMmPkg.
> > - Remove Cc tags.
> >
> > No change since v2
> >
> > Changes since v1:
> > - ARM_SMC_ID_MM_COMMUNICATE 32b/64b agnostic helper ID is
> defined
> >    in ArmStdSmc.h (see 1st commit in this series) instead of being
> >    local to EventHandle.c.
> > - Fix void occurrence to VOID.
> > - Fix path in StandaloneMmPkg/StandaloneMmPkg.dsc
> > ---
> >   StandaloneMmPkg/Core/StandaloneMmCore.inf
> |  2 +-
> >   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64
> => }/EventHandle.c
> |  5 +++--
> >   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64
> => }/StandaloneMmCpu.c
> |  2 +-
> >   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64
> => }/StandaloneMmCpu.h
> |  0
> >   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64
> => }/StandaloneMmCpu.inf
> |  0
> >   StandaloneMmPkg/Include/Library/{AArch64 =>
> Arm}/StandaloneMmCoreEntryPoint.h
> |  0
> >   StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/{AArch64 =>
> Arm}/CreateHobList.c                                  |  2 +-
> >   StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/{AArch64 =>
> Arm}/SetPermissions.c                                 |  2 +-
> >   StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/{AArch64 =>
> Arm}/StandaloneMmCoreEntryPoint.c                     | 16
> ++++++++--------
> >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCor
> eEntryPoint.inf                                    | 14
> +++++++-------
> >   StandaloneMmPkg/Library/StandaloneMmCoreHobLib/{AArch64 =>
> Arm}/StandaloneMmCoreHobLib.c                             |  0
> >   StandaloneMmPkg/Library/StandaloneMmCoreHobLib/{AArch64 =>
> Arm}/StandaloneMmCoreHobLibInternal.c                     |  0
> >
> StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreH
> obLib.inf                                            |  8 ++++----
> >
> StandaloneMmPkg/Library/StandaloneMmMemLib/{AArch64/StandaloneMm
> MemLibInternal.c => ArmStandaloneMmMemLibInternal.c} |  9 ++++++++-
> >
> StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.i
> nf                                                    |  6
> +++---
> >
> StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependenc
> y.inf                                                |  2 +-
> >   StandaloneMmPkg/StandaloneMmPkg.dsc
> | 12 ++++++++----
> >   17 files changed, 46 insertions(+), 34 deletions(-)
> >
> > diff --git a/StandaloneMmPkg/Core/StandaloneMmCore.inf
> b/StandaloneMmPkg/Core/StandaloneMmCore.inf
> > index 87bf6e9440..56042b7b39 100644
> > --- a/StandaloneMmPkg/Core/StandaloneMmCore.inf
> > +++ b/StandaloneMmPkg/Core/StandaloneMmCore.inf
> > @@ -17,7 +17,7 @@
> >     PI_SPECIFICATION_VERSION       = 0x00010032
> >     ENTRY_POINT                    = StandaloneMmMain
> >
> > -#  VALID_ARCHITECTURES           = IA32 X64 AARCH64
> > +#  VALID_ARCHITECTURES           = IA32 X64 AARCH64 ARM
> >
> >   [Sources]
> >     StandaloneMmCore.c
> > diff --git
> a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
> b/StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c
> > similarity index 95%
> > rename from
> StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
> > rename to StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c
> > index 63fbe26642..165d696f99 100644
> > ---
> a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
> > +++ b/StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c
> > @@ -2,6 +2,7 @@
> >
> >     Copyright (c) 2016 HP Development Company, L.P.
> >     Copyright (c) 2016 - 2021, Arm Limited. All rights reserved.
> > +  Copyright (c) 2021, Linaro Limited
> >
> >     SPDX-License-Identifier: BSD-2-Clause-Patent
> >
> > @@ -92,8 +93,8 @@ PiMmStandaloneArmTfCpuDriverEntry (
> >     // receipt of a synchronous MM request. Use the Event ID to
> distinguish
> >     // between synchronous and asynchronous events.
> >     //
> > -  if ((ARM_SMC_ID_MM_COMMUNICATE_AARCH64 != EventId) &&
> > -      (ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ_AARCH64 !=
> EventId)) {
> > +  if ((ARM_SMC_ID_MM_COMMUNICATE != EventId) &&
> > +      (ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ != EventId)) {
> >       DEBUG ((DEBUG_INFO, "UnRecognized Event - 0x%x\n", EventId));
> >       return EFI_INVALID_PARAMETER;
> >     }
> > diff --git
> a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCp
> u.c b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c
> > similarity index 96%
> > rename from
> StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.
> c
> > rename to
> StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c
> > index d4590bcd19..10097f792f 100644
> > ---
> a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCp
> u.c
> > +++ b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c
> > @@ -10,7 +10,7 @@
> >
> >   #include <Base.h>
> >   #include <Pi/PiMmCis.h>
> > -#include <Library/AArch64/StandaloneMmCoreEntryPoint.h>
> > +#include <Library/Arm/StandaloneMmCoreEntryPoint.h>
> >   #include <Library/DebugLib.h>
> >   #include <Library/ArmSvcLib.h>
> >   #include <Library/ArmLib.h>
> > diff --git
> a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCp
> u.h b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.h
> > similarity index 100%
> > rename from
> StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.
> h
> > rename to
> StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.h
> > diff --git
> a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCp
> u.inf b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf
> > similarity index 100%
> > rename from
> StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.i
> nf
> > rename to
> StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf
> > diff --git
> a/StandaloneMmPkg/Include/Library/AArch64/StandaloneMmCoreEntryPoin
> t.h
> b/StandaloneMmPkg/Include/Library/Arm/StandaloneMmCoreEntryPoint.h
> > similarity index 100%
> > rename from
> StandaloneMmPkg/Include/Library/AArch64/StandaloneMmCoreEntryPoint.h
> > rename to
> StandaloneMmPkg/Include/Library/Arm/StandaloneMmCoreEntryPoint.h
> > diff --git
> a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Create
> HobList.c
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHob
> List.c
> > similarity index 97%
> > rename from
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/CreateHo
> bList.c
> > rename to
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHobLis
> t.c
> > index 4d4cf3d5ff..85f8194687 100644
> > ---
> a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Create
> HobList.c
> > +++
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHob
> List.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/SetPer
> missions.c
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPermissi
> ons.c
> > similarity index 96%
> > rename from
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/SetPermi
> ssions.c
> > rename to
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPermissio
> ns.c
> > index 4a380df4a6..cd4b90823e 100644
> > ---
> a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/SetPer
> missions.c
> > +++
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPermissi
> ons.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/Standa
> loneMmCoreEntryPoint.c
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/Standalone
> MmCoreEntryPoint.c
> > similarity index 94%
> > rename from
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Standalo
> neMmCoreEntryPoint.c
> > rename to
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/StandaloneM
> mCoreEntryPoint.c
> > index b445d6942e..49cf51a789 100644
> > ---
> a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Standa
> loneMmCoreEntryPoint.c
> > +++
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/Standalone
> MmCoreEntryPoint.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/StandaloneMm
> CoreEntryPoint.inf
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMm
> CoreEntryPoint.inf
> > index 4fa426f58e..1762586cfa 100644
> > ---
> a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMm
> CoreEntryPoint.inf
> > +++
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMm
> CoreEntryPoint.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]
> > diff --git
> a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/Standalon
> eMmCoreHobLib.c
> b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneM
> mCoreHobLib.c
> > similarity index 100%
> > rename from
> StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/Standalone
> MmCoreHobLib.c
> > rename to
> StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneMmC
> oreHobLib.c
> > diff --git
> a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/Standalon
> eMmCoreHobLibInternal.c
> b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneM
> mCoreHobLibInternal.c
> > similarity index 100%
> > rename from
> StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/Standalone
> MmCoreHobLibInternal.c
> > rename to
> StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneMmC
> oreHobLibInternal.c
> > diff --git
> a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCore
> HobLib.inf
> b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCore
> HobLib.inf
> > index a2559920e8..34ed536480 100644
> > ---
> a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCore
> HobLib.inf
> > +++
> b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCore
> HobLib.inf
> > @@ -22,7 +22,7 @@
> >     LIBRARY_CLASS                  =
> HobLib|MM_CORE_STANDALONE
> >
> >   #
> > -#  VALID_ARCHITECTURES           = X64 AARCH64
> > +#  VALID_ARCHITECTURES           = X64 AARCH64 ARM
> >   #
> >   [Sources.common]
> >     Common.c
> > @@ -30,9 +30,9 @@
> >   [Sources.X64]
> >     X64/StandaloneMmCoreHobLib.c
> >
> > -[Sources.AARCH64]
> > -  AArch64/StandaloneMmCoreHobLib.c
> > -  AArch64/StandaloneMmCoreHobLibInternal.c
> > +[Sources.AARCH64, Sources.ARM]
> > +  Arm/StandaloneMmCoreHobLib.c
> > +  Arm/StandaloneMmCoreHobLibInternal.c
> >
> >   [Packages]
> >     MdePkg/MdePkg.dec
> > diff --git
> a/StandaloneMmPkg/Library/StandaloneMmMemLib/AArch64/StandaloneM
> mMemLibInternal.c
> b/StandaloneMmPkg/Library/StandaloneMmMemLib/ArmStandaloneMmMe
> mLibInternal.c
> > similarity index 86%
> > rename from
> StandaloneMmPkg/Library/StandaloneMmMemLib/AArch64/StandaloneMm
> MemLibInternal.c
> > rename to
> StandaloneMmPkg/Library/StandaloneMmMemLib/ArmStandaloneMmMemL
> ibInternal.c
> > index 4124959e04..fa7df46413 100644
> > ---
> a/StandaloneMmPkg/Library/StandaloneMmMemLib/AArch64/StandaloneM
> mMemLibInternal.c
> > +++
> b/StandaloneMmPkg/Library/StandaloneMmMemLib/ArmStandaloneMmMe
> mLibInternal.c
> > @@ -20,6 +20,13 @@
> >   //
> >   extern EFI_PHYSICAL_ADDRESS
> mMmMemLibInternalMaximumSupportAddress;
> >
> > +#ifdef MDE_CPU_AARCH64
> > +#define ARM_PHYSICAL_ADDRESS_BITS 36
> > +#endif
> > +#ifdef MDE_CPU_ARM
> > +#define ARM_PHYSICAL_ADDRESS_BITS 32
> > +#endif
> > +
> >   /**
> >     Calculate and save the maximum support address.
> >
> > @@ -31,7 +38,7 @@
> MmMemLibInternalCalculateMaximumSupportAddress (
> >   {
> >     UINT8        PhysicalAddressBits;
> >
> > -  PhysicalAddressBits = 36;
> > +  PhysicalAddressBits = ARM_PHYSICAL_ADDRESS_BITS;
> >
> >     //
> >     // Save the maximum support address in one global variable
> > diff --git
> a/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib
> .inf
> b/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib
> .inf
> > index 062b0d7a11..b29d97a746 100644
> > ---
> a/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib
> .inf
> > +++
> b/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib
> .inf
> > @@ -28,7 +28,7 @@
> >   #
> >   # The following information is for reference only and not required by the
> build tools.
> >   #
> > -#  VALID_ARCHITECTURES           = IA32 X64 AARCH64
> > +#  VALID_ARCHITECTURES           = IA32 X64 AARCH64 ARM
> >   #
> >
> >   [Sources.Common]
> > @@ -37,8 +37,8 @@
> >   [Sources.IA32, Sources.X64]
> >     X86StandaloneMmMemLibInternal.c
> >
> > -[Sources.AARCH64]
> > -  AArch64/StandaloneMmMemLibInternal.c
> > +[Sources.AARCH64, Sources.ARM]
> > +  ArmStandaloneMmMemLibInternal.c
> >
> >   [Packages]
> >     MdePkg/MdePkg.dec
> > diff --git
> a/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDepende
> ncy.inf
> b/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDepende
> ncy.inf
> > index a2a059c5d6..ffb2a6d083 100644
> > ---
> a/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDepende
> ncy.inf
> > +++
> b/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDepende
> ncy.inf
> > @@ -20,7 +20,7 @@
> >   #
> >   # The following information is for reference only and not required by the
> build tools.
> >   #
> > -#  VALID_ARCHITECTURES           = AARCH64
> > +#  VALID_ARCHITECTURES           = AARCH64|ARM
> >   #
> >   #
> >
> > diff --git a/StandaloneMmPkg/StandaloneMmPkg.dsc
> b/StandaloneMmPkg/StandaloneMmPkg.dsc
> > index 0c45df95e2..8012f93b7d 100644
> > --- a/StandaloneMmPkg/StandaloneMmPkg.dsc
> > +++ b/StandaloneMmPkg/StandaloneMmPkg.dsc
> > @@ -20,7 +20,7 @@
> >     PLATFORM_VERSION               = 1.0
> >     DSC_SPECIFICATION              = 0x00010011
> >     OUTPUT_DIRECTORY               = Build/StandaloneMm
> > -  SUPPORTED_ARCHITECTURES        = AARCH64|X64
> > +  SUPPORTED_ARCHITECTURES        = AARCH64|X64|ARM
> >     BUILD_TARGETS                  = DEBUG|RELEASE
> >     SKUID_IDENTIFIER               = DEFAULT
> >
> > @@ -60,7 +60,7 @@
> >
> StandaloneMmDriverEntryPoint|MdePkg/Library/StandaloneMmDriverEntryP
> oint/StandaloneMmDriverEntryPoint.inf
> >
> VariableMmDependency|StandaloneMmPkg/Library/VariableMmDependenc
> y/VariableMmDependency.inf
> >
> > -[LibraryClasses.AARCH64]
> > +[LibraryClasses.AARCH64, LibraryClasses.ARM]
> >     ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
> >
> StandaloneMmMmuLib|ArmPkg/Library/StandaloneMmMmuLib/ArmMmuSt
> andaloneMmLib.inf
> >     ArmSvcLib|ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf
> > @@ -118,8 +118,8 @@
> >
> StandaloneMmPkg/Library/StandaloneMmMemoryAllocationLib/Standalone
> MmMemoryAllocationLib.inf
> >
> StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependenc
> y.inf
> >
> > -[Components.AARCH64]
> > -
> StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.i
> nf
> > +[Components.AARCH64, Components.ARM]
> > +  StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf
> >
> StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/Standalone
> MmPeCoffExtraActionLib.inf
> >
> >
> ##############################################################
> #####################################
> > @@ -135,6 +135,10 @@
> >   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
> -march=armv8-a+nofp -mstrict-align
> >   GCC:*_*_*_CC_FLAGS = -mstrict-align
> >
> > +[BuildOptions.ARM]
> > +GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
> -march=armv7-a
> > +GCC:*_*_*_CC_FLAGS = -fno-stack-protector
> > +
> >   [BuildOptions.X64]
> >     MSFT:*_*_*_DLINK_FLAGS = /ALIGN:4096
> >     GCC:*_GCC*_*_DLINK_FLAGS = -z common-page-size=0x1000
> 
> 
> 
> 
> 

Re: [edk2-devel] [PATCH v4 5/5] StandaloneMmPkg: build for 32bit arm machines

[Ard Biesheuvel]

On Tue, 20 Jul 2021 at 04:01, gaoliming <gaoliming@byosoft.com.cn> wrote:
>
> Hi, all
>   This patch set has passed code review. How about merge it for this stable tag edk2 202108?
>

OK, I will pick these up. Would you mind creating the entry for the
release notes?


> Thanks
> Liming
> > -----邮件原件-----
> > 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Sami
> > Mujawar
> > 发送时间: 2021年5月19日 17:58
> > 收件人: Etienne Carriere <etienne.carriere@linaro.org>;
> > devel@edk2.groups.io
> > 抄送: Achin Gupta <achin.gupta@arm.com>; Ard Biesheuvel
> > <ardb+tianocore@kernel.org>; Jiewen Yao <jiewen.yao@intel.com>; Leif
> > Lindholm <leif@nuviainc.com>; Sughosh Ganu <sughosh.ganu@linaro.org>;
> > nd@arm.com
> > 主题: Re: [edk2-devel] [PATCH v4 5/5] StandaloneMmPkg: build for 32bit arm
> > machines
> >
> > Hi Etienn,
> >
> > This patch looks good to me.
> >
> > Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
> >
> > Regards,
> >
> > Sami Mujawar
> >
> > On 19/05/2021 08:14 AM, Etienne Carriere wrote:
> > > 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>
> > > ---
> > > Changes since v3:
> > > - Fix BuildOptions.ARM in StandaloneMmPkg.
> > > - Remove Cc tags.
> > >
> > > No change since v2
> > >
> > > Changes since v1:
> > > - ARM_SMC_ID_MM_COMMUNICATE 32b/64b agnostic helper ID is
> > defined
> > >    in ArmStdSmc.h (see 1st commit in this series) instead of being
> > >    local to EventHandle.c.
> > > - Fix void occurrence to VOID.
> > > - Fix path in StandaloneMmPkg/StandaloneMmPkg.dsc
> > > ---
> > >   StandaloneMmPkg/Core/StandaloneMmCore.inf
> > |  2 +-
> > >   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64
> > => }/EventHandle.c
> > |  5 +++--
> > >   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64
> > => }/StandaloneMmCpu.c
> > |  2 +-
> > >   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64
> > => }/StandaloneMmCpu.h
> > |  0
> > >   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64
> > => }/StandaloneMmCpu.inf
> > |  0
> > >   StandaloneMmPkg/Include/Library/{AArch64 =>
> > Arm}/StandaloneMmCoreEntryPoint.h
> > |  0
> > >   StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/{AArch64 =>
> > Arm}/CreateHobList.c                                  |  2 +-
> > >   StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/{AArch64 =>
> > Arm}/SetPermissions.c                                 |  2 +-
> > >   StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/{AArch64 =>
> > Arm}/StandaloneMmCoreEntryPoint.c                     | 16
> > ++++++++--------
> > >
> > StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCor
> > eEntryPoint.inf                                    | 14
> > +++++++-------
> > >   StandaloneMmPkg/Library/StandaloneMmCoreHobLib/{AArch64 =>
> > Arm}/StandaloneMmCoreHobLib.c                             |  0
> > >   StandaloneMmPkg/Library/StandaloneMmCoreHobLib/{AArch64 =>
> > Arm}/StandaloneMmCoreHobLibInternal.c                     |  0
> > >
> > StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreH
> > obLib.inf                                            |  8 ++++----
> > >
> > StandaloneMmPkg/Library/StandaloneMmMemLib/{AArch64/StandaloneMm
> > MemLibInternal.c => ArmStandaloneMmMemLibInternal.c} |  9 ++++++++-
> > >
> > StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.i
> > nf                                                    |  6
> > +++---
> > >
> > StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependenc
> > y.inf                                                |  2 +-
> > >   StandaloneMmPkg/StandaloneMmPkg.dsc
> > | 12 ++++++++----
> > >   17 files changed, 46 insertions(+), 34 deletions(-)
> > >
> > > diff --git a/StandaloneMmPkg/Core/StandaloneMmCore.inf
> > b/StandaloneMmPkg/Core/StandaloneMmCore.inf
> > > index 87bf6e9440..56042b7b39 100644
> > > --- a/StandaloneMmPkg/Core/StandaloneMmCore.inf
> > > +++ b/StandaloneMmPkg/Core/StandaloneMmCore.inf
> > > @@ -17,7 +17,7 @@
> > >     PI_SPECIFICATION_VERSION       = 0x00010032
> > >     ENTRY_POINT                    = StandaloneMmMain
> > >
> > > -#  VALID_ARCHITECTURES           = IA32 X64 AARCH64
> > > +#  VALID_ARCHITECTURES           = IA32 X64 AARCH64 ARM
> > >
> > >   [Sources]
> > >     StandaloneMmCore.c
> > > diff --git
> > a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
> > b/StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c
> > > similarity index 95%
> > > rename from
> > StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
> > > rename to StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c
> > > index 63fbe26642..165d696f99 100644
> > > ---
> > a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
> > > +++ b/StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c
> > > @@ -2,6 +2,7 @@
> > >
> > >     Copyright (c) 2016 HP Development Company, L.P.
> > >     Copyright (c) 2016 - 2021, Arm Limited. All rights reserved.
> > > +  Copyright (c) 2021, Linaro Limited
> > >
> > >     SPDX-License-Identifier: BSD-2-Clause-Patent
> > >
> > > @@ -92,8 +93,8 @@ PiMmStandaloneArmTfCpuDriverEntry (
> > >     // receipt of a synchronous MM request. Use the Event ID to
> > distinguish
> > >     // between synchronous and asynchronous events.
> > >     //
> > > -  if ((ARM_SMC_ID_MM_COMMUNICATE_AARCH64 != EventId) &&
> > > -      (ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ_AARCH64 !=
> > EventId)) {
> > > +  if ((ARM_SMC_ID_MM_COMMUNICATE != EventId) &&
> > > +      (ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ != EventId)) {
> > >       DEBUG ((DEBUG_INFO, "UnRecognized Event - 0x%x\n", EventId));
> > >       return EFI_INVALID_PARAMETER;
> > >     }
> > > diff --git
> > a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCp
> > u.c b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c
> > > similarity index 96%
> > > rename from
> > StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.
> > c
> > > rename to
> > StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c
> > > index d4590bcd19..10097f792f 100644
> > > ---
> > a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCp
> > u.c
> > > +++ b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c
> > > @@ -10,7 +10,7 @@
> > >
> > >   #include <Base.h>
> > >   #include <Pi/PiMmCis.h>
> > > -#include <Library/AArch64/StandaloneMmCoreEntryPoint.h>
> > > +#include <Library/Arm/StandaloneMmCoreEntryPoint.h>
> > >   #include <Library/DebugLib.h>
> > >   #include <Library/ArmSvcLib.h>
> > >   #include <Library/ArmLib.h>
> > > diff --git
> > a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCp
> > u.h b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.h
> > > similarity index 100%
> > > rename from
> > StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.
> > h
> > > rename to
> > StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.h
> > > diff --git
> > a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCp
> > u.inf b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf
> > > similarity index 100%
> > > rename from
> > StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.i
> > nf
> > > rename to
> > StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf
> > > diff --git
> > a/StandaloneMmPkg/Include/Library/AArch64/StandaloneMmCoreEntryPoin
> > t.h
> > b/StandaloneMmPkg/Include/Library/Arm/StandaloneMmCoreEntryPoint.h
> > > similarity index 100%
> > > rename from
> > StandaloneMmPkg/Include/Library/AArch64/StandaloneMmCoreEntryPoint.h
> > > rename to
> > StandaloneMmPkg/Include/Library/Arm/StandaloneMmCoreEntryPoint.h
> > > diff --git
> > a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Create
> > HobList.c
> > b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHob
> > List.c
> > > similarity index 97%
> > > rename from
> > StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/CreateHo
> > bList.c
> > > rename to
> > StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHobLis
> > t.c
> > > index 4d4cf3d5ff..85f8194687 100644
> > > ---
> > a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Create
> > HobList.c
> > > +++
> > b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHob
> > List.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/SetPer
> > missions.c
> > b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPermissi
> > ons.c
> > > similarity index 96%
> > > rename from
> > StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/SetPermi
> > ssions.c
> > > rename to
> > StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPermissio
> > ns.c
> > > index 4a380df4a6..cd4b90823e 100644
> > > ---
> > a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/SetPer
> > missions.c
> > > +++
> > b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPermissi
> > ons.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/Standa
> > loneMmCoreEntryPoint.c
> > b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/Standalone
> > MmCoreEntryPoint.c
> > > similarity index 94%
> > > rename from
> > StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Standalo
> > neMmCoreEntryPoint.c
> > > rename to
> > StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/StandaloneM
> > mCoreEntryPoint.c
> > > index b445d6942e..49cf51a789 100644
> > > ---
> > a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Standa
> > loneMmCoreEntryPoint.c
> > > +++
> > b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/Standalone
> > MmCoreEntryPoint.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/StandaloneMm
> > CoreEntryPoint.inf
> > b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMm
> > CoreEntryPoint.inf
> > > index 4fa426f58e..1762586cfa 100644
> > > ---
> > a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMm
> > CoreEntryPoint.inf
> > > +++
> > b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMm
> > CoreEntryPoint.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]
> > > diff --git
> > a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/Standalon
> > eMmCoreHobLib.c
> > b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneM
> > mCoreHobLib.c
> > > similarity index 100%
> > > rename from
> > StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/Standalone
> > MmCoreHobLib.c
> > > rename to
> > StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneMmC
> > oreHobLib.c
> > > diff --git
> > a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/Standalon
> > eMmCoreHobLibInternal.c
> > b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneM
> > mCoreHobLibInternal.c
> > > similarity index 100%
> > > rename from
> > StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/Standalone
> > MmCoreHobLibInternal.c
> > > rename to
> > StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneMmC
> > oreHobLibInternal.c
> > > diff --git
> > a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCore
> > HobLib.inf
> > b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCore
> > HobLib.inf
> > > index a2559920e8..34ed536480 100644
> > > ---
> > a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCore
> > HobLib.inf
> > > +++
> > b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCore
> > HobLib.inf
> > > @@ -22,7 +22,7 @@
> > >     LIBRARY_CLASS                  =
> > HobLib|MM_CORE_STANDALONE
> > >
> > >   #
> > > -#  VALID_ARCHITECTURES           = X64 AARCH64
> > > +#  VALID_ARCHITECTURES           = X64 AARCH64 ARM
> > >   #
> > >   [Sources.common]
> > >     Common.c
> > > @@ -30,9 +30,9 @@
> > >   [Sources.X64]
> > >     X64/StandaloneMmCoreHobLib.c
> > >
> > > -[Sources.AARCH64]
> > > -  AArch64/StandaloneMmCoreHobLib.c
> > > -  AArch64/StandaloneMmCoreHobLibInternal.c
> > > +[Sources.AARCH64, Sources.ARM]
> > > +  Arm/StandaloneMmCoreHobLib.c
> > > +  Arm/StandaloneMmCoreHobLibInternal.c
> > >
> > >   [Packages]
> > >     MdePkg/MdePkg.dec
> > > diff --git
> > a/StandaloneMmPkg/Library/StandaloneMmMemLib/AArch64/StandaloneM
> > mMemLibInternal.c
> > b/StandaloneMmPkg/Library/StandaloneMmMemLib/ArmStandaloneMmMe
> > mLibInternal.c
> > > similarity index 86%
> > > rename from
> > StandaloneMmPkg/Library/StandaloneMmMemLib/AArch64/StandaloneMm
> > MemLibInternal.c
> > > rename to
> > StandaloneMmPkg/Library/StandaloneMmMemLib/ArmStandaloneMmMemL
> > ibInternal.c
> > > index 4124959e04..fa7df46413 100644
> > > ---
> > a/StandaloneMmPkg/Library/StandaloneMmMemLib/AArch64/StandaloneM
> > mMemLibInternal.c
> > > +++
> > b/StandaloneMmPkg/Library/StandaloneMmMemLib/ArmStandaloneMmMe
> > mLibInternal.c
> > > @@ -20,6 +20,13 @@
> > >   //
> > >   extern EFI_PHYSICAL_ADDRESS
> > mMmMemLibInternalMaximumSupportAddress;
> > >
> > > +#ifdef MDE_CPU_AARCH64
> > > +#define ARM_PHYSICAL_ADDRESS_BITS 36
> > > +#endif
> > > +#ifdef MDE_CPU_ARM
> > > +#define ARM_PHYSICAL_ADDRESS_BITS 32
> > > +#endif
> > > +
> > >   /**
> > >     Calculate and save the maximum support address.
> > >
> > > @@ -31,7 +38,7 @@
> > MmMemLibInternalCalculateMaximumSupportAddress (
> > >   {
> > >     UINT8        PhysicalAddressBits;
> > >
> > > -  PhysicalAddressBits = 36;
> > > +  PhysicalAddressBits = ARM_PHYSICAL_ADDRESS_BITS;
> > >
> > >     //
> > >     // Save the maximum support address in one global variable
> > > diff --git
> > a/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib
> > .inf
> > b/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib
> > .inf
> > > index 062b0d7a11..b29d97a746 100644
> > > ---
> > a/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib
> > .inf
> > > +++
> > b/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib
> > .inf
> > > @@ -28,7 +28,7 @@
> > >   #
> > >   # The following information is for reference only and not required by the
> > build tools.
> > >   #
> > > -#  VALID_ARCHITECTURES           = IA32 X64 AARCH64
> > > +#  VALID_ARCHITECTURES           = IA32 X64 AARCH64 ARM
> > >   #
> > >
> > >   [Sources.Common]
> > > @@ -37,8 +37,8 @@
> > >   [Sources.IA32, Sources.X64]
> > >     X86StandaloneMmMemLibInternal.c
> > >
> > > -[Sources.AARCH64]
> > > -  AArch64/StandaloneMmMemLibInternal.c
> > > +[Sources.AARCH64, Sources.ARM]
> > > +  ArmStandaloneMmMemLibInternal.c
> > >
> > >   [Packages]
> > >     MdePkg/MdePkg.dec
> > > diff --git
> > a/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDepende
> > ncy.inf
> > b/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDepende
> > ncy.inf
> > > index a2a059c5d6..ffb2a6d083 100644
> > > ---
> > a/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDepende
> > ncy.inf
> > > +++
> > b/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDepende
> > ncy.inf
> > > @@ -20,7 +20,7 @@
> > >   #
> > >   # The following information is for reference only and not required by the
> > build tools.
> > >   #
> > > -#  VALID_ARCHITECTURES           = AARCH64
> > > +#  VALID_ARCHITECTURES           = AARCH64|ARM
> > >   #
> > >   #
> > >
> > > diff --git a/StandaloneMmPkg/StandaloneMmPkg.dsc
> > b/StandaloneMmPkg/StandaloneMmPkg.dsc
> > > index 0c45df95e2..8012f93b7d 100644
> > > --- a/StandaloneMmPkg/StandaloneMmPkg.dsc
> > > +++ b/StandaloneMmPkg/StandaloneMmPkg.dsc
> > > @@ -20,7 +20,7 @@
> > >     PLATFORM_VERSION               = 1.0
> > >     DSC_SPECIFICATION              = 0x00010011
> > >     OUTPUT_DIRECTORY               = Build/StandaloneMm
> > > -  SUPPORTED_ARCHITECTURES        = AARCH64|X64
> > > +  SUPPORTED_ARCHITECTURES        = AARCH64|X64|ARM
> > >     BUILD_TARGETS                  = DEBUG|RELEASE
> > >     SKUID_IDENTIFIER               = DEFAULT
> > >
> > > @@ -60,7 +60,7 @@
> > >
> > StandaloneMmDriverEntryPoint|MdePkg/Library/StandaloneMmDriverEntryP
> > oint/StandaloneMmDriverEntryPoint.inf
> > >
> > VariableMmDependency|StandaloneMmPkg/Library/VariableMmDependenc
> > y/VariableMmDependency.inf
> > >
> > > -[LibraryClasses.AARCH64]
> > > +[LibraryClasses.AARCH64, LibraryClasses.ARM]
> > >     ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
> > >
> > StandaloneMmMmuLib|ArmPkg/Library/StandaloneMmMmuLib/ArmMmuSt
> > andaloneMmLib.inf
> > >     ArmSvcLib|ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf
> > > @@ -118,8 +118,8 @@
> > >
> > StandaloneMmPkg/Library/StandaloneMmMemoryAllocationLib/Standalone
> > MmMemoryAllocationLib.inf
> > >
> > StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependenc
> > y.inf
> > >
> > > -[Components.AARCH64]
> > > -
> > StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.i
> > nf
> > > +[Components.AARCH64, Components.ARM]
> > > +  StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf
> > >
> > StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/Standalone
> > MmPeCoffExtraActionLib.inf
> > >
> > >
> > ##############################################################
> > #####################################
> > > @@ -135,6 +135,10 @@
> > >   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
> > -march=armv8-a+nofp -mstrict-align
> > >   GCC:*_*_*_CC_FLAGS = -mstrict-align
> > >
> > > +[BuildOptions.ARM]
> > > +GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
> > -march=armv7-a
> > > +GCC:*_*_*_CC_FLAGS = -fno-stack-protector
> > > +
> > >   [BuildOptions.X64]
> > >     MSFT:*_*_*_DLINK_FLAGS = /ALIGN:4096
> > >     GCC:*_GCC*_*_DLINK_FLAGS = -z common-page-size=0x1000
> >
> >
> >
> >
> >
>
>
>
>
>
> 
>
>

回复: [edk2-devel] [PATCH v4 5/5] StandaloneMmPkg: build for 32bit arm machines

[gaoliming]

Ard:
  Thanks! I have added this feature into https://github.com/tianocore/tianocore.github.io/wiki/EDK-II-Release-Planning. 

Thanks
Liming
> -----邮件原件-----
> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Ard
> Biesheuvel
> 发送时间: 2021年7月20日 15:46
> 收件人: edk2-devel-groups-io <devel@edk2.groups.io>; Liming Gao (Byosoft
> address) <gaoliming@byosoft.com.cn>
> 抄送: Sami Mujawar <sami.mujawar@arm.com>; Etienne Carriere
> <etienne.carriere@linaro.org>; Achin Gupta <achin.gupta@arm.com>; Ard
> Biesheuvel <ardb+tianocore@kernel.org>; Jiewen Yao
> <jiewen.yao@intel.com>; Leif Lindholm <leif@nuviainc.com>; Sughosh Ganu
> <sughosh.ganu@linaro.org>; nd <nd@arm.com>
> 主题: Re: [edk2-devel] [PATCH v4 5/5] StandaloneMmPkg: build for 32bit arm
> machines
> 
> On Tue, 20 Jul 2021 at 04:01, gaoliming <gaoliming@byosoft.com.cn> wrote:
> >
> > Hi, all
> >   This patch set has passed code review. How about merge it for this
> stable tag edk2 202108?
> >
> 
> OK, I will pick these up. Would you mind creating the entry for the
> release notes?
> 
> 
> > Thanks
> > Liming
> > > -----邮件原件-----
> > > 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Sami
> > > Mujawar
> > > 发送时间: 2021年5月19日 17:58
> > > 收件人: Etienne Carriere <etienne.carriere@linaro.org>;
> > > devel@edk2.groups.io
> > > 抄送: Achin Gupta <achin.gupta@arm.com>; Ard Biesheuvel
> > > <ardb+tianocore@kernel.org>; Jiewen Yao <jiewen.yao@intel.com>; Leif
> > > Lindholm <leif@nuviainc.com>; Sughosh Ganu
> <sughosh.ganu@linaro.org>;
> > > nd@arm.com
> > > 主题: Re: [edk2-devel] [PATCH v4 5/5] StandaloneMmPkg: build for 32bit
> arm
> > > machines
> > >
> > > Hi Etienn,
> > >
> > > This patch looks good to me.
> > >
> > > Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
> > >
> > > Regards,
> > >
> > > Sami Mujawar
> > >
> > > On 19/05/2021 08:14 AM, Etienne Carriere wrote:
> > > > 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>
> > > > ---
> > > > Changes since v3:
> > > > - Fix BuildOptions.ARM in StandaloneMmPkg.
> > > > - Remove Cc tags.
> > > >
> > > > No change since v2
> > > >
> > > > Changes since v1:
> > > > - ARM_SMC_ID_MM_COMMUNICATE 32b/64b agnostic helper ID is
> > > defined
> > > >    in ArmStdSmc.h (see 1st commit in this series) instead of being
> > > >    local to EventHandle.c.
> > > > - Fix void occurrence to VOID.
> > > > - Fix path in StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > ---
> > > >   StandaloneMmPkg/Core/StandaloneMmCore.inf
> > > |  2 +-
> > > >   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64
> > > => }/EventHandle.c
> > > |  5 +++--
> > > >   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64
> > > => }/StandaloneMmCpu.c
> > > |  2 +-
> > > >   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64
> > > => }/StandaloneMmCpu.h
> > > |  0
> > > >   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64
> > > => }/StandaloneMmCpu.inf
> > > |  0
> > > >   StandaloneMmPkg/Include/Library/{AArch64 =>
> > > Arm}/StandaloneMmCoreEntryPoint.h
> > > |  0
> > > >   StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/{AArch64
> =>
> > > Arm}/CreateHobList.c                                  |  2 +-
> > > >   StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/{AArch64
> =>
> > > Arm}/SetPermissions.c                                 |  2 +-
> > > >   StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/{AArch64
> =>
> > > Arm}/StandaloneMmCoreEntryPoint.c                     | 16
> > > ++++++++--------
> > > >
> > >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCor
> > > eEntryPoint.inf                                    | 14
> > > +++++++-------
> > > >   StandaloneMmPkg/Library/StandaloneMmCoreHobLib/{AArch64 =>
> > > Arm}/StandaloneMmCoreHobLib.c                             |
> 0
> > > >   StandaloneMmPkg/Library/StandaloneMmCoreHobLib/{AArch64 =>
> > > Arm}/StandaloneMmCoreHobLibInternal.c                     |  0
> > > >
> > >
> StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreH
> > > obLib.inf                                            |  8
> ++++----
> > > >
> > >
> StandaloneMmPkg/Library/StandaloneMmMemLib/{AArch64/StandaloneMm
> > > MemLibInternal.c => ArmStandaloneMmMemLibInternal.c} |  9
> ++++++++-
> > > >
> > >
> StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.i
> > > nf                                                    |  6
> > > +++---
> > > >
> > >
> StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependenc
> > > y.inf                                                |  2 +-
> > > >   StandaloneMmPkg/StandaloneMmPkg.dsc
> > > | 12 ++++++++----
> > > >   17 files changed, 46 insertions(+), 34 deletions(-)
> > > >
> > > > diff --git a/StandaloneMmPkg/Core/StandaloneMmCore.inf
> > > b/StandaloneMmPkg/Core/StandaloneMmCore.inf
> > > > index 87bf6e9440..56042b7b39 100644
> > > > --- a/StandaloneMmPkg/Core/StandaloneMmCore.inf
> > > > +++ b/StandaloneMmPkg/Core/StandaloneMmCore.inf
> > > > @@ -17,7 +17,7 @@
> > > >     PI_SPECIFICATION_VERSION       = 0x00010032
> > > >     ENTRY_POINT                    = StandaloneMmMain
> > > >
> > > > -#  VALID_ARCHITECTURES           = IA32 X64 AARCH64
> > > > +#  VALID_ARCHITECTURES           = IA32 X64 AARCH64 ARM
> > > >
> > > >   [Sources]
> > > >     StandaloneMmCore.c
> > > > diff --git
> > > a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
> > > b/StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c
> > > > similarity index 95%
> > > > rename from
> > > StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
> > > > rename to
> StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c
> > > > index 63fbe26642..165d696f99 100644
> > > > ---
> > > a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
> > > > +++ b/StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c
> > > > @@ -2,6 +2,7 @@
> > > >
> > > >     Copyright (c) 2016 HP Development Company, L.P.
> > > >     Copyright (c) 2016 - 2021, Arm Limited. All rights reserved.
> > > > +  Copyright (c) 2021, Linaro Limited
> > > >
> > > >     SPDX-License-Identifier: BSD-2-Clause-Patent
> > > >
> > > > @@ -92,8 +93,8 @@ PiMmStandaloneArmTfCpuDriverEntry (
> > > >     // receipt of a synchronous MM request. Use the Event ID to
> > > distinguish
> > > >     // between synchronous and asynchronous events.
> > > >     //
> > > > -  if ((ARM_SMC_ID_MM_COMMUNICATE_AARCH64 != EventId) &&
> > > > -      (ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ_AARCH64 !=
> > > EventId)) {
> > > > +  if ((ARM_SMC_ID_MM_COMMUNICATE != EventId) &&
> > > > +      (ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ != EventId)) {
> > > >       DEBUG ((DEBUG_INFO, "UnRecognized Event - 0x%x\n",
> EventId));
> > > >       return EFI_INVALID_PARAMETER;
> > > >     }
> > > > diff --git
> > >
> a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCp
> > > u.c
> b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c
> > > > similarity index 96%
> > > > rename from
> > >
> StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.
> > > c
> > > > rename to
> > > StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c
> > > > index d4590bcd19..10097f792f 100644
> > > > ---
> > >
> a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCp
> > > u.c
> > > > +++
> b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c
> > > > @@ -10,7 +10,7 @@
> > > >
> > > >   #include <Base.h>
> > > >   #include <Pi/PiMmCis.h>
> > > > -#include <Library/AArch64/StandaloneMmCoreEntryPoint.h>
> > > > +#include <Library/Arm/StandaloneMmCoreEntryPoint.h>
> > > >   #include <Library/DebugLib.h>
> > > >   #include <Library/ArmSvcLib.h>
> > > >   #include <Library/ArmLib.h>
> > > > diff --git
> > >
> a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCp
> > > u.h
> b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.h
> > > > similarity index 100%
> > > > rename from
> > >
> StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.
> > > h
> > > > rename to
> > > StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.h
> > > > diff --git
> > >
> a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCp
> > > u.inf
> b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf
> > > > similarity index 100%
> > > > rename from
> > >
> StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.i
> > > nf
> > > > rename to
> > > StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf
> > > > diff --git
> > >
> a/StandaloneMmPkg/Include/Library/AArch64/StandaloneMmCoreEntryPoin
> > > t.h
> > >
> b/StandaloneMmPkg/Include/Library/Arm/StandaloneMmCoreEntryPoint.h
> > > > similarity index 100%
> > > > rename from
> > >
> StandaloneMmPkg/Include/Library/AArch64/StandaloneMmCoreEntryPoint.h
> > > > rename to
> > > StandaloneMmPkg/Include/Library/Arm/StandaloneMmCoreEntryPoint.h
> > > > diff --git
> > >
> a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Create
> > > HobList.c
> > >
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHob
> > > List.c
> > > > similarity index 97%
> > > > rename from
> > >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/CreateHo
> > > bList.c
> > > > rename to
> > >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHobLis
> > > t.c
> > > > index 4d4cf3d5ff..85f8194687 100644
> > > > ---
> > >
> a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Create
> > > HobList.c
> > > > +++
> > >
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHob
> > > List.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/SetPer
> > > missions.c
> > >
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPermissi
> > > ons.c
> > > > similarity index 96%
> > > > rename from
> > >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/SetPermi
> > > ssions.c
> > > > rename to
> > >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPermissio
> > > ns.c
> > > > index 4a380df4a6..cd4b90823e 100644
> > > > ---
> > >
> a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/SetPer
> > > missions.c
> > > > +++
> > >
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPermissi
> > > ons.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/Standa
> > > loneMmCoreEntryPoint.c
> > >
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/Standalone
> > > MmCoreEntryPoint.c
> > > > similarity index 94%
> > > > rename from
> > >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Standalo
> > > neMmCoreEntryPoint.c
> > > > rename to
> > >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/StandaloneM
> > > mCoreEntryPoint.c
> > > > index b445d6942e..49cf51a789 100644
> > > > ---
> > >
> a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Standa
> > > loneMmCoreEntryPoint.c
> > > > +++
> > >
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/Standalone
> > > MmCoreEntryPoint.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/StandaloneMm
> > > CoreEntryPoint.inf
> > >
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMm
> > > CoreEntryPoint.inf
> > > > index 4fa426f58e..1762586cfa 100644
> > > > ---
> > >
> a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMm
> > > CoreEntryPoint.inf
> > > > +++
> > >
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMm
> > > CoreEntryPoint.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]
> > > > diff --git
> > >
> a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/Standalon
> > > eMmCoreHobLib.c
> > >
> b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneM
> > > mCoreHobLib.c
> > > > similarity index 100%
> > > > rename from
> > >
> StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/Standalone
> > > MmCoreHobLib.c
> > > > rename to
> > >
> StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneMmC
> > > oreHobLib.c
> > > > diff --git
> > >
> a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/Standalon
> > > eMmCoreHobLibInternal.c
> > >
> b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneM
> > > mCoreHobLibInternal.c
> > > > similarity index 100%
> > > > rename from
> > >
> StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/Standalone
> > > MmCoreHobLibInternal.c
> > > > rename to
> > >
> StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneMmC
> > > oreHobLibInternal.c
> > > > diff --git
> > >
> a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCore
> > > HobLib.inf
> > >
> b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCore
> > > HobLib.inf
> > > > index a2559920e8..34ed536480 100644
> > > > ---
> > >
> a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCore
> > > HobLib.inf
> > > > +++
> > >
> b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCore
> > > HobLib.inf
> > > > @@ -22,7 +22,7 @@
> > > >     LIBRARY_CLASS                  =
> > > HobLib|MM_CORE_STANDALONE
> > > >
> > > >   #
> > > > -#  VALID_ARCHITECTURES           = X64 AARCH64
> > > > +#  VALID_ARCHITECTURES           = X64 AARCH64 ARM
> > > >   #
> > > >   [Sources.common]
> > > >     Common.c
> > > > @@ -30,9 +30,9 @@
> > > >   [Sources.X64]
> > > >     X64/StandaloneMmCoreHobLib.c
> > > >
> > > > -[Sources.AARCH64]
> > > > -  AArch64/StandaloneMmCoreHobLib.c
> > > > -  AArch64/StandaloneMmCoreHobLibInternal.c
> > > > +[Sources.AARCH64, Sources.ARM]
> > > > +  Arm/StandaloneMmCoreHobLib.c
> > > > +  Arm/StandaloneMmCoreHobLibInternal.c
> > > >
> > > >   [Packages]
> > > >     MdePkg/MdePkg.dec
> > > > diff --git
> > >
> a/StandaloneMmPkg/Library/StandaloneMmMemLib/AArch64/StandaloneM
> > > mMemLibInternal.c
> > >
> b/StandaloneMmPkg/Library/StandaloneMmMemLib/ArmStandaloneMmMe
> > > mLibInternal.c
> > > > similarity index 86%
> > > > rename from
> > >
> StandaloneMmPkg/Library/StandaloneMmMemLib/AArch64/StandaloneMm
> > > MemLibInternal.c
> > > > rename to
> > >
> StandaloneMmPkg/Library/StandaloneMmMemLib/ArmStandaloneMmMemL
> > > ibInternal.c
> > > > index 4124959e04..fa7df46413 100644
> > > > ---
> > >
> a/StandaloneMmPkg/Library/StandaloneMmMemLib/AArch64/StandaloneM
> > > mMemLibInternal.c
> > > > +++
> > >
> b/StandaloneMmPkg/Library/StandaloneMmMemLib/ArmStandaloneMmMe
> > > mLibInternal.c
> > > > @@ -20,6 +20,13 @@
> > > >   //
> > > >   extern EFI_PHYSICAL_ADDRESS
> > > mMmMemLibInternalMaximumSupportAddress;
> > > >
> > > > +#ifdef MDE_CPU_AARCH64
> > > > +#define ARM_PHYSICAL_ADDRESS_BITS 36
> > > > +#endif
> > > > +#ifdef MDE_CPU_ARM
> > > > +#define ARM_PHYSICAL_ADDRESS_BITS 32
> > > > +#endif
> > > > +
> > > >   /**
> > > >     Calculate and save the maximum support address.
> > > >
> > > > @@ -31,7 +38,7 @@
> > > MmMemLibInternalCalculateMaximumSupportAddress (
> > > >   {
> > > >     UINT8        PhysicalAddressBits;
> > > >
> > > > -  PhysicalAddressBits = 36;
> > > > +  PhysicalAddressBits = ARM_PHYSICAL_ADDRESS_BITS;
> > > >
> > > >     //
> > > >     // Save the maximum support address in one global variable
> > > > diff --git
> > >
> a/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib
> > > .inf
> > >
> b/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib
> > > .inf
> > > > index 062b0d7a11..b29d97a746 100644
> > > > ---
> > >
> a/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib
> > > .inf
> > > > +++
> > >
> b/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib
> > > .inf
> > > > @@ -28,7 +28,7 @@
> > > >   #
> > > >   # The following information is for reference only and not required by
> the
> > > build tools.
> > > >   #
> > > > -#  VALID_ARCHITECTURES           = IA32 X64 AARCH64
> > > > +#  VALID_ARCHITECTURES           = IA32 X64 AARCH64 ARM
> > > >   #
> > > >
> > > >   [Sources.Common]
> > > > @@ -37,8 +37,8 @@
> > > >   [Sources.IA32, Sources.X64]
> > > >     X86StandaloneMmMemLibInternal.c
> > > >
> > > > -[Sources.AARCH64]
> > > > -  AArch64/StandaloneMmMemLibInternal.c
> > > > +[Sources.AARCH64, Sources.ARM]
> > > > +  ArmStandaloneMmMemLibInternal.c
> > > >
> > > >   [Packages]
> > > >     MdePkg/MdePkg.dec
> > > > diff --git
> > >
> a/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDepende
> > > ncy.inf
> > >
> b/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDepende
> > > ncy.inf
> > > > index a2a059c5d6..ffb2a6d083 100644
> > > > ---
> > >
> a/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDepende
> > > ncy.inf
> > > > +++
> > >
> b/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDepende
> > > ncy.inf
> > > > @@ -20,7 +20,7 @@
> > > >   #
> > > >   # The following information is for reference only and not required by
> the
> > > build tools.
> > > >   #
> > > > -#  VALID_ARCHITECTURES           = AARCH64
> > > > +#  VALID_ARCHITECTURES           = AARCH64|ARM
> > > >   #
> > > >   #
> > > >
> > > > diff --git a/StandaloneMmPkg/StandaloneMmPkg.dsc
> > > b/StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > index 0c45df95e2..8012f93b7d 100644
> > > > --- a/StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > +++ b/StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > @@ -20,7 +20,7 @@
> > > >     PLATFORM_VERSION               = 1.0
> > > >     DSC_SPECIFICATION              = 0x00010011
> > > >     OUTPUT_DIRECTORY               = Build/StandaloneMm
> > > > -  SUPPORTED_ARCHITECTURES        = AARCH64|X64
> > > > +  SUPPORTED_ARCHITECTURES        = AARCH64|X64|ARM
> > > >     BUILD_TARGETS                  = DEBUG|RELEASE
> > > >     SKUID_IDENTIFIER               = DEFAULT
> > > >
> > > > @@ -60,7 +60,7 @@
> > > >
> > >
> StandaloneMmDriverEntryPoint|MdePkg/Library/StandaloneMmDriverEntryP
> > > oint/StandaloneMmDriverEntryPoint.inf
> > > >
> > >
> VariableMmDependency|StandaloneMmPkg/Library/VariableMmDependenc
> > > y/VariableMmDependency.inf
> > > >
> > > > -[LibraryClasses.AARCH64]
> > > > +[LibraryClasses.AARCH64, LibraryClasses.ARM]
> > > >     ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
> > > >
> > >
> StandaloneMmMmuLib|ArmPkg/Library/StandaloneMmMmuLib/ArmMmuSt
> > > andaloneMmLib.inf
> > > >     ArmSvcLib|ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf
> > > > @@ -118,8 +118,8 @@
> > > >
> > >
> StandaloneMmPkg/Library/StandaloneMmMemoryAllocationLib/Standalone
> > > MmMemoryAllocationLib.inf
> > > >
> > >
> StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependenc
> > > y.inf
> > > >
> > > > -[Components.AARCH64]
> > > > -
> > >
> StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.i
> > > nf
> > > > +[Components.AARCH64, Components.ARM]
> > > > +
> StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf
> > > >
> > >
> StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/Standalone
> > > MmPeCoffExtraActionLib.inf
> > > >
> > > >
> > >
> ##############################################################
> > > #####################################
> > > > @@ -135,6 +135,10 @@
> > > >   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
> > > -march=armv8-a+nofp -mstrict-align
> > > >   GCC:*_*_*_CC_FLAGS = -mstrict-align
> > > >
> > > > +[BuildOptions.ARM]
> > > > +GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
> > > -march=armv7-a
> > > > +GCC:*_*_*_CC_FLAGS = -fno-stack-protector
> > > > +
> > > >   [BuildOptions.X64]
> > > >     MSFT:*_*_*_DLINK_FLAGS = /ALIGN:4096
> > > >     GCC:*_GCC*_*_DLINK_FLAGS = -z common-page-size=0x1000
> > >
> > >
> > >
> > >
> > >
> >
> >
> >
> >
> >
> >
> >
> >
> 
> 
> 
> 

回复: [edk2-devel] [PATCH v4 5/5] StandaloneMmPkg: build for 32bit arm machines

[gaoliming]

Ard and Sami:
  Will you help merge this patch set for 202108 stable tag?

Thanks
Liming
> -----邮件原件-----
> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 gaoliming
> 发送时间: 2021年7月20日 17:21
> 收件人: devel@edk2.groups.io; ardb@kernel.org
> 抄送: 'Sami Mujawar' <sami.mujawar@arm.com>; 'Etienne Carriere'
> <etienne.carriere@linaro.org>; 'Achin Gupta' <achin.gupta@arm.com>; 'Ard
> Biesheuvel' <ardb+tianocore@kernel.org>; 'Jiewen Yao'
> <jiewen.yao@intel.com>; 'Leif Lindholm' <leif@nuviainc.com>; 'Sughosh
> Ganu' <sughosh.ganu@linaro.org>; 'nd' <nd@arm.com>
> 主题: 回复: [edk2-devel] [PATCH v4 5/5] StandaloneMmPkg: build for 32bit
> arm machines
> 
> Ard:
>   Thanks! I have added this feature into
> https://github.com/tianocore/tianocore.github.io/wiki/EDK-II-Release-Planni
> ng.
> 
> Thanks
> Liming
> > -----邮件原件-----
> > 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Ard
> > Biesheuvel
> > 发送时间: 2021年7月20日 15:46
> > 收件人: edk2-devel-groups-io <devel@edk2.groups.io>; Liming Gao
> (Byosoft
> > address) <gaoliming@byosoft.com.cn>
> > 抄送: Sami Mujawar <sami.mujawar@arm.com>; Etienne Carriere
> > <etienne.carriere@linaro.org>; Achin Gupta <achin.gupta@arm.com>; Ard
> > Biesheuvel <ardb+tianocore@kernel.org>; Jiewen Yao
> > <jiewen.yao@intel.com>; Leif Lindholm <leif@nuviainc.com>; Sughosh
> Ganu
> > <sughosh.ganu@linaro.org>; nd <nd@arm.com>
> > 主题: Re: [edk2-devel] [PATCH v4 5/5] StandaloneMmPkg: build for 32bit
> arm
> > machines
> >
> > On Tue, 20 Jul 2021 at 04:01, gaoliming <gaoliming@byosoft.com.cn>
> wrote:
> > >
> > > Hi, all
> > >   This patch set has passed code review. How about merge it for this
> > stable tag edk2 202108?
> > >
> >
> > OK, I will pick these up. Would you mind creating the entry for the
> > release notes?
> >
> >
> > > Thanks
> > > Liming
> > > > -----邮件原件-----
> > > > 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Sami
> > > > Mujawar
> > > > 发送时间: 2021年5月19日 17:58
> > > > 收件人: Etienne Carriere <etienne.carriere@linaro.org>;
> > > > devel@edk2.groups.io
> > > > 抄送: Achin Gupta <achin.gupta@arm.com>; Ard Biesheuvel
> > > > <ardb+tianocore@kernel.org>; Jiewen Yao <jiewen.yao@intel.com>;
> Leif
> > > > Lindholm <leif@nuviainc.com>; Sughosh Ganu
> > <sughosh.ganu@linaro.org>;
> > > > nd@arm.com
> > > > 主题: Re: [edk2-devel] [PATCH v4 5/5] StandaloneMmPkg: build for
> 32bit
> > arm
> > > > machines
> > > >
> > > > Hi Etienn,
> > > >
> > > > This patch looks good to me.
> > > >
> > > > Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
> > > >
> > > > Regards,
> > > >
> > > > Sami Mujawar
> > > >
> > > > On 19/05/2021 08:14 AM, Etienne Carriere wrote:
> > > > > 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>
> > > > > ---
> > > > > Changes since v3:
> > > > > - Fix BuildOptions.ARM in StandaloneMmPkg.
> > > > > - Remove Cc tags.
> > > > >
> > > > > No change since v2
> > > > >
> > > > > Changes since v1:
> > > > > - ARM_SMC_ID_MM_COMMUNICATE 32b/64b agnostic helper ID is
> > > > defined
> > > > >    in ArmStdSmc.h (see 1st commit in this series) instead of being
> > > > >    local to EventHandle.c.
> > > > > - Fix void occurrence to VOID.
> > > > > - Fix path in StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > > ---
> > > > >   StandaloneMmPkg/Core/StandaloneMmCore.inf
> > > > |  2 +-
> > > > >   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64
> > > > => }/EventHandle.c
> > > > |  5 +++--
> > > > >   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64
> > > > => }/StandaloneMmCpu.c
> > > > |  2 +-
> > > > >   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64
> > > > => }/StandaloneMmCpu.h
> > > > |  0
> > > > >   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64
> > > > => }/StandaloneMmCpu.inf
> > > > |  0
> > > > >   StandaloneMmPkg/Include/Library/{AArch64 =>
> > > > Arm}/StandaloneMmCoreEntryPoint.h
> > > > |  0
> > > > >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/{AArch64
> > =>
> > > > Arm}/CreateHobList.c                                  |  2 +-
> > > > >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/{AArch64
> > =>
> > > > Arm}/SetPermissions.c                                 |  2 +-
> > > > >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/{AArch64
> > =>
> > > > Arm}/StandaloneMmCoreEntryPoint.c                     | 16
> > > > ++++++++--------
> > > > >
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCor
> > > > eEntryPoint.inf                                    | 14
> > > > +++++++-------
> > > > >   StandaloneMmPkg/Library/StandaloneMmCoreHobLib/{AArch64
> =>
> > > > Arm}/StandaloneMmCoreHobLib.c                             |
> > 0
> > > > >   StandaloneMmPkg/Library/StandaloneMmCoreHobLib/{AArch64
> =>
> > > > Arm}/StandaloneMmCoreHobLibInternal.c                     |
> 0
> > > > >
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreH
> > > > obLib.inf                                            |  8
> > ++++----
> > > > >
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmMemLib/{AArch64/StandaloneMm
> > > > MemLibInternal.c => ArmStandaloneMmMemLibInternal.c} |  9
> > ++++++++-
> > > > >
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.i
> > > > nf                                                    |  6
> > > > +++---
> > > > >
> > > >
> >
> StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependenc
> > > > y.inf                                                |  2 +-
> > > > >   StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > | 12 ++++++++----
> > > > >   17 files changed, 46 insertions(+), 34 deletions(-)
> > > > >
> > > > > diff --git a/StandaloneMmPkg/Core/StandaloneMmCore.inf
> > > > b/StandaloneMmPkg/Core/StandaloneMmCore.inf
> > > > > index 87bf6e9440..56042b7b39 100644
> > > > > --- a/StandaloneMmPkg/Core/StandaloneMmCore.inf
> > > > > +++ b/StandaloneMmPkg/Core/StandaloneMmCore.inf
> > > > > @@ -17,7 +17,7 @@
> > > > >     PI_SPECIFICATION_VERSION       = 0x00010032
> > > > >     ENTRY_POINT                    = StandaloneMmMain
> > > > >
> > > > > -#  VALID_ARCHITECTURES           = IA32 X64 AARCH64
> > > > > +#  VALID_ARCHITECTURES           = IA32 X64 AARCH64 ARM
> > > > >
> > > > >   [Sources]
> > > > >     StandaloneMmCore.c
> > > > > diff --git
> > > >
> a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
> > > > b/StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c
> > > > > similarity index 95%
> > > > > rename from
> > > > StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
> > > > > rename to
> > StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c
> > > > > index 63fbe26642..165d696f99 100644
> > > > > ---
> > > >
> a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
> > > > > +++ b/StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c
> > > > > @@ -2,6 +2,7 @@
> > > > >
> > > > >     Copyright (c) 2016 HP Development Company, L.P.
> > > > >     Copyright (c) 2016 - 2021, Arm Limited. All rights reserved.
> > > > > +  Copyright (c) 2021, Linaro Limited
> > > > >
> > > > >     SPDX-License-Identifier: BSD-2-Clause-Patent
> > > > >
> > > > > @@ -92,8 +93,8 @@ PiMmStandaloneArmTfCpuDriverEntry (
> > > > >     // receipt of a synchronous MM request. Use the Event ID to
> > > > distinguish
> > > > >     // between synchronous and asynchronous events.
> > > > >     //
> > > > > -  if ((ARM_SMC_ID_MM_COMMUNICATE_AARCH64 != EventId) &&
> > > > > -      (ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ_AARCH64 !=
> > > > EventId)) {
> > > > > +  if ((ARM_SMC_ID_MM_COMMUNICATE != EventId) &&
> > > > > +      (ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ != EventId)) {
> > > > >       DEBUG ((DEBUG_INFO, "UnRecognized Event - 0x%x\n",
> > EventId));
> > > > >       return EFI_INVALID_PARAMETER;
> > > > >     }
> > > > > diff --git
> > > >
> >
> a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCp
> > > > u.c
> > b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c
> > > > > similarity index 96%
> > > > > rename from
> > > >
> >
> StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.
> > > > c
> > > > > rename to
> > > > StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c
> > > > > index d4590bcd19..10097f792f 100644
> > > > > ---
> > > >
> >
> a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCp
> > > > u.c
> > > > > +++
> > b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c
> > > > > @@ -10,7 +10,7 @@
> > > > >
> > > > >   #include <Base.h>
> > > > >   #include <Pi/PiMmCis.h>
> > > > > -#include <Library/AArch64/StandaloneMmCoreEntryPoint.h>
> > > > > +#include <Library/Arm/StandaloneMmCoreEntryPoint.h>
> > > > >   #include <Library/DebugLib.h>
> > > > >   #include <Library/ArmSvcLib.h>
> > > > >   #include <Library/ArmLib.h>
> > > > > diff --git
> > > >
> >
> a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCp
> > > > u.h
> > b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.h
> > > > > similarity index 100%
> > > > > rename from
> > > >
> >
> StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.
> > > > h
> > > > > rename to
> > > > StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.h
> > > > > diff --git
> > > >
> >
> a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCp
> > > > u.inf
> > b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf
> > > > > similarity index 100%
> > > > > rename from
> > > >
> >
> StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.i
> > > > nf
> > > > > rename to
> > > > StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf
> > > > > diff --git
> > > >
> >
> a/StandaloneMmPkg/Include/Library/AArch64/StandaloneMmCoreEntryPoin
> > > > t.h
> > > >
> > b/StandaloneMmPkg/Include/Library/Arm/StandaloneMmCoreEntryPoint.h
> > > > > similarity index 100%
> > > > > rename from
> > > >
> >
> StandaloneMmPkg/Include/Library/AArch64/StandaloneMmCoreEntryPoint.h
> > > > > rename to
> > > >
> StandaloneMmPkg/Include/Library/Arm/StandaloneMmCoreEntryPoint.h
> > > > > diff --git
> > > >
> >
> a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Create
> > > > HobList.c
> > > >
> >
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHob
> > > > List.c
> > > > > similarity index 97%
> > > > > rename from
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/CreateHo
> > > > bList.c
> > > > > rename to
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHobLis
> > > > t.c
> > > > > index 4d4cf3d5ff..85f8194687 100644
> > > > > ---
> > > >
> >
> a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Create
> > > > HobList.c
> > > > > +++
> > > >
> >
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHob
> > > > List.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/SetPer
> > > > missions.c
> > > >
> >
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPermissi
> > > > ons.c
> > > > > similarity index 96%
> > > > > rename from
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/SetPermi
> > > > ssions.c
> > > > > rename to
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPermissio
> > > > ns.c
> > > > > index 4a380df4a6..cd4b90823e 100644
> > > > > ---
> > > >
> >
> a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/SetPer
> > > > missions.c
> > > > > +++
> > > >
> >
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPermissi
> > > > ons.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/Standa
> > > > loneMmCoreEntryPoint.c
> > > >
> >
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/Standalone
> > > > MmCoreEntryPoint.c
> > > > > similarity index 94%
> > > > > rename from
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Standalo
> > > > neMmCoreEntryPoint.c
> > > > > rename to
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/StandaloneM
> > > > mCoreEntryPoint.c
> > > > > index b445d6942e..49cf51a789 100644
> > > > > ---
> > > >
> >
> a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Standa
> > > > loneMmCoreEntryPoint.c
> > > > > +++
> > > >
> >
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/Standalone
> > > > MmCoreEntryPoint.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/StandaloneMm
> > > > CoreEntryPoint.inf
> > > >
> >
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMm
> > > > CoreEntryPoint.inf
> > > > > index 4fa426f58e..1762586cfa 100644
> > > > > ---
> > > >
> >
> a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMm
> > > > CoreEntryPoint.inf
> > > > > +++
> > > >
> >
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMm
> > > > CoreEntryPoint.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]
> > > > > diff --git
> > > >
> >
> a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/Standalon
> > > > eMmCoreHobLib.c
> > > >
> >
> b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneM
> > > > mCoreHobLib.c
> > > > > similarity index 100%
> > > > > rename from
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/Standalone
> > > > MmCoreHobLib.c
> > > > > rename to
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneMmC
> > > > oreHobLib.c
> > > > > diff --git
> > > >
> >
> a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/Standalon
> > > > eMmCoreHobLibInternal.c
> > > >
> >
> b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneM
> > > > mCoreHobLibInternal.c
> > > > > similarity index 100%
> > > > > rename from
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/Standalone
> > > > MmCoreHobLibInternal.c
> > > > > rename to
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneMmC
> > > > oreHobLibInternal.c
> > > > > diff --git
> > > >
> >
> a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCore
> > > > HobLib.inf
> > > >
> >
> b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCore
> > > > HobLib.inf
> > > > > index a2559920e8..34ed536480 100644
> > > > > ---
> > > >
> >
> a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCore
> > > > HobLib.inf
> > > > > +++
> > > >
> >
> b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCore
> > > > HobLib.inf
> > > > > @@ -22,7 +22,7 @@
> > > > >     LIBRARY_CLASS                  =
> > > > HobLib|MM_CORE_STANDALONE
> > > > >
> > > > >   #
> > > > > -#  VALID_ARCHITECTURES           = X64 AARCH64
> > > > > +#  VALID_ARCHITECTURES           = X64 AARCH64 ARM
> > > > >   #
> > > > >   [Sources.common]
> > > > >     Common.c
> > > > > @@ -30,9 +30,9 @@
> > > > >   [Sources.X64]
> > > > >     X64/StandaloneMmCoreHobLib.c
> > > > >
> > > > > -[Sources.AARCH64]
> > > > > -  AArch64/StandaloneMmCoreHobLib.c
> > > > > -  AArch64/StandaloneMmCoreHobLibInternal.c
> > > > > +[Sources.AARCH64, Sources.ARM]
> > > > > +  Arm/StandaloneMmCoreHobLib.c
> > > > > +  Arm/StandaloneMmCoreHobLibInternal.c
> > > > >
> > > > >   [Packages]
> > > > >     MdePkg/MdePkg.dec
> > > > > diff --git
> > > >
> >
> a/StandaloneMmPkg/Library/StandaloneMmMemLib/AArch64/StandaloneM
> > > > mMemLibInternal.c
> > > >
> >
> b/StandaloneMmPkg/Library/StandaloneMmMemLib/ArmStandaloneMmMe
> > > > mLibInternal.c
> > > > > similarity index 86%
> > > > > rename from
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmMemLib/AArch64/StandaloneMm
> > > > MemLibInternal.c
> > > > > rename to
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmMemLib/ArmStandaloneMmMemL
> > > > ibInternal.c
> > > > > index 4124959e04..fa7df46413 100644
> > > > > ---
> > > >
> >
> a/StandaloneMmPkg/Library/StandaloneMmMemLib/AArch64/StandaloneM
> > > > mMemLibInternal.c
> > > > > +++
> > > >
> >
> b/StandaloneMmPkg/Library/StandaloneMmMemLib/ArmStandaloneMmMe
> > > > mLibInternal.c
> > > > > @@ -20,6 +20,13 @@
> > > > >   //
> > > > >   extern EFI_PHYSICAL_ADDRESS
> > > > mMmMemLibInternalMaximumSupportAddress;
> > > > >
> > > > > +#ifdef MDE_CPU_AARCH64
> > > > > +#define ARM_PHYSICAL_ADDRESS_BITS 36
> > > > > +#endif
> > > > > +#ifdef MDE_CPU_ARM
> > > > > +#define ARM_PHYSICAL_ADDRESS_BITS 32
> > > > > +#endif
> > > > > +
> > > > >   /**
> > > > >     Calculate and save the maximum support address.
> > > > >
> > > > > @@ -31,7 +38,7 @@
> > > > MmMemLibInternalCalculateMaximumSupportAddress (
> > > > >   {
> > > > >     UINT8        PhysicalAddressBits;
> > > > >
> > > > > -  PhysicalAddressBits = 36;
> > > > > +  PhysicalAddressBits = ARM_PHYSICAL_ADDRESS_BITS;
> > > > >
> > > > >     //
> > > > >     // Save the maximum support address in one global variable
> > > > > diff --git
> > > >
> >
> a/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib
> > > > .inf
> > > >
> >
> b/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib
> > > > .inf
> > > > > index 062b0d7a11..b29d97a746 100644
> > > > > ---
> > > >
> >
> a/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib
> > > > .inf
> > > > > +++
> > > >
> >
> b/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib
> > > > .inf
> > > > > @@ -28,7 +28,7 @@
> > > > >   #
> > > > >   # The following information is for reference only and not required
> by
> > the
> > > > build tools.
> > > > >   #
> > > > > -#  VALID_ARCHITECTURES           = IA32 X64 AARCH64
> > > > > +#  VALID_ARCHITECTURES           = IA32 X64 AARCH64 ARM
> > > > >   #
> > > > >
> > > > >   [Sources.Common]
> > > > > @@ -37,8 +37,8 @@
> > > > >   [Sources.IA32, Sources.X64]
> > > > >     X86StandaloneMmMemLibInternal.c
> > > > >
> > > > > -[Sources.AARCH64]
> > > > > -  AArch64/StandaloneMmMemLibInternal.c
> > > > > +[Sources.AARCH64, Sources.ARM]
> > > > > +  ArmStandaloneMmMemLibInternal.c
> > > > >
> > > > >   [Packages]
> > > > >     MdePkg/MdePkg.dec
> > > > > diff --git
> > > >
> >
> a/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDepende
> > > > ncy.inf
> > > >
> >
> b/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDepende
> > > > ncy.inf
> > > > > index a2a059c5d6..ffb2a6d083 100644
> > > > > ---
> > > >
> >
> a/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDepende
> > > > ncy.inf
> > > > > +++
> > > >
> >
> b/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDepende
> > > > ncy.inf
> > > > > @@ -20,7 +20,7 @@
> > > > >   #
> > > > >   # The following information is for reference only and not required
> by
> > the
> > > > build tools.
> > > > >   #
> > > > > -#  VALID_ARCHITECTURES           = AARCH64
> > > > > +#  VALID_ARCHITECTURES           = AARCH64|ARM
> > > > >   #
> > > > >   #
> > > > >
> > > > > diff --git a/StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > b/StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > > index 0c45df95e2..8012f93b7d 100644
> > > > > --- a/StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > > +++ b/StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > > @@ -20,7 +20,7 @@
> > > > >     PLATFORM_VERSION               = 1.0
> > > > >     DSC_SPECIFICATION              = 0x00010011
> > > > >     OUTPUT_DIRECTORY               = Build/StandaloneMm
> > > > > -  SUPPORTED_ARCHITECTURES        = AARCH64|X64
> > > > > +  SUPPORTED_ARCHITECTURES        = AARCH64|X64|ARM
> > > > >     BUILD_TARGETS                  = DEBUG|RELEASE
> > > > >     SKUID_IDENTIFIER               = DEFAULT
> > > > >
> > > > > @@ -60,7 +60,7 @@
> > > > >
> > > >
> >
> StandaloneMmDriverEntryPoint|MdePkg/Library/StandaloneMmDriverEntryP
> > > > oint/StandaloneMmDriverEntryPoint.inf
> > > > >
> > > >
> >
> VariableMmDependency|StandaloneMmPkg/Library/VariableMmDependenc
> > > > y/VariableMmDependency.inf
> > > > >
> > > > > -[LibraryClasses.AARCH64]
> > > > > +[LibraryClasses.AARCH64, LibraryClasses.ARM]
> > > > >     ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
> > > > >
> > > >
> >
> StandaloneMmMmuLib|ArmPkg/Library/StandaloneMmMmuLib/ArmMmuSt
> > > > andaloneMmLib.inf
> > > > >     ArmSvcLib|ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf
> > > > > @@ -118,8 +118,8 @@
> > > > >
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmMemoryAllocationLib/Standalone
> > > > MmMemoryAllocationLib.inf
> > > > >
> > > >
> >
> StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependenc
> > > > y.inf
> > > > >
> > > > > -[Components.AARCH64]
> > > > > -
> > > >
> >
> StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.i
> > > > nf
> > > > > +[Components.AARCH64, Components.ARM]
> > > > > +
> > StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf
> > > > >
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/Standalone
> > > > MmPeCoffExtraActionLib.inf
> > > > >
> > > > >
> > > >
> >
> ##############################################################
> > > > #####################################
> > > > > @@ -135,6 +135,10 @@
> > > > >   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
> > > > -march=armv8-a+nofp -mstrict-align
> > > > >   GCC:*_*_*_CC_FLAGS = -mstrict-align
> > > > >
> > > > > +[BuildOptions.ARM]
> > > > > +GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
> > > > -march=armv7-a
> > > > > +GCC:*_*_*_CC_FLAGS = -fno-stack-protector
> > > > > +
> > > > >   [BuildOptions.X64]
> > > > >     MSFT:*_*_*_DLINK_FLAGS = /ALIGN:4096
> > > > >     GCC:*_GCC*_*_DLINK_FLAGS = -z common-page-size=0x1000
> > > >
> > > >
> > > >
> > > >
> > > >
> > >
> > >
> > >
> > >
> > >
> > >
> > >
> > >
> >
> >
> >
> >
> 
> 
> 
> 
> 
> 
> 

Re: [edk2-devel] [PATCH v4 5/5] StandaloneMmPkg: build for 32bit arm machines

[Sami Mujawar]

[-- Attachment #1: Type: text/plain, Size: 28073 bytes --]

Hi Liming,

I will look into this shortly.

Regards,

Sami Mujawar

________________________________
From: gaoliming <gaoliming@byosoft.com.cn>
Sent: Wednesday, 28 July 2021, 7:33 am
To: devel@edk2.groups.io; gaoliming@byosoft.com.cn; ardb@kernel.org
Cc: Sami Mujawar; 'Etienne Carriere'; Achin Gupta; 'Ard Biesheuvel'; 'Jiewen Yao'; 'Leif Lindholm'; 'Sughosh Ganu'; nd
Subject: 回复: [edk2-devel] [PATCH v4 5/5] StandaloneMmPkg: build for 32bit arm machines

Ard and Sami:
  Will you help merge this patch set for 202108 stable tag?

Thanks
Liming
> -----邮件原件-----
> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 gaoliming
> 发送时间: 2021年7月20日 17:21
> 收件人: devel@edk2.groups.io; ardb@kernel.org
> 抄送: 'Sami Mujawar' <sami.mujawar@arm.com>; 'Etienne Carriere'
> <etienne.carriere@linaro.org>; 'Achin Gupta' <achin.gupta@arm.com>; 'Ard
> Biesheuvel' <ardb+tianocore@kernel.org>; 'Jiewen Yao'
> <jiewen.yao@intel.com>; 'Leif Lindholm' <leif@nuviainc.com>; 'Sughosh
> Ganu' <sughosh.ganu@linaro.org>; 'nd' <nd@arm.com>
> 主题: 回复: [edk2-devel] [PATCH v4 5/5] StandaloneMmPkg: build for 32bit
> arm machines
>
> Ard:
>   Thanks! I have added this feature into
> https://github.com/tianocore/tianocore.github.io/wiki/EDK-II-Release-Planni
> ng.
>
> Thanks
> Liming
> > -----邮件原件-----
> > 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Ard
> > Biesheuvel
> > 发送时间: 2021年7月20日 15:46
> > 收件人: edk2-devel-groups-io <devel@edk2.groups.io>; Liming Gao
> (Byosoft
> > address) <gaoliming@byosoft.com.cn>
> > 抄送: Sami Mujawar <sami.mujawar@arm.com>; Etienne Carriere
> > <etienne.carriere@linaro.org>; Achin Gupta <achin.gupta@arm.com>; Ard
> > Biesheuvel <ardb+tianocore@kernel.org>; Jiewen Yao
> > <jiewen.yao@intel.com>; Leif Lindholm <leif@nuviainc.com>; Sughosh
> Ganu
> > <sughosh.ganu@linaro.org>; nd <nd@arm.com>
> > 主题: Re: [edk2-devel] [PATCH v4 5/5] StandaloneMmPkg: build for 32bit
> arm
> > machines
> >
> > On Tue, 20 Jul 2021 at 04:01, gaoliming <gaoliming@byosoft.com.cn>
> wrote:
> > >
> > > Hi, all
> > >   This patch set has passed code review. How about merge it for this
> > stable tag edk2 202108?
> > >
> >
> > OK, I will pick these up. Would you mind creating the entry for the
> > release notes?
> >
> >
> > > Thanks
> > > Liming
> > > > -----邮件原件-----
> > > > 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Sami
> > > > Mujawar
> > > > 发送时间: 2021年5月19日 17:58
> > > > 收件人: Etienne Carriere <etienne.carriere@linaro.org>;
> > > > devel@edk2.groups.io
> > > > 抄送: Achin Gupta <achin.gupta@arm.com>; Ard Biesheuvel
> > > > <ardb+tianocore@kernel.org>; Jiewen Yao <jiewen.yao@intel.com>;
> Leif
> > > > Lindholm <leif@nuviainc.com>; Sughosh Ganu
> > <sughosh.ganu@linaro.org>;
> > > > nd@arm.com
> > > > 主题: Re: [edk2-devel] [PATCH v4 5/5] StandaloneMmPkg: build for
> 32bit
> > arm
> > > > machines
> > > >
> > > > Hi Etienn,
> > > >
> > > > This patch looks good to me.
> > > >
> > > > Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
> > > >
> > > > Regards,
> > > >
> > > > Sami Mujawar
> > > >
> > > > On 19/05/2021 08:14 AM, Etienne Carriere wrote:
> > > > > 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>
> > > > > ---
> > > > > Changes since v3:
> > > > > - Fix BuildOptions.ARM in StandaloneMmPkg.
> > > > > - Remove Cc tags.
> > > > >
> > > > > No change since v2
> > > > >
> > > > > Changes since v1:
> > > > > - ARM_SMC_ID_MM_COMMUNICATE 32b/64b agnostic helper ID is
> > > > defined
> > > > >    in ArmStdSmc.h (see 1st commit in this series) instead of being
> > > > >    local to EventHandle.c.
> > > > > - Fix void occurrence to VOID.
> > > > > - Fix path in StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > > ---
> > > > >   StandaloneMmPkg/Core/StandaloneMmCore.inf
> > > > |  2 +-
> > > > >   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64
> > > > => }/EventHandle.c
> > > > |  5 +++--
> > > > >   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64
> > > > => }/StandaloneMmCpu.c
> > > > |  2 +-
> > > > >   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64
> > > > => }/StandaloneMmCpu.h
> > > > |  0
> > > > >   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64
> > > > => }/StandaloneMmCpu.inf
> > > > |  0
> > > > >   StandaloneMmPkg/Include/Library/{AArch64 =>
> > > > Arm}/StandaloneMmCoreEntryPoint.h
> > > > |  0
> > > > >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/{AArch64
> > =>
> > > > Arm}/CreateHobList.c                                  |  2 +-
> > > > >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/{AArch64
> > =>
> > > > Arm}/SetPermissions.c                                 |  2 +-
> > > > >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/{AArch64
> > =>
> > > > Arm}/StandaloneMmCoreEntryPoint.c                     | 16
> > > > ++++++++--------
> > > > >
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCor
> > > > eEntryPoint.inf                                    | 14
> > > > +++++++-------
> > > > >   StandaloneMmPkg/Library/StandaloneMmCoreHobLib/{AArch64
> =>
> > > > Arm}/StandaloneMmCoreHobLib.c                             |
> > 0
> > > > >   StandaloneMmPkg/Library/StandaloneMmCoreHobLib/{AArch64
> =>
> > > > Arm}/StandaloneMmCoreHobLibInternal.c                     |
> 0
> > > > >
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreH
> > > > obLib.inf                                            |  8
> > ++++----
> > > > >
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmMemLib/{AArch64/StandaloneMm
> > > > MemLibInternal.c => ArmStandaloneMmMemLibInternal.c} |  9
> > ++++++++-
> > > > >
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.i
> > > > nf                                                    |  6
> > > > +++---
> > > > >
> > > >
> >
> StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependenc
> > > > y.inf                                                |  2 +-
> > > > >   StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > | 12 ++++++++----
> > > > >   17 files changed, 46 insertions(+), 34 deletions(-)
> > > > >
> > > > > diff --git a/StandaloneMmPkg/Core/StandaloneMmCore.inf
> > > > b/StandaloneMmPkg/Core/StandaloneMmCore.inf
> > > > > index 87bf6e9440..56042b7b39 100644
> > > > > --- a/StandaloneMmPkg/Core/StandaloneMmCore.inf
> > > > > +++ b/StandaloneMmPkg/Core/StandaloneMmCore.inf
> > > > > @@ -17,7 +17,7 @@
> > > > >     PI_SPECIFICATION_VERSION       = 0x00010032
> > > > >     ENTRY_POINT                    = StandaloneMmMain
> > > > >
> > > > > -#  VALID_ARCHITECTURES           = IA32 X64 AARCH64
> > > > > +#  VALID_ARCHITECTURES           = IA32 X64 AARCH64 ARM
> > > > >
> > > > >   [Sources]
> > > > >     StandaloneMmCore.c
> > > > > diff --git
> > > >
> a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
> > > > b/StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c
> > > > > similarity index 95%
> > > > > rename from
> > > > StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
> > > > > rename to
> > StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c
> > > > > index 63fbe26642..165d696f99 100644
> > > > > ---
> > > >
> a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
> > > > > +++ b/StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c
> > > > > @@ -2,6 +2,7 @@
> > > > >
> > > > >     Copyright (c) 2016 HP Development Company, L.P.
> > > > >     Copyright (c) 2016 - 2021, Arm Limited. All rights reserved.
> > > > > +  Copyright (c) 2021, Linaro Limited
> > > > >
> > > > >     SPDX-License-Identifier: BSD-2-Clause-Patent
> > > > >
> > > > > @@ -92,8 +93,8 @@ PiMmStandaloneArmTfCpuDriverEntry (
> > > > >     // receipt of a synchronous MM request. Use the Event ID to
> > > > distinguish
> > > > >     // between synchronous and asynchronous events.
> > > > >     //
> > > > > -  if ((ARM_SMC_ID_MM_COMMUNICATE_AARCH64 != EventId) &&
> > > > > -      (ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ_AARCH64 !=
> > > > EventId)) {
> > > > > +  if ((ARM_SMC_ID_MM_COMMUNICATE != EventId) &&
> > > > > +      (ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ != EventId)) {
> > > > >       DEBUG ((DEBUG_INFO, "UnRecognized Event - 0x%x\n",
> > EventId));
> > > > >       return EFI_INVALID_PARAMETER;
> > > > >     }
> > > > > diff --git
> > > >
> >
> a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCp
> > > > u.c
> > b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c
> > > > > similarity index 96%
> > > > > rename from
> > > >
> >
> StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.
> > > > c
> > > > > rename to
> > > > StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c
> > > > > index d4590bcd19..10097f792f 100644
> > > > > ---
> > > >
> >
> a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCp
> > > > u.c
> > > > > +++
> > b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c
> > > > > @@ -10,7 +10,7 @@
> > > > >
> > > > >   #include <Base.h>
> > > > >   #include <Pi/PiMmCis.h>
> > > > > -#include <Library/AArch64/StandaloneMmCoreEntryPoint.h>
> > > > > +#include <Library/Arm/StandaloneMmCoreEntryPoint.h>
> > > > >   #include <Library/DebugLib.h>
> > > > >   #include <Library/ArmSvcLib.h>
> > > > >   #include <Library/ArmLib.h>
> > > > > diff --git
> > > >
> >
> a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCp
> > > > u.h
> > b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.h
> > > > > similarity index 100%
> > > > > rename from
> > > >
> >
> StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.
> > > > h
> > > > > rename to
> > > > StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.h
> > > > > diff --git
> > > >
> >
> a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCp
> > > > u.inf
> > b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf
> > > > > similarity index 100%
> > > > > rename from
> > > >
> >
> StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.i
> > > > nf
> > > > > rename to
> > > > StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf
> > > > > diff --git
> > > >
> >
> a/StandaloneMmPkg/Include/Library/AArch64/StandaloneMmCoreEntryPoin
> > > > t.h
> > > >
> > b/StandaloneMmPkg/Include/Library/Arm/StandaloneMmCoreEntryPoint.h
> > > > > similarity index 100%
> > > > > rename from
> > > >
> >
> StandaloneMmPkg/Include/Library/AArch64/StandaloneMmCoreEntryPoint.h
> > > > > rename to
> > > >
> StandaloneMmPkg/Include/Library/Arm/StandaloneMmCoreEntryPoint.h
> > > > > diff --git
> > > >
> >
> a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Create
> > > > HobList.c
> > > >
> >
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHob
> > > > List.c
> > > > > similarity index 97%
> > > > > rename from
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/CreateHo
> > > > bList.c
> > > > > rename to
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHobLis
> > > > t.c
> > > > > index 4d4cf3d5ff..85f8194687 100644
> > > > > ---
> > > >
> >
> a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Create
> > > > HobList.c
> > > > > +++
> > > >
> >
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHob
> > > > List.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/SetPer
> > > > missions.c
> > > >
> >
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPermissi
> > > > ons.c
> > > > > similarity index 96%
> > > > > rename from
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/SetPermi
> > > > ssions.c
> > > > > rename to
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPermissio
> > > > ns.c
> > > > > index 4a380df4a6..cd4b90823e 100644
> > > > > ---
> > > >
> >
> a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/SetPer
> > > > missions.c
> > > > > +++
> > > >
> >
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPermissi
> > > > ons.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/Standa
> > > > loneMmCoreEntryPoint.c
> > > >
> >
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/Standalone
> > > > MmCoreEntryPoint.c
> > > > > similarity index 94%
> > > > > rename from
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Standalo
> > > > neMmCoreEntryPoint.c
> > > > > rename to
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/StandaloneM
> > > > mCoreEntryPoint.c
> > > > > index b445d6942e..49cf51a789 100644
> > > > > ---
> > > >
> >
> a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Standa
> > > > loneMmCoreEntryPoint.c
> > > > > +++
> > > >
> >
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/Standalone
> > > > MmCoreEntryPoint.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/StandaloneMm
> > > > CoreEntryPoint.inf
> > > >
> >
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMm
> > > > CoreEntryPoint.inf
> > > > > index 4fa426f58e..1762586cfa 100644
> > > > > ---
> > > >
> >
> a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMm
> > > > CoreEntryPoint.inf
> > > > > +++
> > > >
> >
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMm
> > > > CoreEntryPoint.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]
> > > > > diff --git
> > > >
> >
> a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/Standalon
> > > > eMmCoreHobLib.c
> > > >
> >
> b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneM
> > > > mCoreHobLib.c
> > > > > similarity index 100%
> > > > > rename from
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/Standalone
> > > > MmCoreHobLib.c
> > > > > rename to
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneMmC
> > > > oreHobLib.c
> > > > > diff --git
> > > >
> >
> a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/Standalon
> > > > eMmCoreHobLibInternal.c
> > > >
> >
> b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneM
> > > > mCoreHobLibInternal.c
> > > > > similarity index 100%
> > > > > rename from
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/Standalone
> > > > MmCoreHobLibInternal.c
> > > > > rename to
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneMmC
> > > > oreHobLibInternal.c
> > > > > diff --git
> > > >
> >
> a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCore
> > > > HobLib.inf
> > > >
> >
> b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCore
> > > > HobLib.inf
> > > > > index a2559920e8..34ed536480 100644
> > > > > ---
> > > >
> >
> a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCore
> > > > HobLib.inf
> > > > > +++
> > > >
> >
> b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCore
> > > > HobLib.inf
> > > > > @@ -22,7 +22,7 @@
> > > > >     LIBRARY_CLASS                  =
> > > > HobLib|MM_CORE_STANDALONE
> > > > >
> > > > >   #
> > > > > -#  VALID_ARCHITECTURES           = X64 AARCH64
> > > > > +#  VALID_ARCHITECTURES           = X64 AARCH64 ARM
> > > > >   #
> > > > >   [Sources.common]
> > > > >     Common.c
> > > > > @@ -30,9 +30,9 @@
> > > > >   [Sources.X64]
> > > > >     X64/StandaloneMmCoreHobLib.c
> > > > >
> > > > > -[Sources.AARCH64]
> > > > > -  AArch64/StandaloneMmCoreHobLib.c
> > > > > -  AArch64/StandaloneMmCoreHobLibInternal.c
> > > > > +[Sources.AARCH64, Sources.ARM]
> > > > > +  Arm/StandaloneMmCoreHobLib.c
> > > > > +  Arm/StandaloneMmCoreHobLibInternal.c
> > > > >
> > > > >   [Packages]
> > > > >     MdePkg/MdePkg.dec
> > > > > diff --git
> > > >
> >
> a/StandaloneMmPkg/Library/StandaloneMmMemLib/AArch64/StandaloneM
> > > > mMemLibInternal.c
> > > >
> >
> b/StandaloneMmPkg/Library/StandaloneMmMemLib/ArmStandaloneMmMe
> > > > mLibInternal.c
> > > > > similarity index 86%
> > > > > rename from
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmMemLib/AArch64/StandaloneMm
> > > > MemLibInternal.c
> > > > > rename to
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmMemLib/ArmStandaloneMmMemL
> > > > ibInternal.c
> > > > > index 4124959e04..fa7df46413 100644
> > > > > ---
> > > >
> >
> a/StandaloneMmPkg/Library/StandaloneMmMemLib/AArch64/StandaloneM
> > > > mMemLibInternal.c
> > > > > +++
> > > >
> >
> b/StandaloneMmPkg/Library/StandaloneMmMemLib/ArmStandaloneMmMe
> > > > mLibInternal.c
> > > > > @@ -20,6 +20,13 @@
> > > > >   //
> > > > >   extern EFI_PHYSICAL_ADDRESS
> > > > mMmMemLibInternalMaximumSupportAddress;
> > > > >
> > > > > +#ifdef MDE_CPU_AARCH64
> > > > > +#define ARM_PHYSICAL_ADDRESS_BITS 36
> > > > > +#endif
> > > > > +#ifdef MDE_CPU_ARM
> > > > > +#define ARM_PHYSICAL_ADDRESS_BITS 32
> > > > > +#endif
> > > > > +
> > > > >   /**
> > > > >     Calculate and save the maximum support address.
> > > > >
> > > > > @@ -31,7 +38,7 @@
> > > > MmMemLibInternalCalculateMaximumSupportAddress (
> > > > >   {
> > > > >     UINT8        PhysicalAddressBits;
> > > > >
> > > > > -  PhysicalAddressBits = 36;
> > > > > +  PhysicalAddressBits = ARM_PHYSICAL_ADDRESS_BITS;
> > > > >
> > > > >     //
> > > > >     // Save the maximum support address in one global variable
> > > > > diff --git
> > > >
> >
> a/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib
> > > > .inf
> > > >
> >
> b/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib
> > > > .inf
> > > > > index 062b0d7a11..b29d97a746 100644
> > > > > ---
> > > >
> >
> a/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib
> > > > .inf
> > > > > +++
> > > >
> >
> b/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib
> > > > .inf
> > > > > @@ -28,7 +28,7 @@
> > > > >   #
> > > > >   # The following information is for reference only and not required
> by
> > the
> > > > build tools.
> > > > >   #
> > > > > -#  VALID_ARCHITECTURES           = IA32 X64 AARCH64
> > > > > +#  VALID_ARCHITECTURES           = IA32 X64 AARCH64 ARM
> > > > >   #
> > > > >
> > > > >   [Sources.Common]
> > > > > @@ -37,8 +37,8 @@
> > > > >   [Sources.IA32, Sources.X64]
> > > > >     X86StandaloneMmMemLibInternal.c
> > > > >
> > > > > -[Sources.AARCH64]
> > > > > -  AArch64/StandaloneMmMemLibInternal.c
> > > > > +[Sources.AARCH64, Sources.ARM]
> > > > > +  ArmStandaloneMmMemLibInternal.c
> > > > >
> > > > >   [Packages]
> > > > >     MdePkg/MdePkg.dec
> > > > > diff --git
> > > >
> >
> a/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDepende
> > > > ncy.inf
> > > >
> >
> b/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDepende
> > > > ncy.inf
> > > > > index a2a059c5d6..ffb2a6d083 100644
> > > > > ---
> > > >
> >
> a/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDepende
> > > > ncy.inf
> > > > > +++
> > > >
> >
> b/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDepende
> > > > ncy.inf
> > > > > @@ -20,7 +20,7 @@
> > > > >   #
> > > > >   # The following information is for reference only and not required
> by
> > the
> > > > build tools.
> > > > >   #
> > > > > -#  VALID_ARCHITECTURES           = AARCH64
> > > > > +#  VALID_ARCHITECTURES           = AARCH64|ARM
> > > > >   #
> > > > >   #
> > > > >
> > > > > diff --git a/StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > b/StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > > index 0c45df95e2..8012f93b7d 100644
> > > > > --- a/StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > > +++ b/StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > > @@ -20,7 +20,7 @@
> > > > >     PLATFORM_VERSION               = 1.0
> > > > >     DSC_SPECIFICATION              = 0x00010011
> > > > >     OUTPUT_DIRECTORY               = Build/StandaloneMm
> > > > > -  SUPPORTED_ARCHITECTURES        = AARCH64|X64
> > > > > +  SUPPORTED_ARCHITECTURES        = AARCH64|X64|ARM
> > > > >     BUILD_TARGETS                  = DEBUG|RELEASE
> > > > >     SKUID_IDENTIFIER               = DEFAULT
> > > > >
> > > > > @@ -60,7 +60,7 @@
> > > > >
> > > >
> >
> StandaloneMmDriverEntryPoint|MdePkg/Library/StandaloneMmDriverEntryP
> > > > oint/StandaloneMmDriverEntryPoint.inf
> > > > >
> > > >
> >
> VariableMmDependency|StandaloneMmPkg/Library/VariableMmDependenc
> > > > y/VariableMmDependency.inf
> > > > >
> > > > > -[LibraryClasses.AARCH64]
> > > > > +[LibraryClasses.AARCH64, LibraryClasses.ARM]
> > > > >     ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
> > > > >
> > > >
> >
> StandaloneMmMmuLib|ArmPkg/Library/StandaloneMmMmuLib/ArmMmuSt
> > > > andaloneMmLib.inf
> > > > >     ArmSvcLib|ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf
> > > > > @@ -118,8 +118,8 @@
> > > > >
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmMemoryAllocationLib/Standalone
> > > > MmMemoryAllocationLib.inf
> > > > >
> > > >
> >
> StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependenc
> > > > y.inf
> > > > >
> > > > > -[Components.AARCH64]
> > > > > -
> > > >
> >
> StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.i
> > > > nf
> > > > > +[Components.AARCH64, Components.ARM]
> > > > > +
> > StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf
> > > > >
> > > >
> >
> StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/Standalone
> > > > MmPeCoffExtraActionLib.inf
> > > > >
> > > > >
> > > >
> >
> ##############################################################
> > > > #####################################
> > > > > @@ -135,6 +135,10 @@
> > > > >   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
> > > > -march=armv8-a+nofp -mstrict-align
> > > > >   GCC:*_*_*_CC_FLAGS = -mstrict-align
> > > > >
> > > > > +[BuildOptions.ARM]
> > > > > +GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
> > > > -march=armv7-a
> > > > > +GCC:*_*_*_CC_FLAGS = -fno-stack-protector
> > > > > +
> > > > >   [BuildOptions.X64]
> > > > >     MSFT:*_*_*_DLINK_FLAGS = /ALIGN:4096
> > > > >     GCC:*_GCC*_*_DLINK_FLAGS = -z common-page-size=0x1000
> > > >
> > > >
> > > >
> > > >
> > > >
> > >
> > >
> > >
> > >
> > >
> > >
> > >
> > >
> >
> >
> >
> >
>
>
>
>
>
> 
>





[-- Attachment #2: Type: text/html, Size: 47938 bytes --]

Re: [edk2-devel] [PATCH v4 5/5] StandaloneMmPkg: build for 32bit arm machines

[Ard Biesheuvel]

On Wed, 28 Jul 2021 at 08:41, Sami Mujawar <Sami.Mujawar@arm.com> wrote:
>
> Hi Liming,
>
> I will look into this shortly.
>

I submitted it here

https://github.com/tianocore/edk2/pull/1823

but it triggered a CI failure that was not immediately obvious to me,
and I haven't had time yet to dig into it.


>
> ________________________________
> From: gaoliming <gaoliming@byosoft.com.cn>
> Sent: Wednesday, 28 July 2021, 7:33 am
> To: devel@edk2.groups.io; gaoliming@byosoft.com.cn; ardb@kernel.org
> Cc: Sami Mujawar; 'Etienne Carriere'; Achin Gupta; 'Ard Biesheuvel'; 'Jiewen Yao'; 'Leif Lindholm'; 'Sughosh Ganu'; nd
> Subject: 回复: [edk2-devel] [PATCH v4 5/5] StandaloneMmPkg: build for 32bit arm machines
>
> Ard and Sami:
>   Will you help merge this patch set for 202108 stable tag?
>
> Thanks
> Liming
> > -----邮件原件-----
> > 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 gaoliming
> > 发送时间: 2021年7月20日 17:21
> > 收件人: devel@edk2.groups.io; ardb@kernel.org
> > 抄送: 'Sami Mujawar' <sami.mujawar@arm.com>; 'Etienne Carriere'
> > <etienne.carriere@linaro.org>; 'Achin Gupta' <achin.gupta@arm.com>; 'Ard
> > Biesheuvel' <ardb+tianocore@kernel.org>; 'Jiewen Yao'
> > <jiewen.yao@intel.com>; 'Leif Lindholm' <leif@nuviainc.com>; 'Sughosh
> > Ganu' <sughosh.ganu@linaro.org>; 'nd' <nd@arm.com>
> > 主题: 回复: [edk2-devel] [PATCH v4 5/5] StandaloneMmPkg: build for 32bit
> > arm machines
> >
> > Ard:
> >   Thanks! I have added this feature into
> > https://github.com/tianocore/tianocore.github.io/wiki/EDK-II-Release-Planni
> > ng.
> >
> > Thanks
> > Liming
> > > -----邮件原件-----
> > > 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Ard
> > > Biesheuvel
> > > 发送时间: 2021年7月20日 15:46
> > > 收件人: edk2-devel-groups-io <devel@edk2.groups.io>; Liming Gao
> > (Byosoft
> > > address) <gaoliming@byosoft.com.cn>
> > > 抄送: Sami Mujawar <sami.mujawar@arm.com>; Etienne Carriere
> > > <etienne.carriere@linaro.org>; Achin Gupta <achin.gupta@arm.com>; Ard
> > > Biesheuvel <ardb+tianocore@kernel.org>; Jiewen Yao
> > > <jiewen.yao@intel.com>; Leif Lindholm <leif@nuviainc.com>; Sughosh
> > Ganu
> > > <sughosh.ganu@linaro.org>; nd <nd@arm.com>
> > > 主题: Re: [edk2-devel] [PATCH v4 5/5] StandaloneMmPkg: build for 32bit
> > arm
> > > machines
> > >
> > > On Tue, 20 Jul 2021 at 04:01, gaoliming <gaoliming@byosoft.com.cn>
> > wrote:
> > > >
> > > > Hi, all
> > > >   This patch set has passed code review. How about merge it for this
> > > stable tag edk2 202108?
> > > >
> > >
> > > OK, I will pick these up. Would you mind creating the entry for the
> > > release notes?
> > >
> > >
> > > > Thanks
> > > > Liming
> > > > > -----邮件原件-----
> > > > > 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Sami
> > > > > Mujawar
> > > > > 发送时间: 2021年5月19日 17:58
> > > > > 收件人: Etienne Carriere <etienne.carriere@linaro.org>;
> > > > > devel@edk2.groups.io
> > > > > 抄送: Achin Gupta <achin.gupta@arm.com>; Ard Biesheuvel
> > > > > <ardb+tianocore@kernel.org>; Jiewen Yao <jiewen.yao@intel.com>;
> > Leif
> > > > > Lindholm <leif@nuviainc.com>; Sughosh Ganu
> > > <sughosh.ganu@linaro.org>;
> > > > > nd@arm.com
> > > > > 主题: Re: [edk2-devel] [PATCH v4 5/5] StandaloneMmPkg: build for
> > 32bit
> > > arm
> > > > > machines
> > > > >
> > > > > Hi Etienn,
> > > > >
> > > > > This patch looks good to me.
> > > > >
> > > > > Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
> > > > >
> > > > > Regards,
> > > > >
> > > > > Sami Mujawar
> > > > >
> > > > > On 19/05/2021 08:14 AM, Etienne Carriere wrote:
> > > > > > 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>
> > > > > > ---
> > > > > > Changes since v3:
> > > > > > - Fix BuildOptions.ARM in StandaloneMmPkg.
> > > > > > - Remove Cc tags.
> > > > > >
> > > > > > No change since v2
> > > > > >
> > > > > > Changes since v1:
> > > > > > - ARM_SMC_ID_MM_COMMUNICATE 32b/64b agnostic helper ID is
> > > > > defined
> > > > > >    in ArmStdSmc.h (see 1st commit in this series) instead of being
> > > > > >    local to EventHandle.c.
> > > > > > - Fix void occurrence to VOID.
> > > > > > - Fix path in StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > > > ---
> > > > > >   StandaloneMmPkg/Core/StandaloneMmCore.inf
> > > > > |  2 +-
> > > > > >   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64
> > > > > => }/EventHandle.c
> > > > > |  5 +++--
> > > > > >   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64
> > > > > => }/StandaloneMmCpu.c
> > > > > |  2 +-
> > > > > >   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64
> > > > > => }/StandaloneMmCpu.h
> > > > > |  0
> > > > > >   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64
> > > > > => }/StandaloneMmCpu.inf
> > > > > |  0
> > > > > >   StandaloneMmPkg/Include/Library/{AArch64 =>
> > > > > Arm}/StandaloneMmCoreEntryPoint.h
> > > > > |  0
> > > > > >
> > StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/{AArch64
> > > =>
> > > > > Arm}/CreateHobList.c                                  |  2 +-
> > > > > >
> > StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/{AArch64
> > > =>
> > > > > Arm}/SetPermissions.c                                 |  2 +-
> > > > > >
> > StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/{AArch64
> > > =>
> > > > > Arm}/StandaloneMmCoreEntryPoint.c                     | 16
> > > > > ++++++++--------
> > > > > >
> > > > >
> > >
> > StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCor
> > > > > eEntryPoint.inf                                    | 14
> > > > > +++++++-------
> > > > > >   StandaloneMmPkg/Library/StandaloneMmCoreHobLib/{AArch64
> > =>
> > > > > Arm}/StandaloneMmCoreHobLib.c                             |
> > > 0
> > > > > >   StandaloneMmPkg/Library/StandaloneMmCoreHobLib/{AArch64
> > =>
> > > > > Arm}/StandaloneMmCoreHobLibInternal.c                     |
> > 0
> > > > > >
> > > > >
> > >
> > StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreH
> > > > > obLib.inf                                            |  8
> > > ++++----
> > > > > >
> > > > >
> > >
> > StandaloneMmPkg/Library/StandaloneMmMemLib/{AArch64/StandaloneMm
> > > > > MemLibInternal.c => ArmStandaloneMmMemLibInternal.c} |  9
> > > ++++++++-
> > > > > >
> > > > >
> > >
> > StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.i
> > > > > nf                                                    |  6
> > > > > +++---
> > > > > >
> > > > >
> > >
> > StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependenc
> > > > > y.inf                                                |  2 +-
> > > > > >   StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > > | 12 ++++++++----
> > > > > >   17 files changed, 46 insertions(+), 34 deletions(-)
> > > > > >
> > > > > > diff --git a/StandaloneMmPkg/Core/StandaloneMmCore.inf
> > > > > b/StandaloneMmPkg/Core/StandaloneMmCore.inf
> > > > > > index 87bf6e9440..56042b7b39 100644
> > > > > > --- a/StandaloneMmPkg/Core/StandaloneMmCore.inf
> > > > > > +++ b/StandaloneMmPkg/Core/StandaloneMmCore.inf
> > > > > > @@ -17,7 +17,7 @@
> > > > > >     PI_SPECIFICATION_VERSION       = 0x00010032
> > > > > >     ENTRY_POINT                    = StandaloneMmMain
> > > > > >
> > > > > > -#  VALID_ARCHITECTURES           = IA32 X64 AARCH64
> > > > > > +#  VALID_ARCHITECTURES           = IA32 X64 AARCH64 ARM
> > > > > >
> > > > > >   [Sources]
> > > > > >     StandaloneMmCore.c
> > > > > > diff --git
> > > > >
> > a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
> > > > > b/StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c
> > > > > > similarity index 95%
> > > > > > rename from
> > > > > StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
> > > > > > rename to
> > > StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c
> > > > > > index 63fbe26642..165d696f99 100644
> > > > > > ---
> > > > >
> > a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
> > > > > > +++ b/StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c
> > > > > > @@ -2,6 +2,7 @@
> > > > > >
> > > > > >     Copyright (c) 2016 HP Development Company, L.P.
> > > > > >     Copyright (c) 2016 - 2021, Arm Limited. All rights reserved.
> > > > > > +  Copyright (c) 2021, Linaro Limited
> > > > > >
> > > > > >     SPDX-License-Identifier: BSD-2-Clause-Patent
> > > > > >
> > > > > > @@ -92,8 +93,8 @@ PiMmStandaloneArmTfCpuDriverEntry (
> > > > > >     // receipt of a synchronous MM request. Use the Event ID to
> > > > > distinguish
> > > > > >     // between synchronous and asynchronous events.
> > > > > >     //
> > > > > > -  if ((ARM_SMC_ID_MM_COMMUNICATE_AARCH64 != EventId) &&
> > > > > > -      (ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ_AARCH64 !=
> > > > > EventId)) {
> > > > > > +  if ((ARM_SMC_ID_MM_COMMUNICATE != EventId) &&
> > > > > > +      (ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ != EventId)) {
> > > > > >       DEBUG ((DEBUG_INFO, "UnRecognized Event - 0x%x\n",
> > > EventId));
> > > > > >       return EFI_INVALID_PARAMETER;
> > > > > >     }
> > > > > > diff --git
> > > > >
> > >
> > a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCp
> > > > > u.c
> > > b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c
> > > > > > similarity index 96%
> > > > > > rename from
> > > > >
> > >
> > StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.
> > > > > c
> > > > > > rename to
> > > > > StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c
> > > > > > index d4590bcd19..10097f792f 100644
> > > > > > ---
> > > > >
> > >
> > a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCp
> > > > > u.c
> > > > > > +++
> > > b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c
> > > > > > @@ -10,7 +10,7 @@
> > > > > >
> > > > > >   #include <Base.h>
> > > > > >   #include <Pi/PiMmCis.h>
> > > > > > -#include <Library/AArch64/StandaloneMmCoreEntryPoint.h>
> > > > > > +#include <Library/Arm/StandaloneMmCoreEntryPoint.h>
> > > > > >   #include <Library/DebugLib.h>
> > > > > >   #include <Library/ArmSvcLib.h>
> > > > > >   #include <Library/ArmLib.h>
> > > > > > diff --git
> > > > >
> > >
> > a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCp
> > > > > u.h
> > > b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.h
> > > > > > similarity index 100%
> > > > > > rename from
> > > > >
> > >
> > StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.
> > > > > h
> > > > > > rename to
> > > > > StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.h
> > > > > > diff --git
> > > > >
> > >
> > a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCp
> > > > > u.inf
> > > b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf
> > > > > > similarity index 100%
> > > > > > rename from
> > > > >
> > >
> > StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.i
> > > > > nf
> > > > > > rename to
> > > > > StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf
> > > > > > diff --git
> > > > >
> > >
> > a/StandaloneMmPkg/Include/Library/AArch64/StandaloneMmCoreEntryPoin
> > > > > t.h
> > > > >
> > > b/StandaloneMmPkg/Include/Library/Arm/StandaloneMmCoreEntryPoint.h
> > > > > > similarity index 100%
> > > > > > rename from
> > > > >
> > >
> > StandaloneMmPkg/Include/Library/AArch64/StandaloneMmCoreEntryPoint.h
> > > > > > rename to
> > > > >
> > StandaloneMmPkg/Include/Library/Arm/StandaloneMmCoreEntryPoint.h
> > > > > > diff --git
> > > > >
> > >
> > a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Create
> > > > > HobList.c
> > > > >
> > >
> > b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHob
> > > > > List.c
> > > > > > similarity index 97%
> > > > > > rename from
> > > > >
> > >
> > StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/CreateHo
> > > > > bList.c
> > > > > > rename to
> > > > >
> > >
> > StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHobLis
> > > > > t.c
> > > > > > index 4d4cf3d5ff..85f8194687 100644
> > > > > > ---
> > > > >
> > >
> > a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Create
> > > > > HobList.c
> > > > > > +++
> > > > >
> > >
> > b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHob
> > > > > List.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/SetPer
> > > > > missions.c
> > > > >
> > >
> > b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPermissi
> > > > > ons.c
> > > > > > similarity index 96%
> > > > > > rename from
> > > > >
> > >
> > StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/SetPermi
> > > > > ssions.c
> > > > > > rename to
> > > > >
> > >
> > StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPermissio
> > > > > ns.c
> > > > > > index 4a380df4a6..cd4b90823e 100644
> > > > > > ---
> > > > >
> > >
> > a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/SetPer
> > > > > missions.c
> > > > > > +++
> > > > >
> > >
> > b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPermissi
> > > > > ons.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/Standa
> > > > > loneMmCoreEntryPoint.c
> > > > >
> > >
> > b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/Standalone
> > > > > MmCoreEntryPoint.c
> > > > > > similarity index 94%
> > > > > > rename from
> > > > >
> > >
> > StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Standalo
> > > > > neMmCoreEntryPoint.c
> > > > > > rename to
> > > > >
> > >
> > StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/StandaloneM
> > > > > mCoreEntryPoint.c
> > > > > > index b445d6942e..49cf51a789 100644
> > > > > > ---
> > > > >
> > >
> > a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Standa
> > > > > loneMmCoreEntryPoint.c
> > > > > > +++
> > > > >
> > >
> > b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/Standalone
> > > > > MmCoreEntryPoint.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/StandaloneMm
> > > > > CoreEntryPoint.inf
> > > > >
> > >
> > b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMm
> > > > > CoreEntryPoint.inf
> > > > > > index 4fa426f58e..1762586cfa 100644
> > > > > > ---
> > > > >
> > >
> > a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMm
> > > > > CoreEntryPoint.inf
> > > > > > +++
> > > > >
> > >
> > b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMm
> > > > > CoreEntryPoint.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]
> > > > > > diff --git
> > > > >
> > >
> > a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/Standalon
> > > > > eMmCoreHobLib.c
> > > > >
> > >
> > b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneM
> > > > > mCoreHobLib.c
> > > > > > similarity index 100%
> > > > > > rename from
> > > > >
> > >
> > StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/Standalone
> > > > > MmCoreHobLib.c
> > > > > > rename to
> > > > >
> > >
> > StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneMmC
> > > > > oreHobLib.c
> > > > > > diff --git
> > > > >
> > >
> > a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/Standalon
> > > > > eMmCoreHobLibInternal.c
> > > > >
> > >
> > b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneM
> > > > > mCoreHobLibInternal.c
> > > > > > similarity index 100%
> > > > > > rename from
> > > > >
> > >
> > StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/Standalone
> > > > > MmCoreHobLibInternal.c
> > > > > > rename to
> > > > >
> > >
> > StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneMmC
> > > > > oreHobLibInternal.c
> > > > > > diff --git
> > > > >
> > >
> > a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCore
> > > > > HobLib.inf
> > > > >
> > >
> > b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCore
> > > > > HobLib.inf
> > > > > > index a2559920e8..34ed536480 100644
> > > > > > ---
> > > > >
> > >
> > a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCore
> > > > > HobLib.inf
> > > > > > +++
> > > > >
> > >
> > b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCore
> > > > > HobLib.inf
> > > > > > @@ -22,7 +22,7 @@
> > > > > >     LIBRARY_CLASS                  =
> > > > > HobLib|MM_CORE_STANDALONE
> > > > > >
> > > > > >   #
> > > > > > -#  VALID_ARCHITECTURES           = X64 AARCH64
> > > > > > +#  VALID_ARCHITECTURES           = X64 AARCH64 ARM
> > > > > >   #
> > > > > >   [Sources.common]
> > > > > >     Common.c
> > > > > > @@ -30,9 +30,9 @@
> > > > > >   [Sources.X64]
> > > > > >     X64/StandaloneMmCoreHobLib.c
> > > > > >
> > > > > > -[Sources.AARCH64]
> > > > > > -  AArch64/StandaloneMmCoreHobLib.c
> > > > > > -  AArch64/StandaloneMmCoreHobLibInternal.c
> > > > > > +[Sources.AARCH64, Sources.ARM]
> > > > > > +  Arm/StandaloneMmCoreHobLib.c
> > > > > > +  Arm/StandaloneMmCoreHobLibInternal.c
> > > > > >
> > > > > >   [Packages]
> > > > > >     MdePkg/MdePkg.dec
> > > > > > diff --git
> > > > >
> > >
> > a/StandaloneMmPkg/Library/StandaloneMmMemLib/AArch64/StandaloneM
> > > > > mMemLibInternal.c
> > > > >
> > >
> > b/StandaloneMmPkg/Library/StandaloneMmMemLib/ArmStandaloneMmMe
> > > > > mLibInternal.c
> > > > > > similarity index 86%
> > > > > > rename from
> > > > >
> > >
> > StandaloneMmPkg/Library/StandaloneMmMemLib/AArch64/StandaloneMm
> > > > > MemLibInternal.c
> > > > > > rename to
> > > > >
> > >
> > StandaloneMmPkg/Library/StandaloneMmMemLib/ArmStandaloneMmMemL
> > > > > ibInternal.c
> > > > > > index 4124959e04..fa7df46413 100644
> > > > > > ---
> > > > >
> > >
> > a/StandaloneMmPkg/Library/StandaloneMmMemLib/AArch64/StandaloneM
> > > > > mMemLibInternal.c
> > > > > > +++
> > > > >
> > >
> > b/StandaloneMmPkg/Library/StandaloneMmMemLib/ArmStandaloneMmMe
> > > > > mLibInternal.c
> > > > > > @@ -20,6 +20,13 @@
> > > > > >   //
> > > > > >   extern EFI_PHYSICAL_ADDRESS
> > > > > mMmMemLibInternalMaximumSupportAddress;
> > > > > >
> > > > > > +#ifdef MDE_CPU_AARCH64
> > > > > > +#define ARM_PHYSICAL_ADDRESS_BITS 36
> > > > > > +#endif
> > > > > > +#ifdef MDE_CPU_ARM
> > > > > > +#define ARM_PHYSICAL_ADDRESS_BITS 32
> > > > > > +#endif
> > > > > > +
> > > > > >   /**
> > > > > >     Calculate and save the maximum support address.
> > > > > >
> > > > > > @@ -31,7 +38,7 @@
> > > > > MmMemLibInternalCalculateMaximumSupportAddress (
> > > > > >   {
> > > > > >     UINT8        PhysicalAddressBits;
> > > > > >
> > > > > > -  PhysicalAddressBits = 36;
> > > > > > +  PhysicalAddressBits = ARM_PHYSICAL_ADDRESS_BITS;
> > > > > >
> > > > > >     //
> > > > > >     // Save the maximum support address in one global variable
> > > > > > diff --git
> > > > >
> > >
> > a/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib
> > > > > .inf
> > > > >
> > >
> > b/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib
> > > > > .inf
> > > > > > index 062b0d7a11..b29d97a746 100644
> > > > > > ---
> > > > >
> > >
> > a/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib
> > > > > .inf
> > > > > > +++
> > > > >
> > >
> > b/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib
> > > > > .inf
> > > > > > @@ -28,7 +28,7 @@
> > > > > >   #
> > > > > >   # The following information is for reference only and not required
> > by
> > > the
> > > > > build tools.
> > > > > >   #
> > > > > > -#  VALID_ARCHITECTURES           = IA32 X64 AARCH64
> > > > > > +#  VALID_ARCHITECTURES           = IA32 X64 AARCH64 ARM
> > > > > >   #
> > > > > >
> > > > > >   [Sources.Common]
> > > > > > @@ -37,8 +37,8 @@
> > > > > >   [Sources.IA32, Sources.X64]
> > > > > >     X86StandaloneMmMemLibInternal.c
> > > > > >
> > > > > > -[Sources.AARCH64]
> > > > > > -  AArch64/StandaloneMmMemLibInternal.c
> > > > > > +[Sources.AARCH64, Sources.ARM]
> > > > > > +  ArmStandaloneMmMemLibInternal.c
> > > > > >
> > > > > >   [Packages]
> > > > > >     MdePkg/MdePkg.dec
> > > > > > diff --git
> > > > >
> > >
> > a/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDepende
> > > > > ncy.inf
> > > > >
> > >
> > b/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDepende
> > > > > ncy.inf
> > > > > > index a2a059c5d6..ffb2a6d083 100644
> > > > > > ---
> > > > >
> > >
> > a/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDepende
> > > > > ncy.inf
> > > > > > +++
> > > > >
> > >
> > b/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDepende
> > > > > ncy.inf
> > > > > > @@ -20,7 +20,7 @@
> > > > > >   #
> > > > > >   # The following information is for reference only and not required
> > by
> > > the
> > > > > build tools.
> > > > > >   #
> > > > > > -#  VALID_ARCHITECTURES           = AARCH64
> > > > > > +#  VALID_ARCHITECTURES           = AARCH64|ARM
> > > > > >   #
> > > > > >   #
> > > > > >
> > > > > > diff --git a/StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > > b/StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > > > index 0c45df95e2..8012f93b7d 100644
> > > > > > --- a/StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > > > +++ b/StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > > > @@ -20,7 +20,7 @@
> > > > > >     PLATFORM_VERSION               = 1.0
> > > > > >     DSC_SPECIFICATION              = 0x00010011
> > > > > >     OUTPUT_DIRECTORY               = Build/StandaloneMm
> > > > > > -  SUPPORTED_ARCHITECTURES        = AARCH64|X64
> > > > > > +  SUPPORTED_ARCHITECTURES        = AARCH64|X64|ARM
> > > > > >     BUILD_TARGETS                  = DEBUG|RELEASE
> > > > > >     SKUID_IDENTIFIER               = DEFAULT
> > > > > >
> > > > > > @@ -60,7 +60,7 @@
> > > > > >
> > > > >
> > >
> > StandaloneMmDriverEntryPoint|MdePkg/Library/StandaloneMmDriverEntryP
> > > > > oint/StandaloneMmDriverEntryPoint.inf
> > > > > >
> > > > >
> > >
> > VariableMmDependency|StandaloneMmPkg/Library/VariableMmDependenc
> > > > > y/VariableMmDependency.inf
> > > > > >
> > > > > > -[LibraryClasses.AARCH64]
> > > > > > +[LibraryClasses.AARCH64, LibraryClasses.ARM]
> > > > > >     ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
> > > > > >
> > > > >
> > >
> > StandaloneMmMmuLib|ArmPkg/Library/StandaloneMmMmuLib/ArmMmuSt
> > > > > andaloneMmLib.inf
> > > > > >     ArmSvcLib|ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf
> > > > > > @@ -118,8 +118,8 @@
> > > > > >
> > > > >
> > >
> > StandaloneMmPkg/Library/StandaloneMmMemoryAllocationLib/Standalone
> > > > > MmMemoryAllocationLib.inf
> > > > > >
> > > > >
> > >
> > StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependenc
> > > > > y.inf
> > > > > >
> > > > > > -[Components.AARCH64]
> > > > > > -
> > > > >
> > >
> > StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.i
> > > > > nf
> > > > > > +[Components.AARCH64, Components.ARM]
> > > > > > +
> > > StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf
> > > > > >
> > > > >
> > >
> > StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/Standalone
> > > > > MmPeCoffExtraActionLib.inf
> > > > > >
> > > > > >
> > > > >
> > >
> > ##############################################################
> > > > > #####################################
> > > > > > @@ -135,6 +135,10 @@
> > > > > >   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
> > > > > -march=armv8-a+nofp -mstrict-align
> > > > > >   GCC:*_*_*_CC_FLAGS = -mstrict-align
> > > > > >
> > > > > > +[BuildOptions.ARM]
> > > > > > +GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
> > > > > -march=armv7-a
> > > > > > +GCC:*_*_*_CC_FLAGS = -fno-stack-protector
> > > > > > +
> > > > > >   [BuildOptions.X64]
> > > > > >     MSFT:*_*_*_DLINK_FLAGS = /ALIGN:4096
> > > > > >     GCC:*_GCC*_*_DLINK_FLAGS = -z common-page-size=0x1000
> > > > >
> > > > >
> > > > >
> > > > >
> > > > >
> > > >
> > > >
> > > >
> > > >
> > > >
> > > >
> > > >
> > > >
> > >
> > >
> > >
> > >
> >
> >
> >
> >
> >
> > 
> >
>
>
>
>

回复: [edk2-devel] [PATCH v4 5/5] StandaloneMmPkg: build for 32bit arm machines

[gaoliming]

Etienne: 

I check the build log. Two build failure here. Can you update the patch to fix them?

1. Two modules are only for AARCH64. They should be specified in [Components.AARCH64] in ArmPkg\ArmPkg.dsc
  ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.inf
  ArmPkg/Library/ArmMmuLib/ArmMmuPeiLib.inf

2. StandaloneMmCoreEntryPoint library class header file is changed. It should also be updated in StandaloneMmPkg\StandaloneMmPkg.dec

ERROR - Library StandaloneMmCoreEntryPoint with path Include/Library/AArch64/StandaloneMmCoreEntryPoint.h not found in package filesystem
ERROR - Library Header File Include/Library/Arm/StandaloneMmCoreEntryPoint.h not declared in package DEC StandaloneMmPkg/StandaloneMmPkg.dec

Thanks
Liming
> -----邮件原件-----
> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Ard
> Biesheuvel
> 发送时间: 2021年7月28日 14:52
> 收件人: Sami Mujawar <Sami.Mujawar@arm.com>
> 抄送: gaoliming <gaoliming@byosoft.com.cn>; devel@edk2.groups.io;
> Etienne Carriere <etienne.carriere@linaro.org>; Achin Gupta
> <Achin.Gupta@arm.com>; Ard Biesheuvel <ardb+tianocore@kernel.org>;
> Jiewen Yao <jiewen.yao@intel.com>; Leif Lindholm <leif@nuviainc.com>;
> Sughosh Ganu <sughosh.ganu@linaro.org>; nd <nd@arm.com>
> 主题: Re: [edk2-devel] [PATCH v4 5/5] StandaloneMmPkg: build for 32bit arm
> machines
> 
> On Wed, 28 Jul 2021 at 08:41, Sami Mujawar <Sami.Mujawar@arm.com>
> wrote:
> >
> > Hi Liming,
> >
> > I will look into this shortly.
> >
> 
> I submitted it here
> 
> https://github.com/tianocore/edk2/pull/1823
> 
> but it triggered a CI failure that was not immediately obvious to me,
> and I haven't had time yet to dig into it.
> 
> 
> >
> > ________________________________
> > From: gaoliming <gaoliming@byosoft.com.cn>
> > Sent: Wednesday, 28 July 2021, 7:33 am
> > To: devel@edk2.groups.io; gaoliming@byosoft.com.cn; ardb@kernel.org
> > Cc: Sami Mujawar; 'Etienne Carriere'; Achin Gupta; 'Ard Biesheuvel';
> 'Jiewen Yao'; 'Leif Lindholm'; 'Sughosh Ganu'; nd
> > Subject: 回复: [edk2-devel] [PATCH v4 5/5] StandaloneMmPkg: build for
> 32bit arm machines
> >
> > Ard and Sami:
> >   Will you help merge this patch set for 202108 stable tag?
> >
> > Thanks
> > Liming
> > > -----邮件原件-----
> > > 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 gaoliming
> > > 发送时间: 2021年7月20日 17:21
> > > 收件人: devel@edk2.groups.io; ardb@kernel.org
> > > 抄送: 'Sami Mujawar' <sami.mujawar@arm.com>; 'Etienne Carriere'
> > > <etienne.carriere@linaro.org>; 'Achin Gupta' <achin.gupta@arm.com>;
> 'Ard
> > > Biesheuvel' <ardb+tianocore@kernel.org>; 'Jiewen Yao'
> > > <jiewen.yao@intel.com>; 'Leif Lindholm' <leif@nuviainc.com>; 'Sughosh
> > > Ganu' <sughosh.ganu@linaro.org>; 'nd' <nd@arm.com>
> > > 主题: 回复: [edk2-devel] [PATCH v4 5/5] StandaloneMmPkg: build for
> 32bit
> > > arm machines
> > >
> > > Ard:
> > >   Thanks! I have added this feature into
> > >
> https://github.com/tianocore/tianocore.github.io/wiki/EDK-II-Release-Planni
> > > ng.
> > >
> > > Thanks
> > > Liming
> > > > -----邮件原件-----
> > > > 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Ard
> > > > Biesheuvel
> > > > 发送时间: 2021年7月20日 15:46
> > > > 收件人: edk2-devel-groups-io <devel@edk2.groups.io>; Liming Gao
> > > (Byosoft
> > > > address) <gaoliming@byosoft.com.cn>
> > > > 抄送: Sami Mujawar <sami.mujawar@arm.com>; Etienne Carriere
> > > > <etienne.carriere@linaro.org>; Achin Gupta <achin.gupta@arm.com>;
> Ard
> > > > Biesheuvel <ardb+tianocore@kernel.org>; Jiewen Yao
> > > > <jiewen.yao@intel.com>; Leif Lindholm <leif@nuviainc.com>; Sughosh
> > > Ganu
> > > > <sughosh.ganu@linaro.org>; nd <nd@arm.com>
> > > > 主题: Re: [edk2-devel] [PATCH v4 5/5] StandaloneMmPkg: build for
> 32bit
> > > arm
> > > > machines
> > > >
> > > > On Tue, 20 Jul 2021 at 04:01, gaoliming <gaoliming@byosoft.com.cn>
> > > wrote:
> > > > >
> > > > > Hi, all
> > > > >   This patch set has passed code review. How about merge it for this
> > > > stable tag edk2 202108?
> > > > >
> > > >
> > > > OK, I will pick these up. Would you mind creating the entry for the
> > > > release notes?
> > > >
> > > >
> > > > > Thanks
> > > > > Liming
> > > > > > -----邮件原件-----
> > > > > > 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表
> Sami
> > > > > > Mujawar
> > > > > > 发送时间: 2021年5月19日 17:58
> > > > > > 收件人: Etienne Carriere <etienne.carriere@linaro.org>;
> > > > > > devel@edk2.groups.io
> > > > > > 抄送: Achin Gupta <achin.gupta@arm.com>; Ard Biesheuvel
> > > > > > <ardb+tianocore@kernel.org>; Jiewen Yao <jiewen.yao@intel.com>;
> > > Leif
> > > > > > Lindholm <leif@nuviainc.com>; Sughosh Ganu
> > > > <sughosh.ganu@linaro.org>;
> > > > > > nd@arm.com
> > > > > > 主题: Re: [edk2-devel] [PATCH v4 5/5] StandaloneMmPkg: build for
> > > 32bit
> > > > arm
> > > > > > machines
> > > > > >
> > > > > > Hi Etienn,
> > > > > >
> > > > > > This patch looks good to me.
> > > > > >
> > > > > > Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
> > > > > >
> > > > > > Regards,
> > > > > >
> > > > > > Sami Mujawar
> > > > > >
> > > > > > On 19/05/2021 08:14 AM, Etienne Carriere wrote:
> > > > > > > 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>
> > > > > > > ---
> > > > > > > Changes since v3:
> > > > > > > - Fix BuildOptions.ARM in StandaloneMmPkg.
> > > > > > > - Remove Cc tags.
> > > > > > >
> > > > > > > No change since v2
> > > > > > >
> > > > > > > Changes since v1:
> > > > > > > - ARM_SMC_ID_MM_COMMUNICATE 32b/64b agnostic helper ID
> is
> > > > > > defined
> > > > > > >    in ArmStdSmc.h (see 1st commit in this series) instead of being
> > > > > > >    local to EventHandle.c.
> > > > > > > - Fix void occurrence to VOID.
> > > > > > > - Fix path in StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > > > > ---
> > > > > > >   StandaloneMmPkg/Core/StandaloneMmCore.inf
> > > > > > |  2 +-
> > > > > > >   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64
> > > > > > => }/EventHandle.c
> > > > > > |  5 +++--
> > > > > > >   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64
> > > > > > => }/StandaloneMmCpu.c
> > > > > > |  2 +-
> > > > > > >   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64
> > > > > > => }/StandaloneMmCpu.h
> > > > > > |  0
> > > > > > >   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64
> > > > > > => }/StandaloneMmCpu.inf
> > > > > > |  0
> > > > > > >   StandaloneMmPkg/Include/Library/{AArch64 =>
> > > > > > Arm}/StandaloneMmCoreEntryPoint.h
> > > > > > |  0
> > > > > > >
> > > StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/{AArch64
> > > > =>
> > > > > > Arm}/CreateHobList.c                                  |
> 2 +-
> > > > > > >
> > > StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/{AArch64
> > > > =>
> > > > > > Arm}/SetPermissions.c                                 |  2
> +-
> > > > > > >
> > > StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/{AArch64
> > > > =>
> > > > > > Arm}/StandaloneMmCoreEntryPoint.c                     | 16
> > > > > > ++++++++--------
> > > > > > >
> > > > > >
> > > >
> > >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCor
> > > > > > eEntryPoint.inf                                    | 14
> > > > > > +++++++-------
> > > > > > >
> StandaloneMmPkg/Library/StandaloneMmCoreHobLib/{AArch64
> > > =>
> > > > > > Arm}/StandaloneMmCoreHobLib.c
> |
> > > > 0
> > > > > > >
> StandaloneMmPkg/Library/StandaloneMmCoreHobLib/{AArch64
> > > =>
> > > > > > Arm}/StandaloneMmCoreHobLibInternal.c
> |
> > > 0
> > > > > > >
> > > > > >
> > > >
> > >
> StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreH
> > > > > > obLib.inf                                            |  8
> > > > ++++----
> > > > > > >
> > > > > >
> > > >
> > >
> StandaloneMmPkg/Library/StandaloneMmMemLib/{AArch64/StandaloneMm
> > > > > > MemLibInternal.c => ArmStandaloneMmMemLibInternal.c} |  9
> > > > ++++++++-
> > > > > > >
> > > > > >
> > > >
> > >
> StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.i
> > > > > > nf                                                    |
> 6
> > > > > > +++---
> > > > > > >
> > > > > >
> > > >
> > >
> StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependenc
> > > > > > y.inf                                                |
> 2 +-
> > > > > > >   StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > > > | 12 ++++++++----
> > > > > > >   17 files changed, 46 insertions(+), 34 deletions(-)
> > > > > > >
> > > > > > > diff --git a/StandaloneMmPkg/Core/StandaloneMmCore.inf
> > > > > > b/StandaloneMmPkg/Core/StandaloneMmCore.inf
> > > > > > > index 87bf6e9440..56042b7b39 100644
> > > > > > > --- a/StandaloneMmPkg/Core/StandaloneMmCore.inf
> > > > > > > +++ b/StandaloneMmPkg/Core/StandaloneMmCore.inf
> > > > > > > @@ -17,7 +17,7 @@
> > > > > > >     PI_SPECIFICATION_VERSION       = 0x00010032
> > > > > > >     ENTRY_POINT                    =
> StandaloneMmMain
> > > > > > >
> > > > > > > -#  VALID_ARCHITECTURES           = IA32 X64 AARCH64
> > > > > > > +#  VALID_ARCHITECTURES           = IA32 X64 AARCH64
> ARM
> > > > > > >
> > > > > > >   [Sources]
> > > > > > >     StandaloneMmCore.c
> > > > > > > diff --git
> > > > > >
> > > a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
> > > > > > b/StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c
> > > > > > > similarity index 95%
> > > > > > > rename from
> > > > > >
> StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
> > > > > > > rename to
> > > > StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c
> > > > > > > index 63fbe26642..165d696f99 100644
> > > > > > > ---
> > > > > >
> > > a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
> > > > > > > +++
> b/StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c
> > > > > > > @@ -2,6 +2,7 @@
> > > > > > >
> > > > > > >     Copyright (c) 2016 HP Development Company, L.P.
> > > > > > >     Copyright (c) 2016 - 2021, Arm Limited. All rights reserved.
> > > > > > > +  Copyright (c) 2021, Linaro Limited
> > > > > > >
> > > > > > >     SPDX-License-Identifier: BSD-2-Clause-Patent
> > > > > > >
> > > > > > > @@ -92,8 +93,8 @@ PiMmStandaloneArmTfCpuDriverEntry (
> > > > > > >     // receipt of a synchronous MM request. Use the Event ID to
> > > > > > distinguish
> > > > > > >     // between synchronous and asynchronous events.
> > > > > > >     //
> > > > > > > -  if ((ARM_SMC_ID_MM_COMMUNICATE_AARCH64 != EventId)
> &&
> > > > > > > -
> (ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ_AARCH64 !=
> > > > > > EventId)) {
> > > > > > > +  if ((ARM_SMC_ID_MM_COMMUNICATE != EventId) &&
> > > > > > > +      (ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ != EventId))
> {
> > > > > > >       DEBUG ((DEBUG_INFO, "UnRecognized Event - 0x%x\n",
> > > > EventId));
> > > > > > >       return EFI_INVALID_PARAMETER;
> > > > > > >     }
> > > > > > > diff --git
> > > > > >
> > > >
> > >
> a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCp
> > > > > > u.c
> > > > b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c
> > > > > > > similarity index 96%
> > > > > > > rename from
> > > > > >
> > > >
> > >
> StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.
> > > > > > c
> > > > > > > rename to
> > > > > >
> StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c
> > > > > > > index d4590bcd19..10097f792f 100644
> > > > > > > ---
> > > > > >
> > > >
> > >
> a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCp
> > > > > > u.c
> > > > > > > +++
> > > > b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c
> > > > > > > @@ -10,7 +10,7 @@
> > > > > > >
> > > > > > >   #include <Base.h>
> > > > > > >   #include <Pi/PiMmCis.h>
> > > > > > > -#include <Library/AArch64/StandaloneMmCoreEntryPoint.h>
> > > > > > > +#include <Library/Arm/StandaloneMmCoreEntryPoint.h>
> > > > > > >   #include <Library/DebugLib.h>
> > > > > > >   #include <Library/ArmSvcLib.h>
> > > > > > >   #include <Library/ArmLib.h>
> > > > > > > diff --git
> > > > > >
> > > >
> > >
> a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCp
> > > > > > u.h
> > > > b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.h
> > > > > > > similarity index 100%
> > > > > > > rename from
> > > > > >
> > > >
> > >
> StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.
> > > > > > h
> > > > > > > rename to
> > > > > >
> StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.h
> > > > > > > diff --git
> > > > > >
> > > >
> > >
> a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCp
> > > > > > u.inf
> > > >
> b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf
> > > > > > > similarity index 100%
> > > > > > > rename from
> > > > > >
> > > >
> > >
> StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.i
> > > > > > nf
> > > > > > > rename to
> > > > > >
> StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf
> > > > > > > diff --git
> > > > > >
> > > >
> > >
> a/StandaloneMmPkg/Include/Library/AArch64/StandaloneMmCoreEntryPoin
> > > > > > t.h
> > > > > >
> > > >
> b/StandaloneMmPkg/Include/Library/Arm/StandaloneMmCoreEntryPoint.h
> > > > > > > similarity index 100%
> > > > > > > rename from
> > > > > >
> > > >
> > >
> StandaloneMmPkg/Include/Library/AArch64/StandaloneMmCoreEntryPoint.h
> > > > > > > rename to
> > > > > >
> > > StandaloneMmPkg/Include/Library/Arm/StandaloneMmCoreEntryPoint.h
> > > > > > > diff --git
> > > > > >
> > > >
> > >
> a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Create
> > > > > > HobList.c
> > > > > >
> > > >
> > >
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHob
> > > > > > List.c
> > > > > > > similarity index 97%
> > > > > > > rename from
> > > > > >
> > > >
> > >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/CreateHo
> > > > > > bList.c
> > > > > > > rename to
> > > > > >
> > > >
> > >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHobLis
> > > > > > t.c
> > > > > > > index 4d4cf3d5ff..85f8194687 100644
> > > > > > > ---
> > > > > >
> > > >
> > >
> a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Create
> > > > > > HobList.c
> > > > > > > +++
> > > > > >
> > > >
> > >
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHob
> > > > > > List.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/SetPer
> > > > > > missions.c
> > > > > >
> > > >
> > >
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPermissi
> > > > > > ons.c
> > > > > > > similarity index 96%
> > > > > > > rename from
> > > > > >
> > > >
> > >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/SetPermi
> > > > > > ssions.c
> > > > > > > rename to
> > > > > >
> > > >
> > >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPermissio
> > > > > > ns.c
> > > > > > > index 4a380df4a6..cd4b90823e 100644
> > > > > > > ---
> > > > > >
> > > >
> > >
> a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/SetPer
> > > > > > missions.c
> > > > > > > +++
> > > > > >
> > > >
> > >
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPermissi
> > > > > > ons.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/Standa
> > > > > > loneMmCoreEntryPoint.c
> > > > > >
> > > >
> > >
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/Standalone
> > > > > > MmCoreEntryPoint.c
> > > > > > > similarity index 94%
> > > > > > > rename from
> > > > > >
> > > >
> > >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Standalo
> > > > > > neMmCoreEntryPoint.c
> > > > > > > rename to
> > > > > >
> > > >
> > >
> StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/StandaloneM
> > > > > > mCoreEntryPoint.c
> > > > > > > index b445d6942e..49cf51a789 100644
> > > > > > > ---
> > > > > >
> > > >
> > >
> a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Standa
> > > > > > loneMmCoreEntryPoint.c
> > > > > > > +++
> > > > > >
> > > >
> > >
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/Standalone
> > > > > > MmCoreEntryPoint.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/StandaloneMm
> > > > > > CoreEntryPoint.inf
> > > > > >
> > > >
> > >
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMm
> > > > > > CoreEntryPoint.inf
> > > > > > > index 4fa426f58e..1762586cfa 100644
> > > > > > > ---
> > > > > >
> > > >
> > >
> a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMm
> > > > > > CoreEntryPoint.inf
> > > > > > > +++
> > > > > >
> > > >
> > >
> b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMm
> > > > > > CoreEntryPoint.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]
> > > > > > > diff --git
> > > > > >
> > > >
> > >
> a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/Standalon
> > > > > > eMmCoreHobLib.c
> > > > > >
> > > >
> > >
> b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneM
> > > > > > mCoreHobLib.c
> > > > > > > similarity index 100%
> > > > > > > rename from
> > > > > >
> > > >
> > >
> StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/Standalone
> > > > > > MmCoreHobLib.c
> > > > > > > rename to
> > > > > >
> > > >
> > >
> StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneMmC
> > > > > > oreHobLib.c
> > > > > > > diff --git
> > > > > >
> > > >
> > >
> a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/Standalon
> > > > > > eMmCoreHobLibInternal.c
> > > > > >
> > > >
> > >
> b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneM
> > > > > > mCoreHobLibInternal.c
> > > > > > > similarity index 100%
> > > > > > > rename from
> > > > > >
> > > >
> > >
> StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/Standalone
> > > > > > MmCoreHobLibInternal.c
> > > > > > > rename to
> > > > > >
> > > >
> > >
> StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneMmC
> > > > > > oreHobLibInternal.c
> > > > > > > diff --git
> > > > > >
> > > >
> > >
> a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCore
> > > > > > HobLib.inf
> > > > > >
> > > >
> > >
> b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCore
> > > > > > HobLib.inf
> > > > > > > index a2559920e8..34ed536480 100644
> > > > > > > ---
> > > > > >
> > > >
> > >
> a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCore
> > > > > > HobLib.inf
> > > > > > > +++
> > > > > >
> > > >
> > >
> b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCore
> > > > > > HobLib.inf
> > > > > > > @@ -22,7 +22,7 @@
> > > > > > >     LIBRARY_CLASS                  =
> > > > > > HobLib|MM_CORE_STANDALONE
> > > > > > >
> > > > > > >   #
> > > > > > > -#  VALID_ARCHITECTURES           = X64 AARCH64
> > > > > > > +#  VALID_ARCHITECTURES           = X64 AARCH64 ARM
> > > > > > >   #
> > > > > > >   [Sources.common]
> > > > > > >     Common.c
> > > > > > > @@ -30,9 +30,9 @@
> > > > > > >   [Sources.X64]
> > > > > > >     X64/StandaloneMmCoreHobLib.c
> > > > > > >
> > > > > > > -[Sources.AARCH64]
> > > > > > > -  AArch64/StandaloneMmCoreHobLib.c
> > > > > > > -  AArch64/StandaloneMmCoreHobLibInternal.c
> > > > > > > +[Sources.AARCH64, Sources.ARM]
> > > > > > > +  Arm/StandaloneMmCoreHobLib.c
> > > > > > > +  Arm/StandaloneMmCoreHobLibInternal.c
> > > > > > >
> > > > > > >   [Packages]
> > > > > > >     MdePkg/MdePkg.dec
> > > > > > > diff --git
> > > > > >
> > > >
> > >
> a/StandaloneMmPkg/Library/StandaloneMmMemLib/AArch64/StandaloneM
> > > > > > mMemLibInternal.c
> > > > > >
> > > >
> > >
> b/StandaloneMmPkg/Library/StandaloneMmMemLib/ArmStandaloneMmMe
> > > > > > mLibInternal.c
> > > > > > > similarity index 86%
> > > > > > > rename from
> > > > > >
> > > >
> > >
> StandaloneMmPkg/Library/StandaloneMmMemLib/AArch64/StandaloneMm
> > > > > > MemLibInternal.c
> > > > > > > rename to
> > > > > >
> > > >
> > >
> StandaloneMmPkg/Library/StandaloneMmMemLib/ArmStandaloneMmMemL
> > > > > > ibInternal.c
> > > > > > > index 4124959e04..fa7df46413 100644
> > > > > > > ---
> > > > > >
> > > >
> > >
> a/StandaloneMmPkg/Library/StandaloneMmMemLib/AArch64/StandaloneM
> > > > > > mMemLibInternal.c
> > > > > > > +++
> > > > > >
> > > >
> > >
> b/StandaloneMmPkg/Library/StandaloneMmMemLib/ArmStandaloneMmMe
> > > > > > mLibInternal.c
> > > > > > > @@ -20,6 +20,13 @@
> > > > > > >   //
> > > > > > >   extern EFI_PHYSICAL_ADDRESS
> > > > > > mMmMemLibInternalMaximumSupportAddress;
> > > > > > >
> > > > > > > +#ifdef MDE_CPU_AARCH64
> > > > > > > +#define ARM_PHYSICAL_ADDRESS_BITS 36
> > > > > > > +#endif
> > > > > > > +#ifdef MDE_CPU_ARM
> > > > > > > +#define ARM_PHYSICAL_ADDRESS_BITS 32
> > > > > > > +#endif
> > > > > > > +
> > > > > > >   /**
> > > > > > >     Calculate and save the maximum support address.
> > > > > > >
> > > > > > > @@ -31,7 +38,7 @@
> > > > > > MmMemLibInternalCalculateMaximumSupportAddress (
> > > > > > >   {
> > > > > > >     UINT8        PhysicalAddressBits;
> > > > > > >
> > > > > > > -  PhysicalAddressBits = 36;
> > > > > > > +  PhysicalAddressBits = ARM_PHYSICAL_ADDRESS_BITS;
> > > > > > >
> > > > > > >     //
> > > > > > >     // Save the maximum support address in one global variable
> > > > > > > diff --git
> > > > > >
> > > >
> > >
> a/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib
> > > > > > .inf
> > > > > >
> > > >
> > >
> b/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib
> > > > > > .inf
> > > > > > > index 062b0d7a11..b29d97a746 100644
> > > > > > > ---
> > > > > >
> > > >
> > >
> a/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib
> > > > > > .inf
> > > > > > > +++
> > > > > >
> > > >
> > >
> b/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib
> > > > > > .inf
> > > > > > > @@ -28,7 +28,7 @@
> > > > > > >   #
> > > > > > >   # The following information is for reference only and not
> required
> > > by
> > > > the
> > > > > > build tools.
> > > > > > >   #
> > > > > > > -#  VALID_ARCHITECTURES           = IA32 X64 AARCH64
> > > > > > > +#  VALID_ARCHITECTURES           = IA32 X64 AARCH64
> ARM
> > > > > > >   #
> > > > > > >
> > > > > > >   [Sources.Common]
> > > > > > > @@ -37,8 +37,8 @@
> > > > > > >   [Sources.IA32, Sources.X64]
> > > > > > >     X86StandaloneMmMemLibInternal.c
> > > > > > >
> > > > > > > -[Sources.AARCH64]
> > > > > > > -  AArch64/StandaloneMmMemLibInternal.c
> > > > > > > +[Sources.AARCH64, Sources.ARM]
> > > > > > > +  ArmStandaloneMmMemLibInternal.c
> > > > > > >
> > > > > > >   [Packages]
> > > > > > >     MdePkg/MdePkg.dec
> > > > > > > diff --git
> > > > > >
> > > >
> > >
> a/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDepende
> > > > > > ncy.inf
> > > > > >
> > > >
> > >
> b/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDepende
> > > > > > ncy.inf
> > > > > > > index a2a059c5d6..ffb2a6d083 100644
> > > > > > > ---
> > > > > >
> > > >
> > >
> a/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDepende
> > > > > > ncy.inf
> > > > > > > +++
> > > > > >
> > > >
> > >
> b/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDepende
> > > > > > ncy.inf
> > > > > > > @@ -20,7 +20,7 @@
> > > > > > >   #
> > > > > > >   # The following information is for reference only and not
> required
> > > by
> > > > the
> > > > > > build tools.
> > > > > > >   #
> > > > > > > -#  VALID_ARCHITECTURES           = AARCH64
> > > > > > > +#  VALID_ARCHITECTURES           = AARCH64|ARM
> > > > > > >   #
> > > > > > >   #
> > > > > > >
> > > > > > > diff --git a/StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > > > b/StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > > > > index 0c45df95e2..8012f93b7d 100644
> > > > > > > --- a/StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > > > > +++ b/StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > > > > @@ -20,7 +20,7 @@
> > > > > > >     PLATFORM_VERSION               = 1.0
> > > > > > >     DSC_SPECIFICATION              = 0x00010011
> > > > > > >     OUTPUT_DIRECTORY               =
> Build/StandaloneMm
> > > > > > > -  SUPPORTED_ARCHITECTURES        = AARCH64|X64
> > > > > > > +  SUPPORTED_ARCHITECTURES        = AARCH64|X64|ARM
> > > > > > >     BUILD_TARGETS                  = DEBUG|RELEASE
> > > > > > >     SKUID_IDENTIFIER               = DEFAULT
> > > > > > >
> > > > > > > @@ -60,7 +60,7 @@
> > > > > > >
> > > > > >
> > > >
> > >
> StandaloneMmDriverEntryPoint|MdePkg/Library/StandaloneMmDriverEntryP
> > > > > > oint/StandaloneMmDriverEntryPoint.inf
> > > > > > >
> > > > > >
> > > >
> > >
> VariableMmDependency|StandaloneMmPkg/Library/VariableMmDependenc
> > > > > > y/VariableMmDependency.inf
> > > > > > >
> > > > > > > -[LibraryClasses.AARCH64]
> > > > > > > +[LibraryClasses.AARCH64, LibraryClasses.ARM]
> > > > > > >     ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
> > > > > > >
> > > > > >
> > > >
> > >
> StandaloneMmMmuLib|ArmPkg/Library/StandaloneMmMmuLib/ArmMmuSt
> > > > > > andaloneMmLib.inf
> > > > > > >     ArmSvcLib|ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf
> > > > > > > @@ -118,8 +118,8 @@
> > > > > > >
> > > > > >
> > > >
> > >
> StandaloneMmPkg/Library/StandaloneMmMemoryAllocationLib/Standalone
> > > > > > MmMemoryAllocationLib.inf
> > > > > > >
> > > > > >
> > > >
> > >
> StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependenc
> > > > > > y.inf
> > > > > > >
> > > > > > > -[Components.AARCH64]
> > > > > > > -
> > > > > >
> > > >
> > >
> StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.i
> > > > > > nf
> > > > > > > +[Components.AARCH64, Components.ARM]
> > > > > > > +
> > > > StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf
> > > > > > >
> > > > > >
> > > >
> > >
> StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/Standalone
> > > > > > MmPeCoffExtraActionLib.inf
> > > > > > >
> > > > > > >
> > > > > >
> > > >
> > >
> ##############################################################
> > > > > > #####################################
> > > > > > > @@ -135,6 +135,10 @@
> > > > > > >   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
> > > > > > -march=armv8-a+nofp -mstrict-align
> > > > > > >   GCC:*_*_*_CC_FLAGS = -mstrict-align
> > > > > > >
> > > > > > > +[BuildOptions.ARM]
> > > > > > > +GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
> > > > > > -march=armv7-a
> > > > > > > +GCC:*_*_*_CC_FLAGS = -fno-stack-protector
> > > > > > > +
> > > > > > >   [BuildOptions.X64]
> > > > > > >     MSFT:*_*_*_DLINK_FLAGS = /ALIGN:4096
> > > > > > >     GCC:*_GCC*_*_DLINK_FLAGS = -z
> common-page-size=0x1000
> > > > > >
> > > > > >
> > > > > >
> > > > > >
> > > > > >
> > > > >
> > > > >
> > > > >
> > > > >
> > > > >
> > > > >
> > > > >
> > > > >
> > > >
> > > >
> > > >
> > > >
> > >
> > >
> > >
> > >
> > >
> > >
> > >
> >
> >
> >
> >
> 
> 
> 
> 

Re: [edk2-devel] [PATCH v4 5/5] StandaloneMmPkg: build for 32bit arm machines

[Etienne Carriere]

Hello Liming

Thanks a lot for helping these patches to land.
I'm back on this and will address comments in a PATCH v5.

Regards,
etienne

On Wed, 28 Jul 2021 at 09:43, gaoliming <gaoliming@byosoft.com.cn> wrote:
>
> Etienne:
>
> I check the build log. Two build failure here. Can you update the patch to fix them?
>
> 1. Two modules are only for AARCH64. They should be specified in [Components.AARCH64] in ArmPkg\ArmPkg.dsc
>   ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.inf
>   ArmPkg/Library/ArmMmuLib/ArmMmuPeiLib.inf
>
> 2. StandaloneMmCoreEntryPoint library class header file is changed. It should also be updated in StandaloneMmPkg\StandaloneMmPkg.dec
>
> ERROR - Library StandaloneMmCoreEntryPoint with path Include/Library/AArch64/StandaloneMmCoreEntryPoint.h not found in package filesystem
> ERROR - Library Header File Include/Library/Arm/StandaloneMmCoreEntryPoint.h not declared in package DEC StandaloneMmPkg/StandaloneMmPkg.dec
>
> Thanks
> Liming
> > -----邮件原件-----
> > 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Ard
> > Biesheuvel
> > 发送时间: 2021年7月28日 14:52
> > 收件人: Sami Mujawar <Sami.Mujawar@arm.com>
> > 抄送: gaoliming <gaoliming@byosoft.com.cn>; devel@edk2.groups.io;
> > Etienne Carriere <etienne.carriere@linaro.org>; Achin Gupta
> > <Achin.Gupta@arm.com>; Ard Biesheuvel <ardb+tianocore@kernel.org>;
> > Jiewen Yao <jiewen.yao@intel.com>; Leif Lindholm <leif@nuviainc.com>;
> > Sughosh Ganu <sughosh.ganu@linaro.org>; nd <nd@arm.com>
> > 主题: Re: [edk2-devel] [PATCH v4 5/5] StandaloneMmPkg: build for 32bit arm
> > machines
> >
> > On Wed, 28 Jul 2021 at 08:41, Sami Mujawar <Sami.Mujawar@arm.com>
> > wrote:
> > >
> > > Hi Liming,
> > >
> > > I will look into this shortly.
> > >
> >
> > I submitted it here
> >
> > https://github.com/tianocore/edk2/pull/1823
> >
> > but it triggered a CI failure that was not immediately obvious to me,
> > and I haven't had time yet to dig into it.
> >
> >
> > >
> > > ________________________________
> > > From: gaoliming <gaoliming@byosoft.com.cn>
> > > Sent: Wednesday, 28 July 2021, 7:33 am
> > > To: devel@edk2.groups.io; gaoliming@byosoft.com.cn; ardb@kernel.org
> > > Cc: Sami Mujawar; 'Etienne Carriere'; Achin Gupta; 'Ard Biesheuvel';
> > 'Jiewen Yao'; 'Leif Lindholm'; 'Sughosh Ganu'; nd
> > > Subject: 回复: [edk2-devel] [PATCH v4 5/5] StandaloneMmPkg: build for
> > 32bit arm machines
> > >
> > > Ard and Sami:
> > >   Will you help merge this patch set for 202108 stable tag?
> > >
> > > Thanks
> > > Liming
> > > > -----邮件原件-----
> > > > 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 gaoliming
> > > > 发送时间: 2021年7月20日 17:21
> > > > 收件人: devel@edk2.groups.io; ardb@kernel.org
> > > > 抄送: 'Sami Mujawar' <sami.mujawar@arm.com>; 'Etienne Carriere'
> > > > <etienne.carriere@linaro.org>; 'Achin Gupta' <achin.gupta@arm.com>;
> > 'Ard
> > > > Biesheuvel' <ardb+tianocore@kernel.org>; 'Jiewen Yao'
> > > > <jiewen.yao@intel.com>; 'Leif Lindholm' <leif@nuviainc.com>; 'Sughosh
> > > > Ganu' <sughosh.ganu@linaro.org>; 'nd' <nd@arm.com>
> > > > 主题: 回复: [edk2-devel] [PATCH v4 5/5] StandaloneMmPkg: build for
> > 32bit
> > > > arm machines
> > > >
> > > > Ard:
> > > >   Thanks! I have added this feature into
> > > >
> > https://github.com/tianocore/tianocore.github.io/wiki/EDK-II-Release-Planni
> > > > ng.
> > > >
> > > > Thanks
> > > > Liming
> > > > > -----邮件原件-----
> > > > > 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Ard
> > > > > Biesheuvel
> > > > > 发送时间: 2021年7月20日 15:46
> > > > > 收件人: edk2-devel-groups-io <devel@edk2.groups.io>; Liming Gao
> > > > (Byosoft
> > > > > address) <gaoliming@byosoft.com.cn>
> > > > > 抄送: Sami Mujawar <sami.mujawar@arm.com>; Etienne Carriere
> > > > > <etienne.carriere@linaro.org>; Achin Gupta <achin.gupta@arm.com>;
> > Ard
> > > > > Biesheuvel <ardb+tianocore@kernel.org>; Jiewen Yao
> > > > > <jiewen.yao@intel.com>; Leif Lindholm <leif@nuviainc.com>; Sughosh
> > > > Ganu
> > > > > <sughosh.ganu@linaro.org>; nd <nd@arm.com>
> > > > > 主题: Re: [edk2-devel] [PATCH v4 5/5] StandaloneMmPkg: build for
> > 32bit
> > > > arm
> > > > > machines
> > > > >
> > > > > On Tue, 20 Jul 2021 at 04:01, gaoliming <gaoliming@byosoft.com.cn>
> > > > wrote:
> > > > > >
> > > > > > Hi, all
> > > > > >   This patch set has passed code review. How about merge it for this
> > > > > stable tag edk2 202108?
> > > > > >
> > > > >
> > > > > OK, I will pick these up. Would you mind creating the entry for the
> > > > > release notes?
> > > > >
> > > > >
> > > > > > Thanks
> > > > > > Liming
> > > > > > > -----邮件原件-----
> > > > > > > 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表
> > Sami
> > > > > > > Mujawar
> > > > > > > 发送时间: 2021年5月19日 17:58
> > > > > > > 收件人: Etienne Carriere <etienne.carriere@linaro.org>;
> > > > > > > devel@edk2.groups.io
> > > > > > > 抄送: Achin Gupta <achin.gupta@arm.com>; Ard Biesheuvel
> > > > > > > <ardb+tianocore@kernel.org>; Jiewen Yao <jiewen.yao@intel.com>;
> > > > Leif
> > > > > > > Lindholm <leif@nuviainc.com>; Sughosh Ganu
> > > > > <sughosh.ganu@linaro.org>;
> > > > > > > nd@arm.com
> > > > > > > 主题: Re: [edk2-devel] [PATCH v4 5/5] StandaloneMmPkg: build for
> > > > 32bit
> > > > > arm
> > > > > > > machines
> > > > > > >
> > > > > > > Hi Etienn,
> > > > > > >
> > > > > > > This patch looks good to me.
> > > > > > >
> > > > > > > Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
> > > > > > >
> > > > > > > Regards,
> > > > > > >
> > > > > > > Sami Mujawar
> > > > > > >
> > > > > > > On 19/05/2021 08:14 AM, Etienne Carriere wrote:
> > > > > > > > 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>
> > > > > > > > ---
> > > > > > > > Changes since v3:
> > > > > > > > - Fix BuildOptions.ARM in StandaloneMmPkg.
> > > > > > > > - Remove Cc tags.
> > > > > > > >
> > > > > > > > No change since v2
> > > > > > > >
> > > > > > > > Changes since v1:
> > > > > > > > - ARM_SMC_ID_MM_COMMUNICATE 32b/64b agnostic helper ID
> > is
> > > > > > > defined
> > > > > > > >    in ArmStdSmc.h (see 1st commit in this series) instead of being
> > > > > > > >    local to EventHandle.c.
> > > > > > > > - Fix void occurrence to VOID.
> > > > > > > > - Fix path in StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > > > > > ---
> > > > > > > >   StandaloneMmPkg/Core/StandaloneMmCore.inf
> > > > > > > |  2 +-
> > > > > > > >   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64
> > > > > > > => }/EventHandle.c
> > > > > > > |  5 +++--
> > > > > > > >   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64
> > > > > > > => }/StandaloneMmCpu.c
> > > > > > > |  2 +-
> > > > > > > >   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64
> > > > > > > => }/StandaloneMmCpu.h
> > > > > > > |  0
> > > > > > > >   StandaloneMmPkg/Drivers/StandaloneMmCpu/{AArch64
> > > > > > > => }/StandaloneMmCpu.inf
> > > > > > > |  0
> > > > > > > >   StandaloneMmPkg/Include/Library/{AArch64 =>
> > > > > > > Arm}/StandaloneMmCoreEntryPoint.h
> > > > > > > |  0
> > > > > > > >
> > > > StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/{AArch64
> > > > > =>
> > > > > > > Arm}/CreateHobList.c                                  |
> > 2 +-
> > > > > > > >
> > > > StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/{AArch64
> > > > > =>
> > > > > > > Arm}/SetPermissions.c                                 |  2
> > +-
> > > > > > > >
> > > > StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/{AArch64
> > > > > =>
> > > > > > > Arm}/StandaloneMmCoreEntryPoint.c                     | 16
> > > > > > > ++++++++--------
> > > > > > > >
> > > > > > >
> > > > >
> > > >
> > StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCor
> > > > > > > eEntryPoint.inf                                    | 14
> > > > > > > +++++++-------
> > > > > > > >
> > StandaloneMmPkg/Library/StandaloneMmCoreHobLib/{AArch64
> > > > =>
> > > > > > > Arm}/StandaloneMmCoreHobLib.c
> > |
> > > > > 0
> > > > > > > >
> > StandaloneMmPkg/Library/StandaloneMmCoreHobLib/{AArch64
> > > > =>
> > > > > > > Arm}/StandaloneMmCoreHobLibInternal.c
> > |
> > > > 0
> > > > > > > >
> > > > > > >
> > > > >
> > > >
> > StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreH
> > > > > > > obLib.inf                                            |  8
> > > > > ++++----
> > > > > > > >
> > > > > > >
> > > > >
> > > >
> > StandaloneMmPkg/Library/StandaloneMmMemLib/{AArch64/StandaloneMm
> > > > > > > MemLibInternal.c => ArmStandaloneMmMemLibInternal.c} |  9
> > > > > ++++++++-
> > > > > > > >
> > > > > > >
> > > > >
> > > >
> > StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.i
> > > > > > > nf                                                    |
> > 6
> > > > > > > +++---
> > > > > > > >
> > > > > > >
> > > > >
> > > >
> > StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependenc
> > > > > > > y.inf                                                |
> > 2 +-
> > > > > > > >   StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > > > > | 12 ++++++++----
> > > > > > > >   17 files changed, 46 insertions(+), 34 deletions(-)
> > > > > > > >
> > > > > > > > diff --git a/StandaloneMmPkg/Core/StandaloneMmCore.inf
> > > > > > > b/StandaloneMmPkg/Core/StandaloneMmCore.inf
> > > > > > > > index 87bf6e9440..56042b7b39 100644
> > > > > > > > --- a/StandaloneMmPkg/Core/StandaloneMmCore.inf
> > > > > > > > +++ b/StandaloneMmPkg/Core/StandaloneMmCore.inf
> > > > > > > > @@ -17,7 +17,7 @@
> > > > > > > >     PI_SPECIFICATION_VERSION       = 0x00010032
> > > > > > > >     ENTRY_POINT                    =
> > StandaloneMmMain
> > > > > > > >
> > > > > > > > -#  VALID_ARCHITECTURES           = IA32 X64 AARCH64
> > > > > > > > +#  VALID_ARCHITECTURES           = IA32 X64 AARCH64
> > ARM
> > > > > > > >
> > > > > > > >   [Sources]
> > > > > > > >     StandaloneMmCore.c
> > > > > > > > diff --git
> > > > > > >
> > > > a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
> > > > > > > b/StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c
> > > > > > > > similarity index 95%
> > > > > > > > rename from
> > > > > > >
> > StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
> > > > > > > > rename to
> > > > > StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c
> > > > > > > > index 63fbe26642..165d696f99 100644
> > > > > > > > ---
> > > > > > >
> > > > a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
> > > > > > > > +++
> > b/StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c
> > > > > > > > @@ -2,6 +2,7 @@
> > > > > > > >
> > > > > > > >     Copyright (c) 2016 HP Development Company, L.P.
> > > > > > > >     Copyright (c) 2016 - 2021, Arm Limited. All rights reserved.
> > > > > > > > +  Copyright (c) 2021, Linaro Limited
> > > > > > > >
> > > > > > > >     SPDX-License-Identifier: BSD-2-Clause-Patent
> > > > > > > >
> > > > > > > > @@ -92,8 +93,8 @@ PiMmStandaloneArmTfCpuDriverEntry (
> > > > > > > >     // receipt of a synchronous MM request. Use the Event ID to
> > > > > > > distinguish
> > > > > > > >     // between synchronous and asynchronous events.
> > > > > > > >     //
> > > > > > > > -  if ((ARM_SMC_ID_MM_COMMUNICATE_AARCH64 != EventId)
> > &&
> > > > > > > > -
> > (ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ_AARCH64 !=
> > > > > > > EventId)) {
> > > > > > > > +  if ((ARM_SMC_ID_MM_COMMUNICATE != EventId) &&
> > > > > > > > +      (ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ != EventId))
> > {
> > > > > > > >       DEBUG ((DEBUG_INFO, "UnRecognized Event - 0x%x\n",
> > > > > EventId));
> > > > > > > >       return EFI_INVALID_PARAMETER;
> > > > > > > >     }
> > > > > > > > diff --git
> > > > > > >
> > > > >
> > > >
> > a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCp
> > > > > > > u.c
> > > > > b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c
> > > > > > > > similarity index 96%
> > > > > > > > rename from
> > > > > > >
> > > > >
> > > >
> > StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.
> > > > > > > c
> > > > > > > > rename to
> > > > > > >
> > StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c
> > > > > > > > index d4590bcd19..10097f792f 100644
> > > > > > > > ---
> > > > > > >
> > > > >
> > > >
> > a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCp
> > > > > > > u.c
> > > > > > > > +++
> > > > > b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c
> > > > > > > > @@ -10,7 +10,7 @@
> > > > > > > >
> > > > > > > >   #include <Base.h>
> > > > > > > >   #include <Pi/PiMmCis.h>
> > > > > > > > -#include <Library/AArch64/StandaloneMmCoreEntryPoint.h>
> > > > > > > > +#include <Library/Arm/StandaloneMmCoreEntryPoint.h>
> > > > > > > >   #include <Library/DebugLib.h>
> > > > > > > >   #include <Library/ArmSvcLib.h>
> > > > > > > >   #include <Library/ArmLib.h>
> > > > > > > > diff --git
> > > > > > >
> > > > >
> > > >
> > a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCp
> > > > > > > u.h
> > > > > b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.h
> > > > > > > > similarity index 100%
> > > > > > > > rename from
> > > > > > >
> > > > >
> > > >
> > StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.
> > > > > > > h
> > > > > > > > rename to
> > > > > > >
> > StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.h
> > > > > > > > diff --git
> > > > > > >
> > > > >
> > > >
> > a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCp
> > > > > > > u.inf
> > > > >
> > b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf
> > > > > > > > similarity index 100%
> > > > > > > > rename from
> > > > > > >
> > > > >
> > > >
> > StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.i
> > > > > > > nf
> > > > > > > > rename to
> > > > > > >
> > StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf
> > > > > > > > diff --git
> > > > > > >
> > > > >
> > > >
> > a/StandaloneMmPkg/Include/Library/AArch64/StandaloneMmCoreEntryPoin
> > > > > > > t.h
> > > > > > >
> > > > >
> > b/StandaloneMmPkg/Include/Library/Arm/StandaloneMmCoreEntryPoint.h
> > > > > > > > similarity index 100%
> > > > > > > > rename from
> > > > > > >
> > > > >
> > > >
> > StandaloneMmPkg/Include/Library/AArch64/StandaloneMmCoreEntryPoint.h
> > > > > > > > rename to
> > > > > > >
> > > > StandaloneMmPkg/Include/Library/Arm/StandaloneMmCoreEntryPoint.h
> > > > > > > > diff --git
> > > > > > >
> > > > >
> > > >
> > a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Create
> > > > > > > HobList.c
> > > > > > >
> > > > >
> > > >
> > b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHob
> > > > > > > List.c
> > > > > > > > similarity index 97%
> > > > > > > > rename from
> > > > > > >
> > > > >
> > > >
> > StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/CreateHo
> > > > > > > bList.c
> > > > > > > > rename to
> > > > > > >
> > > > >
> > > >
> > StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHobLis
> > > > > > > t.c
> > > > > > > > index 4d4cf3d5ff..85f8194687 100644
> > > > > > > > ---
> > > > > > >
> > > > >
> > > >
> > a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Create
> > > > > > > HobList.c
> > > > > > > > +++
> > > > > > >
> > > > >
> > > >
> > b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHob
> > > > > > > List.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/SetPer
> > > > > > > missions.c
> > > > > > >
> > > > >
> > > >
> > b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPermissi
> > > > > > > ons.c
> > > > > > > > similarity index 96%
> > > > > > > > rename from
> > > > > > >
> > > > >
> > > >
> > StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/SetPermi
> > > > > > > ssions.c
> > > > > > > > rename to
> > > > > > >
> > > > >
> > > >
> > StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPermissio
> > > > > > > ns.c
> > > > > > > > index 4a380df4a6..cd4b90823e 100644
> > > > > > > > ---
> > > > > > >
> > > > >
> > > >
> > a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/SetPer
> > > > > > > missions.c
> > > > > > > > +++
> > > > > > >
> > > > >
> > > >
> > b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPermissi
> > > > > > > ons.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/Standa
> > > > > > > loneMmCoreEntryPoint.c
> > > > > > >
> > > > >
> > > >
> > b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/Standalone
> > > > > > > MmCoreEntryPoint.c
> > > > > > > > similarity index 94%
> > > > > > > > rename from
> > > > > > >
> > > > >
> > > >
> > StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Standalo
> > > > > > > neMmCoreEntryPoint.c
> > > > > > > > rename to
> > > > > > >
> > > > >
> > > >
> > StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/StandaloneM
> > > > > > > mCoreEntryPoint.c
> > > > > > > > index b445d6942e..49cf51a789 100644
> > > > > > > > ---
> > > > > > >
> > > > >
> > > >
> > a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Standa
> > > > > > > loneMmCoreEntryPoint.c
> > > > > > > > +++
> > > > > > >
> > > > >
> > > >
> > b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/Standalone
> > > > > > > MmCoreEntryPoint.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/StandaloneMm
> > > > > > > CoreEntryPoint.inf
> > > > > > >
> > > > >
> > > >
> > b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMm
> > > > > > > CoreEntryPoint.inf
> > > > > > > > index 4fa426f58e..1762586cfa 100644
> > > > > > > > ---
> > > > > > >
> > > > >
> > > >
> > a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMm
> > > > > > > CoreEntryPoint.inf
> > > > > > > > +++
> > > > > > >
> > > > >
> > > >
> > b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMm
> > > > > > > CoreEntryPoint.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]
> > > > > > > > diff --git
> > > > > > >
> > > > >
> > > >
> > a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/Standalon
> > > > > > > eMmCoreHobLib.c
> > > > > > >
> > > > >
> > > >
> > b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneM
> > > > > > > mCoreHobLib.c
> > > > > > > > similarity index 100%
> > > > > > > > rename from
> > > > > > >
> > > > >
> > > >
> > StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/Standalone
> > > > > > > MmCoreHobLib.c
> > > > > > > > rename to
> > > > > > >
> > > > >
> > > >
> > StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneMmC
> > > > > > > oreHobLib.c
> > > > > > > > diff --git
> > > > > > >
> > > > >
> > > >
> > a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/Standalon
> > > > > > > eMmCoreHobLibInternal.c
> > > > > > >
> > > > >
> > > >
> > b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneM
> > > > > > > mCoreHobLibInternal.c
> > > > > > > > similarity index 100%
> > > > > > > > rename from
> > > > > > >
> > > > >
> > > >
> > StandaloneMmPkg/Library/StandaloneMmCoreHobLib/AArch64/Standalone
> > > > > > > MmCoreHobLibInternal.c
> > > > > > > > rename to
> > > > > > >
> > > > >
> > > >
> > StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneMmC
> > > > > > > oreHobLibInternal.c
> > > > > > > > diff --git
> > > > > > >
> > > > >
> > > >
> > a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCore
> > > > > > > HobLib.inf
> > > > > > >
> > > > >
> > > >
> > b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCore
> > > > > > > HobLib.inf
> > > > > > > > index a2559920e8..34ed536480 100644
> > > > > > > > ---
> > > > > > >
> > > > >
> > > >
> > a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCore
> > > > > > > HobLib.inf
> > > > > > > > +++
> > > > > > >
> > > > >
> > > >
> > b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCore
> > > > > > > HobLib.inf
> > > > > > > > @@ -22,7 +22,7 @@
> > > > > > > >     LIBRARY_CLASS                  =
> > > > > > > HobLib|MM_CORE_STANDALONE
> > > > > > > >
> > > > > > > >   #
> > > > > > > > -#  VALID_ARCHITECTURES           = X64 AARCH64
> > > > > > > > +#  VALID_ARCHITECTURES           = X64 AARCH64 ARM
> > > > > > > >   #
> > > > > > > >   [Sources.common]
> > > > > > > >     Common.c
> > > > > > > > @@ -30,9 +30,9 @@
> > > > > > > >   [Sources.X64]
> > > > > > > >     X64/StandaloneMmCoreHobLib.c
> > > > > > > >
> > > > > > > > -[Sources.AARCH64]
> > > > > > > > -  AArch64/StandaloneMmCoreHobLib.c
> > > > > > > > -  AArch64/StandaloneMmCoreHobLibInternal.c
> > > > > > > > +[Sources.AARCH64, Sources.ARM]
> > > > > > > > +  Arm/StandaloneMmCoreHobLib.c
> > > > > > > > +  Arm/StandaloneMmCoreHobLibInternal.c
> > > > > > > >
> > > > > > > >   [Packages]
> > > > > > > >     MdePkg/MdePkg.dec
> > > > > > > > diff --git
> > > > > > >
> > > > >
> > > >
> > a/StandaloneMmPkg/Library/StandaloneMmMemLib/AArch64/StandaloneM
> > > > > > > mMemLibInternal.c
> > > > > > >
> > > > >
> > > >
> > b/StandaloneMmPkg/Library/StandaloneMmMemLib/ArmStandaloneMmMe
> > > > > > > mLibInternal.c
> > > > > > > > similarity index 86%
> > > > > > > > rename from
> > > > > > >
> > > > >
> > > >
> > StandaloneMmPkg/Library/StandaloneMmMemLib/AArch64/StandaloneMm
> > > > > > > MemLibInternal.c
> > > > > > > > rename to
> > > > > > >
> > > > >
> > > >
> > StandaloneMmPkg/Library/StandaloneMmMemLib/ArmStandaloneMmMemL
> > > > > > > ibInternal.c
> > > > > > > > index 4124959e04..fa7df46413 100644
> > > > > > > > ---
> > > > > > >
> > > > >
> > > >
> > a/StandaloneMmPkg/Library/StandaloneMmMemLib/AArch64/StandaloneM
> > > > > > > mMemLibInternal.c
> > > > > > > > +++
> > > > > > >
> > > > >
> > > >
> > b/StandaloneMmPkg/Library/StandaloneMmMemLib/ArmStandaloneMmMe
> > > > > > > mLibInternal.c
> > > > > > > > @@ -20,6 +20,13 @@
> > > > > > > >   //
> > > > > > > >   extern EFI_PHYSICAL_ADDRESS
> > > > > > > mMmMemLibInternalMaximumSupportAddress;
> > > > > > > >
> > > > > > > > +#ifdef MDE_CPU_AARCH64
> > > > > > > > +#define ARM_PHYSICAL_ADDRESS_BITS 36
> > > > > > > > +#endif
> > > > > > > > +#ifdef MDE_CPU_ARM
> > > > > > > > +#define ARM_PHYSICAL_ADDRESS_BITS 32
> > > > > > > > +#endif
> > > > > > > > +
> > > > > > > >   /**
> > > > > > > >     Calculate and save the maximum support address.
> > > > > > > >
> > > > > > > > @@ -31,7 +38,7 @@
> > > > > > > MmMemLibInternalCalculateMaximumSupportAddress (
> > > > > > > >   {
> > > > > > > >     UINT8        PhysicalAddressBits;
> > > > > > > >
> > > > > > > > -  PhysicalAddressBits = 36;
> > > > > > > > +  PhysicalAddressBits = ARM_PHYSICAL_ADDRESS_BITS;
> > > > > > > >
> > > > > > > >     //
> > > > > > > >     // Save the maximum support address in one global variable
> > > > > > > > diff --git
> > > > > > >
> > > > >
> > > >
> > a/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib
> > > > > > > .inf
> > > > > > >
> > > > >
> > > >
> > b/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib
> > > > > > > .inf
> > > > > > > > index 062b0d7a11..b29d97a746 100644
> > > > > > > > ---
> > > > > > >
> > > > >
> > > >
> > a/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib
> > > > > > > .inf
> > > > > > > > +++
> > > > > > >
> > > > >
> > > >
> > b/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib
> > > > > > > .inf
> > > > > > > > @@ -28,7 +28,7 @@
> > > > > > > >   #
> > > > > > > >   # The following information is for reference only and not
> > required
> > > > by
> > > > > the
> > > > > > > build tools.
> > > > > > > >   #
> > > > > > > > -#  VALID_ARCHITECTURES           = IA32 X64 AARCH64
> > > > > > > > +#  VALID_ARCHITECTURES           = IA32 X64 AARCH64
> > ARM
> > > > > > > >   #
> > > > > > > >
> > > > > > > >   [Sources.Common]
> > > > > > > > @@ -37,8 +37,8 @@
> > > > > > > >   [Sources.IA32, Sources.X64]
> > > > > > > >     X86StandaloneMmMemLibInternal.c
> > > > > > > >
> > > > > > > > -[Sources.AARCH64]
> > > > > > > > -  AArch64/StandaloneMmMemLibInternal.c
> > > > > > > > +[Sources.AARCH64, Sources.ARM]
> > > > > > > > +  ArmStandaloneMmMemLibInternal.c
> > > > > > > >
> > > > > > > >   [Packages]
> > > > > > > >     MdePkg/MdePkg.dec
> > > > > > > > diff --git
> > > > > > >
> > > > >
> > > >
> > a/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDepende
> > > > > > > ncy.inf
> > > > > > >
> > > > >
> > > >
> > b/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDepende
> > > > > > > ncy.inf
> > > > > > > > index a2a059c5d6..ffb2a6d083 100644
> > > > > > > > ---
> > > > > > >
> > > > >
> > > >
> > a/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDepende
> > > > > > > ncy.inf
> > > > > > > > +++
> > > > > > >
> > > > >
> > > >
> > b/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDepende
> > > > > > > ncy.inf
> > > > > > > > @@ -20,7 +20,7 @@
> > > > > > > >   #
> > > > > > > >   # The following information is for reference only and not
> > required
> > > > by
> > > > > the
> > > > > > > build tools.
> > > > > > > >   #
> > > > > > > > -#  VALID_ARCHITECTURES           = AARCH64
> > > > > > > > +#  VALID_ARCHITECTURES           = AARCH64|ARM
> > > > > > > >   #
> > > > > > > >   #
> > > > > > > >
> > > > > > > > diff --git a/StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > > > > b/StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > > > > > index 0c45df95e2..8012f93b7d 100644
> > > > > > > > --- a/StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > > > > > +++ b/StandaloneMmPkg/StandaloneMmPkg.dsc
> > > > > > > > @@ -20,7 +20,7 @@
> > > > > > > >     PLATFORM_VERSION               = 1.0
> > > > > > > >     DSC_SPECIFICATION              = 0x00010011
> > > > > > > >     OUTPUT_DIRECTORY               =
> > Build/StandaloneMm
> > > > > > > > -  SUPPORTED_ARCHITECTURES        = AARCH64|X64
> > > > > > > > +  SUPPORTED_ARCHITECTURES        = AARCH64|X64|ARM
> > > > > > > >     BUILD_TARGETS                  = DEBUG|RELEASE
> > > > > > > >     SKUID_IDENTIFIER               = DEFAULT
> > > > > > > >
> > > > > > > > @@ -60,7 +60,7 @@
> > > > > > > >
> > > > > > >
> > > > >
> > > >
> > StandaloneMmDriverEntryPoint|MdePkg/Library/StandaloneMmDriverEntryP
> > > > > > > oint/StandaloneMmDriverEntryPoint.inf
> > > > > > > >
> > > > > > >
> > > > >
> > > >
> > VariableMmDependency|StandaloneMmPkg/Library/VariableMmDependenc
> > > > > > > y/VariableMmDependency.inf
> > > > > > > >
> > > > > > > > -[LibraryClasses.AARCH64]
> > > > > > > > +[LibraryClasses.AARCH64, LibraryClasses.ARM]
> > > > > > > >     ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
> > > > > > > >
> > > > > > >
> > > > >
> > > >
> > StandaloneMmMmuLib|ArmPkg/Library/StandaloneMmMmuLib/ArmMmuSt
> > > > > > > andaloneMmLib.inf
> > > > > > > >     ArmSvcLib|ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf
> > > > > > > > @@ -118,8 +118,8 @@
> > > > > > > >
> > > > > > >
> > > > >
> > > >
> > StandaloneMmPkg/Library/StandaloneMmMemoryAllocationLib/Standalone
> > > > > > > MmMemoryAllocationLib.inf
> > > > > > > >
> > > > > > >
> > > > >
> > > >
> > StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependenc
> > > > > > > y.inf
> > > > > > > >
> > > > > > > > -[Components.AARCH64]
> > > > > > > > -
> > > > > > >
> > > > >
> > > >
> > StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.i
> > > > > > > nf
> > > > > > > > +[Components.AARCH64, Components.ARM]
> > > > > > > > +
> > > > > StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf
> > > > > > > >
> > > > > > >
> > > > >
> > > >
> > StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/Standalone
> > > > > > > MmPeCoffExtraActionLib.inf
> > > > > > > >
> > > > > > > >
> > > > > > >
> > > > >
> > > >
> > ##############################################################
> > > > > > > #####################################
> > > > > > > > @@ -135,6 +135,10 @@
> > > > > > > >   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
> > > > > > > -march=armv8-a+nofp -mstrict-align
> > > > > > > >   GCC:*_*_*_CC_FLAGS = -mstrict-align
> > > > > > > >
> > > > > > > > +[BuildOptions.ARM]
> > > > > > > > +GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
> > > > > > > -march=armv7-a
> > > > > > > > +GCC:*_*_*_CC_FLAGS = -fno-stack-protector
> > > > > > > > +
> > > > > > > >   [BuildOptions.X64]
> > > > > > > >     MSFT:*_*_*_DLINK_FLAGS = /ALIGN:4096
> > > > > > > >     GCC:*_GCC*_*_DLINK_FLAGS = -z
> > common-page-size=0x1000
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > >
> > > > > >
> > > > > >
> > > > > >
> > > > > >
> > > > > >
> > > > > >
> > > > > >
> > > > >
> > > > >
> > > > >
> > > > >
> > > >
> > > >
> > > >
> > > >
> > > >
> > > >
> > > >
> > >
> > >
> > >
> > >
> >
> >
> > 
> >
>
>
>