diff options
| author | Ruiyu Ni <ruiyu.ni@intel.com> | 2018-12-11 17:49:17 +0800 |
|---|---|---|
| committer | Ruiyu Ni <ruiyu.ni@intel.com> | 2018-12-17 09:38:02 +0800 |
| commit | 736c436e5355e1370f13392a6cecf2cf260608a8 (patch) | |
| tree | da2cefc0eaa6f48d1753f4b25cd85dfe6e1844c7 | |
| parent | c8c3c53669bea887ecc093167d64d1fbe63c213f (diff) | |
| download | edk2-736c436e5355e1370f13392a6cecf2cf260608a8.tar.gz edk2-736c436e5355e1370f13392a6cecf2cf260608a8.tar.bz2 edk2-736c436e5355e1370f13392a6cecf2cf260608a8.zip | |
MdeModulePkg/PciBus: Fix system hang when no PCI Option ROM exists
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>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>
Reviewed-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
| -rw-r--r-- | MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.c | 10 |
1 files 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
|