From: Ruiyu Ni <ruiyu.ni@intel.com>
To: edk2-devel@lists.01.org
Cc: Chiu Chasel <chasel.chiu@intel.com>,
Hao A Wu <hao.a.wu@intel.com>,
Jian J Wang <jian.j.wang@intel.com>
Subject: [PATCH] MdeModulePkg/PciBus: Fix system hang when no PCI Option ROM exists
Date: Wed, 12 Dec 2018 23:10:15 +0800 [thread overview]
Message-ID: <20181212151015.117308-1-ruiyu.ni@intel.com> (raw)
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1394
When there is no PCI option ROM exists, today's logic still creates
virtual BAR for option ROM using Length = 0, Alignment = (-1).
It causes the final MEM32 alignment requirement is as big as
0xFFFFFFFF_FFFFFFFF.
The patch fixes this issue by only creating virtual BAR for option
ROM when there is PCI option ROM.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Chiu Chasel <chasel.chiu@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
---
MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.c
index 7255bcfbbc..ee5c77147e 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.c
@@ -515,10 +515,12 @@ PciHostBridgeResourceAllocator (
// All devices' Option ROM share the same MEM32 resource.
//
MaxOptionRomSize = GetMaxOptionRomSize (RootBridgeDev);
- RootBridgeDev->PciBar[0].BarType = PciBarTypeOpRom;
- RootBridgeDev->PciBar[0].Length = MaxOptionRomSize;
- RootBridgeDev->PciBar[0].Alignment = MaxOptionRomSize - 1;
- GetResourceFromDevice (RootBridgeDev, IoBridge, Mem32Bridge, PMem32Bridge, Mem64Bridge, PMem64Bridge);
+ if (MaxOptionRomSize != 0) {
+ RootBridgeDev->PciBar[0].BarType = PciBarTypeOpRom;
+ RootBridgeDev->PciBar[0].Length = MaxOptionRomSize;
+ RootBridgeDev->PciBar[0].Alignment = MaxOptionRomSize - 1;
+ GetResourceFromDevice (RootBridgeDev, IoBridge, Mem32Bridge, PMem32Bridge, Mem64Bridge, PMem64Bridge);
+ }
//
// Create resourcemap by going through all the devices subject to this root bridge
--
2.16.1.windows.1
next reply other threads:[~2018-12-12 15:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-12 15:10 Ruiyu Ni [this message]
2018-12-12 18:17 ` [PATCH] MdeModulePkg/PciBus: Fix system hang when no PCI Option ROM exists Ard Biesheuvel
2018-12-13 0:26 ` Chiu, Chasel
2018-12-13 1:39 ` Wang, Jian J
2018-12-13 12:48 ` Wu, Hao A
2018-12-14 14:16 ` Philippe Mathieu-Daudé
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=20181212151015.117308-1-ruiyu.ni@intel.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