[edk2-devel] [PATCH v2 1/1] Platform/ARM/JunoPkg: Don't setup PCIe root bridge for Juno-r0

[PierreGondois]

From: Pierre Gondois <pierre.gondois at arm.com>

Booting a Juno-r0 with a DEBUG build triggers an ASSERT when
processing the library constructors of:
MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf

JunoPciHostBridgeLib.inf::HWPciRbInit() returns an error code
as Juno-r0 doesn't support PCIe.

Check Juno's revision in HWPciRbInit() before setting up the
PCIe root complex.

Reported-by: Fabien Ficheau <fabien.ficheau at arm.com>
Signed-off-by: Pierre Gondois <Pierre.Gondois at arm.com>
Reviewed-by: Sami Mujawar <sami.mujawar at arm.com>
---
 .../ARM/JunoPkg/Library/JunoPciHostBridgeLib/XPressRich3.c  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/XPressRich3.c b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/XPressRich3.c
index 0755dc155616..055bf95f10ec 100644
--- a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/XPressRich3.c
+++ b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/XPressRich3.c
@@ -69,6 +69,12 @@ HWPciRbInit (
   UINTN                   TranslationTable;
   EFI_CPU_IO2_PROTOCOL    *CpuIo;
   EFI_STATUS              Status;
+  UINT32                  JunoRevision;
+
+  GetJunoRevision (JunoRevision);
+  if (JunoRevision == JUNO_REVISION_R0) {
+    return EFI_SUCCESS;
+  }
 
   PCI_TRACE ("VExpressPciRbInit()");
 
-- 
2.25.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#102968): https://edk2.groups.io/g/devel/message/102968
Mute This Topic: https://groups.io/mt/98257451/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-