For RD-N1-Edge platforms, use multi-chip-mode information from the
SGI platform descriptor HOB to pick the correct ACPI table to be
installed.
Signed-off-by: Vijayenthiran Subramaniam <vijayenthiran.subramaniam@...>
---
Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf | 1 +
Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf
index a95c0d1dddd6..741dcc75ed6a 100644
--- a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf
+++ b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf
@@ -32,6 +32,7 @@ [Guids]
gArmSgiPlatformIdDescriptorGuid
gSgi575AcpiTablesFileGuid
gRdN1EdgeAcpiTablesFileGuid
+ gRdN1EdgeX2AcpiTablesFileGuid
gRdE1EdgeAcpiTablesFileGuid
[FeaturePcd]
diff --git a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c
index d988a23b8093..fd90c282a3f4 100644
--- a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c
+++ b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c
@@ -38,6 +38,11 @@ STATIC SGI_PLATFORM_ACPI_TABLE_GUID_LOOKUP AcpiTableGuidLookup[] = {
&gRdN1EdgeAcpiTablesFileGuid),
ACPI_GUID_LOOKUP (
RD_N1E1_EDGE_PART_NUM,
+ RD_N1_EDGE_CONF_ID,
+ MULTI_CHIP_MODE_ENABLED,
+ &gRdN1EdgeX2AcpiTablesFileGuid),
+ CONSTRUCT_ACPI_GUID_LOOKUP (
+ RD_N1E1_EDGE_PART_NUM,
RD_E1_EDGE_CONF_ID,
MULTI_CHIP_MODE_DISABLED,
&gRdE1EdgeAcpiTablesFileGuid),
--
2.7.4
