[PATCH 0/3] Allow building MdeModulePkg on non-x86

[PATCH 0/3] Allow building MdeModulePkg on non-x86

[Schaefer, Daniel Helmut (DualStudy)]

While trying to build MdeModulePkg for RISCV64, I found a few things that
prevent it from building on architectures besides IA32 and X64 in general.

Daniel Schaefer (3):
  MdeModulePkg: Restrict libraries using SMM to x86
  MdeModulePkg: Set PcdDxeIplSwitchToLongMode false on non-x86
  MdeModulePkg: Use CopyGuid instead of GUID assignment

 MdeModulePkg/MdeModulePkg.dec                           | 3 +++
 MdeModulePkg/MdeModulePkg.dsc                           | 9 ++++++---
 MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

-- 
2.25.0

[PATCH 1/3] MdeModulePkg: Restrict libraries using SMM to x86

[Schaefer, Daniel Helmut (DualStudy)]

The modules:

  MdeModulePkg/Bus/Ata/AhciPei/AhciPei.inf
  MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.inf
  MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf

seem like they are independent of SMM but they actually do requires SMM's
LockBoxLib. Ideally they would be rewritten to not require SMM on non x86.

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2549

Signed-off-by: Daniel Schaefer <daniel.schaefer@hpe.com>
Cc: Abner Chang <abner.chang@hpe.com>
Cc: Gilbert Chen <gilbert.chen@hpe.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Dandan Bi <dandan.bi@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
---
 MdeModulePkg/MdeModulePkg.dsc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index f7dbb27ce25d..fc8c3976cca5 100644
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -109,6 +109,8 @@ [LibraryClasses.common.PEIM]
   HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
   MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
   ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf
+
+[LibraryClasses.IA86.PEIM, LibraryClasses.X64.PEIM]
   LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf
 
 [LibraryClasses.common.DXE_CORE]
@@ -228,7 +230,6 @@ [Components]
   MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
   MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupportDxe.inf
   MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
-  MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.inf
   MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf
   MdeModulePkg/Bus/Pci/SdMmcPciHcPei/SdMmcPciHcPei.inf
   MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcBlockIoPei.inf
@@ -251,7 +252,6 @@ [Components]
   MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
   MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
   MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
-  MdeModulePkg/Bus/Ata/AhciPei/AhciPei.inf
   MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
   MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
   MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
@@ -395,7 +395,6 @@ [Components]
     <LibraryClasses>
       LockBoxLib|MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf
   }
-  MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf
   MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
   MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.inf {
     <LibraryClasses>
@@ -447,6 +446,8 @@ [Components.IA32, Components.X64, Components.ARM, Components.AARCH64]
 [Components.IA32, Components.X64]
   MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf
   MdeModulePkg/Application/SmiHandlerProfileInfo/SmiHandlerProfileInfo.inf
+  MdeModulePkg/Bus/Ata/AhciPei/AhciPei.inf
+  MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.inf
   MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf
   MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
   MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf {
@@ -478,6 +479,7 @@ [Components.IA32, Components.X64]
   MdeModulePkg/Library/SmmSmiHandlerProfileLib/SmmSmiHandlerProfileLib.inf
   MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaArchCustomDecompressLib.inf
   MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
+  MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf
   MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf
   MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.inf
   MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf
@@ -487,6 +489,7 @@ [Components.IA32, Components.X64]
   MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.inf
   MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
 
+
 [Components.X64]
   MdeModulePkg/Universal/CapsulePei/CapsuleX64.inf
 
-- 
2.25.0

[PATCH 2/3] MdeModulePkg: Set PcdDxeIplSwitchToLongMode false on non-x86

[Schaefer, Daniel Helmut (DualStudy)]

Otherwise the PCD isn't defined on other architectures.

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2548

Signed-off-by: Daniel Schaefer <daniel.schaefer@hpe.com>
Cc: Abner Chang <abner.chang@hpe.com>
Cc: Gilbert Chen <gilbert.chen@hpe.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Dandan Bi <dandan.bi@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
---
 MdeModulePkg/MdeModulePkg.dec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 91a3c608231c..59645c860148 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -879,6 +879,9 @@ [PcdsFeatureFlag]
 [PcdsFeatureFlag.IA32, PcdsFeatureFlag.ARM, PcdsFeatureFlag.AARCH64]
   gEfiMdeModulePkgTokenSpaceGuid.PcdPciDegradeResourceForOptionRom|FALSE|BOOLEAN|0x0001003a
 
+[PcdsFeatureFlag.EBC, PcdsFeatureFlag.ARM, PcdsFeatureFlag.AARCH64]
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE|BOOLEAN|0x0001003b
+
 [PcdsFeatureFlag.IA32, PcdsFeatureFlag.X64]
   ## Indicates if DxeIpl should switch to long mode to enter DXE phase.
   #  It is assumed that 64-bit DxeCore is built in firmware if it is true; otherwise 32-bit DxeCore
-- 
2.25.0

[PATCH 3/3] MdeModulePkg: Use CopyGuid instead of GUID assignment

[Schaefer, Daniel Helmut (DualStudy)]

GCC translates a simple assignment to memcpy, which EDKII doesn't provide.
See: https://www.mail-archive.com/edk2-devel@lists.01.org/msg11928.html

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2547

Signed-off-by: Daniel Schaefer <daniel.schaefer@hpe.com>
Cc: Abner Chang <abner.chang@hpe.com>
Cc: Gilbert Chen <gilbert.chen@hpe.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Dandan Bi <dandan.bi@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
---
 MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
index 5cc527679a78..d36648aaa04a 100644
--- a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
+++ b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
@@ -619,7 +619,7 @@ CreateDeviceManagerForm(
         TokenHelp = HiiSetString (HiiHandle, 0, String, NULL);
         FreePool (String);
 
-        FormSetGuid = ((EFI_IFR_FORM_SET *)Ptr)->Guid;
+        CopyGuid (&FormSetGuid, &((EFI_IFR_FORM_SET *) Ptr)->Guid);
 
         //
         // Network device process
-- 
2.25.0

Re: [edk2-devel] [PATCH 1/3] MdeModulePkg: Restrict libraries using SMM to x86

[Michael D Kinney]

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On
> Behalf Of Schaefer, Daniel Helmut (DualStudy)
> Sent: Saturday, February 22, 2020 8:59 AM
> To: devel@edk2.groups.io
> Cc: Abner Chang <abner.chang@hpe.com>; Gilbert Chen
> <gilbert.chen@hpe.com>; Leif Lindholm
> <leif@nuviainc.com>; Dong, Eric <eric.dong@intel.com>;
> Ni, Ray <ray.ni@intel.com>; Wu, Hao A
> <hao.a.wu@intel.com>; Bi, Dandan <dandan.bi@intel.com>;
> Gao, Liming <liming.gao@intel.com>
> Subject: [edk2-devel] [PATCH 1/3] MdeModulePkg:
> Restrict libraries using SMM to x86
> 
> The modules:
> 
>   MdeModulePkg/Bus/Ata/AhciPei/AhciPei.inf
>   MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.inf
> 
> MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTabl
> eDxe/FirmwarePerformanceDxe.inf
> 
> seem like they are independent of SMM but they actually
> do requires SMM's
> LockBoxLib. Ideally they would be rewritten to not
> require SMM on non x86.
> 
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2549
> 
> Signed-off-by: Daniel Schaefer
> <daniel.schaefer@hpe.com>
> Cc: Abner Chang <abner.chang@hpe.com>
> Cc: Gilbert Chen <gilbert.chen@hpe.com>
> Cc: Leif Lindholm <leif@nuviainc.com>
> Cc: Eric Dong <eric.dong@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Cc: Dandan Bi <dandan.bi@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> ---
>  MdeModulePkg/MdeModulePkg.dsc | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/MdeModulePkg/MdeModulePkg.dsc
> b/MdeModulePkg/MdeModulePkg.dsc
> index f7dbb27ce25d..fc8c3976cca5 100644
> --- a/MdeModulePkg/MdeModulePkg.dsc
> +++ b/MdeModulePkg/MdeModulePkg.dsc
> @@ -109,6 +109,8 @@ [LibraryClasses.common.PEIM]
>    HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
> 
> 
> 
> MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationL
> ib/PeiMemoryAllocationLib.inf
> 
> 
> 
> ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuided
> SectionLib/PeiExtractGuidedSectionLib.inf
> 
> 
> +
> 
> 
> +[LibraryClasses.IA86.PEIM, LibraryClasses.X64.PEIM]

Should be IA32 instead of IA86

> 
> 
> 
> LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBo
> xPeiLib.inf
> 
> 
> 
> 
> 
>  [LibraryClasses.common.DXE_CORE]
> 
> 
> @@ -228,7 +230,6 @@ [Components]
>    MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
> 
> 
> 
> MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/In
> compatiblePciDeviceSupportDxe.inf
> 
> 
>    MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
> 
> 
> -  MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.inf
> 
> 
>    MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf
> 
> 
>    MdeModulePkg/Bus/Pci/SdMmcPciHcPei/SdMmcPciHcPei.inf
> 
> 
> 
> MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcBlockIoPei.inf
> 
> 
> @@ -251,7 +252,6 @@ [Components]
> 
> MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDx
> e.inf
> 
> 
>    MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
> 
> 
> 
> MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.
> inf
> 
> 
> -  MdeModulePkg/Bus/Ata/AhciPei/AhciPei.inf
> 
> 
>    MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
> 
> 
>    MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
> 
> 
>    MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
> 
> 
> @@ -395,7 +395,6 @@ [Components]
>      <LibraryClasses>
> 
> 
> 
> LockBoxLib|MdeModulePkg/Library/LockBoxNullLib/LockBoxN
> ullLib.inf
> 
> 
>    }
> 
> 
> -
> MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTabl
> eDxe/FirmwarePerformanceDxe.inf
> 
> 
> 
> MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDx
> e/BootGraphicsResourceTableDxe.inf
> 
> 
> 
> MdeModulePkg/Universal/SectionExtractionDxe/SectionExtr
> actionDxe.inf {
> 
> 
>      <LibraryClasses>
> 
> 
> @@ -447,6 +446,8 @@ [Components.IA32, Components.X64,
> Components.ARM, Components.AARCH64]
>  [Components.IA32, Components.X64]
> 
> 
> 
> MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.
> inf
> 
> 
> 
> MdeModulePkg/Application/SmiHandlerProfileInfo/SmiHandl
> erProfileInfo.inf
> 
> 
> +  MdeModulePkg/Bus/Ata/AhciPei/AhciPei.inf
> 
> 
> +  MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.inf
> 
> 
>    MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf
> 
> 
>    MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
> 
> 
> 
> MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.
> inf {
> 
> 
> @@ -478,6 +479,7 @@ [Components.IA32, Components.X64]
> 
> MdeModulePkg/Library/SmmSmiHandlerProfileLib/SmmSmiHand
> lerProfileLib.inf
> 
> 
> 
> MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaArchCu
> stomDecompressLib.inf
> 
> 
> 
> MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootS
> criptExecutorDxe.inf
> 
> 
> +
> MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTabl
> eDxe/FirmwarePerformanceDxe.inf
> 
> 
> 
> MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateD
> xe.inf
> 
> 
> 
> MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveSta
> te.inf
> 
> 
> 
> MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTabl
> eSmm/FirmwarePerformanceSmm.inf
> 
> 
> @@ -487,6 +489,7 @@ [Components.IA32, Components.X64]
> 
> MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCom
> municationBufferDxe.inf
> 
> 
> 
> MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
> 
> 
> 
> 
> 
> +
> 
> 
>  [Components.X64]
> 
> 
>    MdeModulePkg/Universal/CapsulePei/CapsuleX64.inf
> 
> 
> 
> 
> 
> --
> 2.25.0
> 
> 
> 

Re: [PATCH 3/3] MdeModulePkg: Use CopyGuid instead of GUID assignment

[Dandan Bi]

> -----Original Message-----
> From: Daniel Schaefer [mailto:daniel.schaefer@hpe.com]
> Sent: Sunday, February 23, 2020 12:59 AM
> To: devel@edk2.groups.io
> Cc: Abner Chang <abner.chang@hpe.com>; Gilbert Chen
> <gilbert.chen@hpe.com>; Leif Lindholm <leif@nuviainc.com>; Bi, Dandan
> <dandan.bi@intel.com>; Dong, Eric <eric.dong@intel.com>
> Subject: [PATCH 3/3] MdeModulePkg: Use CopyGuid instead of GUID
> assignment
> 
> GCC translates a simple assignment to memcpy, which EDKII doesn't provide.
> See: https://www.mail-archive.com/edk2-devel@lists.01.org/msg11928.html
> 
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2547
> 
> Signed-off-by: Daniel Schaefer <daniel.schaefer@hpe.com>
> Cc: Abner Chang <abner.chang@hpe.com>
> Cc: Gilbert Chen <gilbert.chen@hpe.com>
> Cc: Leif Lindholm <leif@nuviainc.com>
> Cc: Dandan Bi <dandan.bi@intel.com>
> Cc: Eric Dong <eric.dong@intel.com>
> ---
>  MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
> b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
> index 5cc527679a78..d36648aaa04a 100644
> --- a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
> +++ b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
> @@ -619,7 +619,7 @@ CreateDeviceManagerForm(
>          TokenHelp = HiiSetString (HiiHandle, 0, String, NULL);
> 
>          FreePool (String);
> 
> 
> 
> -        FormSetGuid = ((EFI_IFR_FORM_SET *)Ptr)->Guid;
> 
> +        CopyGuid (&FormSetGuid, &((EFI_IFR_FORM_SET *) Ptr)->Guid);
Hi, 

Could you please use CopyMem instead of CopyGuid? Or it will meet following warning with VS compiler.
DeviceManager.c(622): warning C4366: The result of the unary '&' operator may be unaligned

Thanks,
Dandan
> 
> 
> 
>          //
> 
>          // Network device process
> 
> --
> 2.25.0