[PATCH edk2-platforms v1 00/11] Fix build breaks and update IORT revision macro

[PATCH edk2-platforms v1 00/11] Fix build breaks and update IORT revision macro

[Sami Mujawar]

The first 4 patches in this series fix build breaks in upstream
edk2-platforms code for Socionext, Lemaker and SynQuacerEvalBoard.

The IORT Rev E.b specification updates the IORT table revision
to 3. Following this the IORT table revision macro 
EFI_ACPI_IO_REMAPPING_TABLE_REVISION which was at Rev 0 has
been renamed to EFI_ACPI_IO_REMAPPING_TABLE_REV0. Therefore,
the last 7 patches in this series are added to reflect this
change for the following platforms:
 - FVP
 - Morello FVP
 - SGI
 - AMD/Styx
 - Socionext/SynQuacer
 - RaspberryPi
 - N1SDP

Note: This patch series is dependent on the edk2 patch series:
  "[PATCH v3 0/8] IORT Rev E.b specification updates"
  (https://edk2.groups.io/g/devel/message/83545), which must
be merged in edk2 before this patch series can be integrated.

The changes can be seen at:
https://github.com/samimujawar/edk2-platforms/tree/1527_iort_rev_eb_platforms_v1

Sami Mujawar (11):
  Platform/Socionext: Fix build break for SynQuacerEvalBoard
  Platform/LeMaker: Fix build break for CelloBoard
  Platform/Socionext/SynQuacerEvalBoard: Add missing ArmSoftFloatLib
  Platform/Socionext/SynQuacerEvalBoard: Disable EbcDxe for AArch32
    builds
  Platform/ARM: FVP: Update for IORT revision macro renaming
  Platform/ARM: Morello: Update for IORT revision macro renaming
  Platform/ARM: SGI: Update for IORT revision macro renaming
  Silicon/AMD/Styx: Update for IORT revision macro renaming
  Silicon/Socionext/SynQuacer: Update for IORT revision macro renaming
  Platform/RaspberryPi: Update for IORT revision macro renaming
  Platform/ARM: N1SDP: Update for IORT revision macro renaming

 Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerFvp.c  |  2 +-
 Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c       |  2 +-
 Platform/ARM/SgiPkg/AcpiTables/Iort.aslc                                                     |  2 +-
 Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c |  2 +-
 Platform/LeMaker/CelloBoard/CelloBoard.dsc                                                   |  4 +++-
 Platform/RaspberryPi/AcpiTables/Iort.aslc                                                    |  2 +-
 Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc                                 | 11 +++++++++--
 Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf                                 |  8 +++++++-
 Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc                                           |  2 +-
 Silicon/Socionext/SynQuacer/AcpiTables/Iort.aslc                                             |  2 +-
 10 files changed, 26 insertions(+), 11 deletions(-)

-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

[PATCH edk2-platforms v1 01/11] Platform/Socionext: Fix build break for SynQuacerEvalBoard

[Sami Mujawar]

BdsDxe depends on VariablePolicyHelperLib, so move it out from
VariableRuntimeDxe.inf and add it to LibraryClasses.DXE_DRIVER and
LibraryClasses.DXE_RUNTIME_DRIVER.

This is required to fix the build break in SynQuacerEvalBoard.dsc

Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
---
 Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
index e5315897624bf1b3d897204525387cbf61e9b0ea..142d808ae69f1ec261003ab3a1b64db258c46016 100644
--- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
+++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
@@ -182,6 +182,8 @@ [LibraryClasses.common.DXE_DRIVER]
   PciHostBridgeLib|Silicon/Socionext/SynQuacer/Library/SynQuacerPciHostBridgeLib/SynQuacerPciHostBridgeLib.inf
   NonDiscoverableDeviceRegistrationLib|MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.inf

+  VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
+
 [LibraryClasses.common.UEFI_APPLICATION]
   PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
   HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
@@ -208,6 +210,7 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
 !if $(TARGET) != RELEASE
   DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf
 !endif
+  VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf

 ################################################################################
 #
@@ -500,7 +503,6 @@ [Components.common]
       TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
       VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
       VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
-      VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
   }

   #
--
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

[PATCH edk2-platforms v1 02/11] Platform/LeMaker: Fix build break for CelloBoard

[Sami Mujawar]

BdsDxe depends on VariablePolicyHelperLib, so move it out from
VariableRuntimeDxe.inf and add it to LibraryClasses.DXE_DRIVER and
LibraryClasses.DXE_RUNTIME_DRIVER.

This is required to fix the build break in CelloBoard.dsc

Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
---
 Platform/LeMaker/CelloBoard/CelloBoard.dsc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.dsc b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
index 11d989cf3463826fef44c3c56e6e1ca4f907bc4c..da2994c0c9b3418750ef60802e1d482d2c7d3592 100644
--- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc
+++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
@@ -202,6 +202,8 @@ [LibraryClasses.common.DXE_DRIVER]
   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
   NonDiscoverableDeviceRegistrationLib|MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.inf
 
+  VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
+
 [LibraryClasses.common.DXE_RUNTIME_DRIVER]
   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
@@ -210,6 +212,7 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
   DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf
 !endif
   VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
+  VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
 
 [LibraryClasses.common.UEFI_APPLICATION]
   PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
@@ -526,7 +529,6 @@ [Components.common]
       TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
       VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
       NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
-      VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
   }
   Silicon/AMD/Styx/Drivers/StyxSpiFvDxe/StyxSpiFvDxe.inf
 
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

[PATCH edk2-platforms v1 03/11] Platform/Socionext/SynQuacerEvalBoard: Add missing ArmSoftFloatLib

[Sami Mujawar]

ArmSoftFloatLib is required for the AARCH32 build of the firmware
for SynQuacerEvalBoard.

Therefore, add the missing ArmSoftFloatLib to SynQuacerEvalBoard.dsc

Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
---
 Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
index 142d808ae69f1ec261003ab3a1b64db258c46016..0c88b4e03b9c430e8827c58ebe27870808e07606 100644
--- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
+++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
@@ -212,6 +212,9 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
 !endif
   VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
 
+[LibraryClasses.ARM]
+  ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf
+
 ################################################################################
 #
 # Pcd Section - list of all EDK II PCD Entries defined by this Platform
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

[PATCH edk2-platforms v1 04/11] Platform/Socionext/SynQuacerEvalBoard: Disable EbcDxe for AArch32 builds

[Sami Mujawar]

EbcDxe is not supported for AArch32 builds of the firmware.

Therefore, move EbcDxe so that it is included only for AArch64
builds of the firmware.

Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
---
 Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 4 +++-
 Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf | 8 +++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
index 0c88b4e03b9c430e8827c58ebe27870808e07606..fd4cfa82330dfa3b7e4bd83573acdd3afa117d75 100644
--- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
+++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
@@ -561,7 +561,6 @@ [Components.common]
   }
   MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
   MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
-  MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
   MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
 
   #
@@ -633,3 +632,6 @@ [Components.common]
   SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.inf
 
 !include Silicon/Socionext/SynQuacer/Acpi.dsc.inc
+
+[Components.AARCH64]
+  MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
index b1e0a53e6191a9adad068695e000f1285e2c5acb..91771895245decfdabf5add4c41240ba5ecb59a3 100644
--- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
+++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
@@ -140,9 +140,15 @@ [FV.FvMain]
   INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
   INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
   INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
-  INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
   INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
 
+!if $(ARCH) == AARCH64
+  #
+  # EBC
+  #
+  INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
+!endif
+
   #
   # eMMC support
   #
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

[PATCH edk2-platforms v1 05/11] Platform/ARM: FVP: Update for IORT revision macro renaming

[Sami Mujawar]

The IORT Specification E.b updates the IORT table revision to 3. To
reflect this change the IORT header file has been updated to rename
the EFI_ACPI_IO_REMAPPING_TABLE_REVISION macro which was at Rev 0 to
EFI_ACPI_IO_REMAPPING_TABLE_REV0.

Therefore, update the usage of EFI_ACPI_IO_REMAPPING_TABLE_REVISION
macro in the Configuration Manager for FVP platform to
EFI_ACPI_IO_REMAPPING_TABLE_REV0.

Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
---
 Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index 776dec999eb1ef47910835987fa4dae1b69c52fd..ae852e36b56f27cdb4cbc005139ca41767c7236c 100644
--- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -82,7 +82,7 @@ EDKII_PLATFORM_REPOSITORY_INFO VExpressPlatRepositoryInfo = {
     // IORT Table - FVP RevC
     {
       EFI_ACPI_6_3_IO_REMAPPING_TABLE_SIGNATURE,
-      EFI_ACPI_IO_REMAPPING_TABLE_REVISION,
+      EFI_ACPI_IO_REMAPPING_TABLE_REV0,
       CREATE_STD_ACPI_TABLE_GEN_ID (EStdAcpiTableIdIort),
       NULL
     },
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

[PATCH edk2-platforms v1 06/11] Platform/ARM: Morello: Update for IORT revision macro renaming

[Sami Mujawar]

The IORT Specification E.b updates the IORT table revision to 3. To
reflect this change the IORT header file has been updated to rename
the EFI_ACPI_IO_REMAPPING_TABLE_REVISION macro which was at Rev 0 to
EFI_ACPI_IO_REMAPPING_TABLE_REV0.

Therefore, update the usage of EFI_ACPI_IO_REMAPPING_TABLE_REVISION
macro in the Configuration Manager for Morello FVP to
EFI_ACPI_IO_REMAPPING_TABLE_REV0.

Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
---
 Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerFvp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerFvp.c b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerFvp.c
index ed2fdfeff9a02b13729cdd5d6f334f7bcabe679f..c23e284f24ff73aa2e40111863041d2a46c09b7e 100644
--- a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerFvp.c
+++ b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerFvp.c
@@ -76,7 +76,7 @@ EDKII_FVP_PLATFORM_REPOSITORY_INFO MorelloFvpRepositoryInfo = {
     // IORT Table
     {
       EFI_ACPI_6_3_IO_REMAPPING_TABLE_SIGNATURE,
-      EFI_ACPI_IO_REMAPPING_TABLE_REVISION,
+      EFI_ACPI_IO_REMAPPING_TABLE_REV0,
       CREATE_STD_ACPI_TABLE_GEN_ID (EStdAcpiTableIdIort),
       NULL
     },
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

[PATCH edk2-platforms v1 07/11] Platform/ARM: SGI: Update for IORT revision macro renaming

[Sami Mujawar]

The IORT Specification E.b updates the IORT table revision to 3. To
reflect this change the IORT header file has been updated to rename
the EFI_ACPI_IO_REMAPPING_TABLE_REVISION macro which was at Rev 0 to
EFI_ACPI_IO_REMAPPING_TABLE_REV0.

Therefore, update the usage of EFI_ACPI_IO_REMAPPING_TABLE_REVISION
macro in the IORT table for SGI platforms to
EFI_ACPI_IO_REMAPPING_TABLE_REV0.

Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
---
 Platform/ARM/SgiPkg/AcpiTables/Iort.aslc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Platform/ARM/SgiPkg/AcpiTables/Iort.aslc b/Platform/ARM/SgiPkg/AcpiTables/Iort.aslc
index fcc28a71c82eb0c78c96d60c9d9eb1554adb41a3..415403e8e8e5946d3a2319d83b76d6182a8a1e74 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/Iort.aslc
+++ b/Platform/ARM/SgiPkg/AcpiTables/Iort.aslc
@@ -50,7 +50,7 @@ ARM_EFI_ACPI_6_0_IO_REMAPPING_TABLE Iort =
      (
        EFI_ACPI_6_2_IO_REMAPPING_TABLE_SIGNATURE,
        ARM_EFI_ACPI_6_0_IO_REMAPPING_TABLE,
-       EFI_ACPI_IO_REMAPPING_TABLE_REVISION
+       EFI_ACPI_IO_REMAPPING_TABLE_REV0
      ),
      3,  // NumNodes
      sizeof (EFI_ACPI_6_0_IO_REMAPPING_TABLE),  // NodeOffset
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

[PATCH edk2-platforms v1 08/11] Silicon/AMD/Styx: Update for IORT revision macro renaming

[Sami Mujawar]

The IORT Specification E.b updates the IORT table revision to 3. To
reflect this change the IORT header file has been updated to rename
the EFI_ACPI_IO_REMAPPING_TABLE_REVISION macro which was at Rev 0 to
EFI_ACPI_IO_REMAPPING_TABLE_REV0.

Therefore, update the usage of EFI_ACPI_IO_REMAPPING_TABLE_REVISION
macro in the IORT table for Styx platform to
EFI_ACPI_IO_REMAPPING_TABLE_REV0.

Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
---
 Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc
index b81f87b7794eec47042910d77efcb609563991a8..9df5ce4037c5765a8f789733b8130bfe0be7b810 100644
--- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc
+++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc
@@ -139,7 +139,7 @@ STATIC STYX_IO_REMAPPING_STRUCTURE AcpiIort = {
   {
     AMD_ACPI_HEADER(EFI_ACPI_6_0_IO_REMAPPING_TABLE_SIGNATURE,
                     STYX_IO_REMAPPING_STRUCTURE,
-                    EFI_ACPI_IO_REMAPPING_TABLE_REVISION),
+                    EFI_ACPI_IO_REMAPPING_TABLE_REV0),
     11,                                             // NumNodes
     sizeof(EFI_ACPI_6_0_IO_REMAPPING_TABLE),        // NodeOffset
     0                                               // Reserved
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

[PATCH edk2-platforms v1 09/11] Silicon/Socionext/SynQuacer: Update for IORT revision macro renaming

[Sami Mujawar]

The IORT Specification E.b updates the IORT table revision to 3. To
reflect this change the IORT header file has been updated to rename
the EFI_ACPI_IO_REMAPPING_TABLE_REVISION macro which was at Rev 0 to
EFI_ACPI_IO_REMAPPING_TABLE_REV0.

Therefore, update the usage of EFI_ACPI_IO_REMAPPING_TABLE_REVISION
macro in the IORT table for SynQuacer platform to
EFI_ACPI_IO_REMAPPING_TABLE_REV0.

Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
---
 Silicon/Socionext/SynQuacer/AcpiTables/Iort.aslc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Silicon/Socionext/SynQuacer/AcpiTables/Iort.aslc b/Silicon/Socionext/SynQuacer/AcpiTables/Iort.aslc
index 4627347028132395de757ff7c81b00848057632d..8854b0063f61a3ff347d87b1033bb9d77597e320 100644
--- a/Silicon/Socionext/SynQuacer/AcpiTables/Iort.aslc
+++ b/Silicon/Socionext/SynQuacer/AcpiTables/Iort.aslc
@@ -56,7 +56,7 @@ STATIC SYNQUACER_IO_REMAPPING_STRUCTURE Iort = {
   {
     __ACPI_HEADER(EFI_ACPI_6_0_IO_REMAPPING_TABLE_SIGNATURE,
                   SYNQUACER_IO_REMAPPING_STRUCTURE,
-                  EFI_ACPI_IO_REMAPPING_TABLE_REVISION),
+                  EFI_ACPI_IO_REMAPPING_TABLE_REV0),
     6,                                              // NumNodes
     sizeof(EFI_ACPI_6_0_IO_REMAPPING_TABLE),        // NodeOffset
     0                                               // Reserved
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

[PATCH edk2-platforms v1 10/11] Platform/RaspberryPi: Update for IORT revision macro renaming

[Sami Mujawar]

The IORT Specification E.b updates the IORT table revision to 3. To
reflect this change the IORT header file has been updated to rename
the EFI_ACPI_IO_REMAPPING_TABLE_REVISION macro which was at Rev 0 to
EFI_ACPI_IO_REMAPPING_TABLE_REV0.

Therefore, update the usage of EFI_ACPI_IO_REMAPPING_TABLE_REVISION
macro in the IORT table for RaspberryPi platform to
EFI_ACPI_IO_REMAPPING_TABLE_REV0.

Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
---
 Platform/RaspberryPi/AcpiTables/Iort.aslc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Platform/RaspberryPi/AcpiTables/Iort.aslc b/Platform/RaspberryPi/AcpiTables/Iort.aslc
index 810307ae376f7d24790775f499daa09e3137fe6c..3ca5471081f2b43e624b35fc7b9bda856b15daa9 100644
--- a/Platform/RaspberryPi/AcpiTables/Iort.aslc
+++ b/Platform/RaspberryPi/AcpiTables/Iort.aslc
@@ -28,7 +28,7 @@ STATIC RPI4_IO_REMAPPING_STRUCTURE Iort = {
   {
     ACPI_HEADER (EFI_ACPI_6_0_IO_REMAPPING_TABLE_SIGNATURE,
                  RPI4_IO_REMAPPING_STRUCTURE,
-                 EFI_ACPI_IO_REMAPPING_TABLE_REVISION),
+                 EFI_ACPI_IO_REMAPPING_TABLE_REV0),
     3,                                              // NumNodes
     sizeof (EFI_ACPI_6_0_IO_REMAPPING_TABLE),       // NodeOffset
     0                                               // Reserved
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

[PATCH edk2-platforms v1 11/11] Platform/ARM: N1SDP: Update for IORT revision macro renaming

[Sami Mujawar]

The IORT Specification E.b updates the IORT table revision to 3. To
reflect this change the IORT header file has been updated to rename
the EFI_ACPI_IO_REMAPPING_TABLE_REVISION macro which was at Rev 0 to
EFI_ACPI_IO_REMAPPING_TABLE_REV0.

Therefore, update the usage of EFI_ACPI_IO_REMAPPING_TABLE_REVISION
macro in the IORT table for N1SDP platform to
EFI_ACPI_IO_REMAPPING_TABLE_REV0.

Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
---
 Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index 9c91372c11ee1a7b0e4d12ebd69a6d2e40d1b169..c18228130ee6901e4f449d59fa4b71bcadd2a31c 100644
--- a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -90,7 +90,7 @@ EDKII_PLATFORM_REPOSITORY_INFO N1sdpRepositoryInfo = {
     // IORT Table
     {
       EFI_ACPI_6_3_IO_REMAPPING_TABLE_SIGNATURE,
-      EFI_ACPI_IO_REMAPPING_TABLE_REVISION,
+      EFI_ACPI_IO_REMAPPING_TABLE_REV0,
       CREATE_STD_ACPI_TABLE_GEN_ID (EStdAcpiTableIdIort),
       NULL
     },
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

Re: [edk2-devel] [PATCH edk2-platforms v1 00/11] Fix build breaks and update IORT revision macro

[Ard Biesheuvel]

On Wed, 10 Nov 2021 at 12:01, Sami Mujawar <sami.mujawar@arm.com> wrote:
>
> The first 4 patches in this series fix build breaks in upstream
> edk2-platforms code for Socionext, Lemaker and SynQuacerEvalBoard.
>
> The IORT Rev E.b specification updates the IORT table revision
> to 3. Following this the IORT table revision macro
> EFI_ACPI_IO_REMAPPING_TABLE_REVISION which was at Rev 0 has
> been renamed to EFI_ACPI_IO_REMAPPING_TABLE_REV0.

I *really* don't like this. All other ACPI tables are set up in a
forward compatible way, where an existing definition in code is
guaranteed to comply with later versions of the spec, and can always
claim to be the newest revision. This is the reason why
xxx_TABLE_REVISION macros exist in the first place.

So I suppose that means that the IORT was modified in a non-forward
compatible fashion? Does that mean that newer firmware has to stick
with the old revision in order to remain able to boot older OS
versions?


> Therefore,
> the last 7 patches in this series are added to reflect this
> change for the following platforms:
>  - FVP
>  - Morello FVP
>  - SGI
>  - AMD/Styx
>  - Socionext/SynQuacer
>  - RaspberryPi
>  - N1SDP
>
> Note: This patch series is dependent on the edk2 patch series:
>   "[PATCH v3 0/8] IORT Rev E.b specification updates"
>   (https://edk2.groups.io/g/devel/message/83545), which must
> be merged in edk2 before this patch series can be integrated.
>
> The changes can be seen at:
> https://github.com/samimujawar/edk2-platforms/tree/1527_iort_rev_eb_platforms_v1
>
> Sami Mujawar (11):
>   Platform/Socionext: Fix build break for SynQuacerEvalBoard
>   Platform/LeMaker: Fix build break for CelloBoard
>   Platform/Socionext/SynQuacerEvalBoard: Add missing ArmSoftFloatLib
>   Platform/Socionext/SynQuacerEvalBoard: Disable EbcDxe for AArch32
>     builds
>   Platform/ARM: FVP: Update for IORT revision macro renaming
>   Platform/ARM: Morello: Update for IORT revision macro renaming
>   Platform/ARM: SGI: Update for IORT revision macro renaming
>   Silicon/AMD/Styx: Update for IORT revision macro renaming
>   Silicon/Socionext/SynQuacer: Update for IORT revision macro renaming
>   Platform/RaspberryPi: Update for IORT revision macro renaming
>   Platform/ARM: N1SDP: Update for IORT revision macro renaming
>
>  Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerFvp.c  |  2 +-
>  Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c       |  2 +-
>  Platform/ARM/SgiPkg/AcpiTables/Iort.aslc                                                     |  2 +-
>  Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c |  2 +-
>  Platform/LeMaker/CelloBoard/CelloBoard.dsc                                                   |  4 +++-
>  Platform/RaspberryPi/AcpiTables/Iort.aslc                                                    |  2 +-
>  Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc                                 | 11 +++++++++--
>  Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf                                 |  8 +++++++-
>  Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc                                           |  2 +-
>  Silicon/Socionext/SynQuacer/AcpiTables/Iort.aslc                                             |  2 +-
>  10 files changed, 26 insertions(+), 11 deletions(-)
>
> --
> 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'
>
>
>
> 
>
>

Re: [edk2-devel] [PATCH edk2-platforms v1 00/11] Fix build breaks and update IORT revision macro

[Sami Mujawar]

Hi Ard,

Please find my response inline marked [SAMI].

Regards,

Sami Mujawar


On 10/11/2021 11:33 AM, Ard Biesheuvel wrote:
> On Wed, 10 Nov 2021 at 12:01, Sami Mujawar <sami.mujawar@arm.com> wrote:
>> The first 4 patches in this series fix build breaks in upstream
>> edk2-platforms code for Socionext, Lemaker and SynQuacerEvalBoard.
>>
>> The IORT Rev E.b specification updates the IORT table revision
>> to 3. Following this the IORT table revision macro
>> EFI_ACPI_IO_REMAPPING_TABLE_REVISION which was at Rev 0 has
>> been renamed to EFI_ACPI_IO_REMAPPING_TABLE_REV0.
> I *really* don't like this. All other ACPI tables are set up in a
> forward compatible way, where an existing definition in code is
> guaranteed to comply with later versions of the spec, and can always
> claim to be the newest revision. This is the reason why
> xxx_TABLE_REVISION macros exist in the first place.
>
> So I suppose that means that the IORT was modified in a non-forward
> compatible fashion? Does that mean that newer firmware has to stick
> with the old revision in order to remain able to boot older OS
> versions?
[SAMI] I don't think the OS compatibility is broken by the IORT spec.

In edk2, the revision macro for IORT is defined differently when compared
to the other ACPI table version macros.

e.g. The IORT revision macro was defined as
"#define EFI_ACPI_IO_REMAPPING_TABLE_REVISION        0x0"
compare this to MADT table version macro which is
"#define EFI_ACPI_6_4_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION 0x05".

Note the EFI_ACPI_x_x prefix in MADT macro name. This allows existing tables
to work, as for ACPI 6.3 the version in Acpi63.h i.e.
EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION will be used.

Since IORT table version macro does not have any version information in the
macro name EFI_ACPI_IO_REMAPPING_TABLE_REV0 is introduced.

The IORT Rev E.b introduces updates the table vertion to 3 and therefore
EFI_ACPI_IO_REMAPPING_TABLE_REV3 has been introduced.
Ref: https://edk2.groups.io/g/devel/message/83547

This IORT Rev E.b patch series essentially retrofits the version tag 
missing in the
IORT table revision macro and this edk2-platform series is a 
corresponding adotption.
[/SAMI]
>
>
>> Therefore,
>> the last 7 patches in this series are added to reflect this
>> change for the following platforms:
>>   - FVP
>>   - Morello FVP
>>   - SGI
>>   - AMD/Styx
>>   - Socionext/SynQuacer
>>   - RaspberryPi
>>   - N1SDP
>>
>> Note: This patch series is dependent on the edk2 patch series:
>>    "[PATCH v3 0/8] IORT Rev E.b specification updates"
>>    (https://edk2.groups.io/g/devel/message/83545), which must
>> be merged in edk2 before this patch series can be integrated.
>>
>> The changes can be seen at:
>> https://github.com/samimujawar/edk2-platforms/tree/1527_iort_rev_eb_platforms_v1
>>
>> Sami Mujawar (11):
>>    Platform/Socionext: Fix build break for SynQuacerEvalBoard
>>    Platform/LeMaker: Fix build break for CelloBoard
>>    Platform/Socionext/SynQuacerEvalBoard: Add missing ArmSoftFloatLib
>>    Platform/Socionext/SynQuacerEvalBoard: Disable EbcDxe for AArch32
>>      builds
>>    Platform/ARM: FVP: Update for IORT revision macro renaming
>>    Platform/ARM: Morello: Update for IORT revision macro renaming
>>    Platform/ARM: SGI: Update for IORT revision macro renaming
>>    Silicon/AMD/Styx: Update for IORT revision macro renaming
>>    Silicon/Socionext/SynQuacer: Update for IORT revision macro renaming
>>    Platform/RaspberryPi: Update for IORT revision macro renaming
>>    Platform/ARM: N1SDP: Update for IORT revision macro renaming
>>
>>   Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerFvp.c  |  2 +-
>>   Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c       |  2 +-
>>   Platform/ARM/SgiPkg/AcpiTables/Iort.aslc                                                     |  2 +-
>>   Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c |  2 +-
>>   Platform/LeMaker/CelloBoard/CelloBoard.dsc                                                   |  4 +++-
>>   Platform/RaspberryPi/AcpiTables/Iort.aslc                                                    |  2 +-
>>   Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc                                 | 11 +++++++++--
>>   Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf                                 |  8 +++++++-
>>   Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc                                           |  2 +-
>>   Silicon/Socionext/SynQuacer/AcpiTables/Iort.aslc                                             |  2 +-
>>   10 files changed, 26 insertions(+), 11 deletions(-)
>>
>> --
>> 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'
>>
>>
>>
>> 
>>
>>