public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "PierreGondois" <pierre.gondois@arm.com>
To: devel@edk2.groups.io
Cc: Thomas Abraham <thomas.abraham@arm.com>,
	Ard Biesheuvel <ardb+tianocore@kernel.org>,
	Sami Mujawar <sami.mujawar@arm.com>,
	Fabien Ficheau <fabien.ficheau@arm.com>
Subject: [PATCH 1/1] Platform/ARM/JunoPkg: Don't setup PCIe root bridge for Juno-r0
Date: Thu, 13 Apr 2023 15:14:48 +0200	[thread overview]
Message-ID: <20230413131448.70329-1-Pierre.Gondois@arm.com> (raw)

From: Pierre Gondois <pierre.gondois@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@arm.com>
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
 .../ARM/JunoPkg/Library/JunoPciHostBridgeLib/XPressRich3.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/XPressRich3.c b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/XPressRich3.c
index 0755dc155616..583efd0efb16 100644
--- a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/XPressRich3.c
+++ b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/XPressRich3.c
@@ -69,6 +69,13 @@ HWPciRbInit (
   UINTN                   TranslationTable;
   EFI_CPU_IO2_PROTOCOL    *CpuIo;
   EFI_STATUS              Status;
+  UINT32                  JunoRevision;
+
+  GetJunoRevision (JunoRevision);
+  DEBUG ((DEBUG_ERROR, "Juno rev=%d\n", JunoRevision));
+  if (JunoRevision == JUNO_REVISION_R0) {
+    return EFI_SUCCESS;
+  }
 
   PCI_TRACE ("VExpressPciRbInit()");
 
-- 
2.25.1


             reply	other threads:[~2023-04-13 13:15 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-13 13:14 PierreGondois [this message]
2023-04-13 16:04 ` [PATCH 1/1] Platform/ARM/JunoPkg: Don't setup PCIe root bridge for Juno-r0 Sami Mujawar
2023-04-13 22:04 ` [edk2-devel] " Rebecca Cran
2023-04-14  7:12   ` PierreGondois

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230413131448.70329-1-Pierre.Gondois@arm.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox