summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael D Kinney <michael.d.kinney@intel.com>2022-01-21 16:48:47 -0800
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2022-02-04 18:10:25 +0000
commita4b7aa362d94bbe0287663cab9af4ab503f6185d (patch)
treeb7619b42707e49a1951e29344422130496534447
parent33189f05278345eab608ff56e87905bdeacdbd47 (diff)
downloadedk2-a4b7aa362d94bbe0287663cab9af4ab503f6185d.tar.gz
edk2-a4b7aa362d94bbe0287663cab9af4ab503f6185d.tar.bz2
edk2-a4b7aa362d94bbe0287663cab9af4ab503f6185d.zip
MdeModulePkg/Bus/Pci/PciBusDxe: Support platform PCI ROM override
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3811 Remove ASSERT() statements that are triggered if a platform provides an override of PCI ROM attached to a PCI Controller. The PCI Platform Protocol allows the platform to provide a PCI ROM image for a PCI Controller. This works for PCI Controllers that do not have an attached PCI ROM, but the platform is not allowed to replace the PCI ROM for a PCI Controller that has its own PCI ROM. Removing these ASSERT() statements enables this additional use case. Cc: Hao A Wu <hao.a.wu@intel.com> Cc: Ray Ni <ray.ni@intel.com> Cc: Star Zeng <star.zeng@intel.com> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com> Reviewed-by: Star Zeng <star.zeng@intel.com> Reviewed-by: Ray Ni <ray.ni@intel.com> Acked-by: Ard Biesheuvel <ardb@kernel.org>
-rw-r--r--MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c
index 5535bd3013..cb845ec2b1 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c
@@ -58,10 +58,9 @@ PciRomAddImageMapping (
{
//
// Expect once RomImage and RomSize are recorded, they will be passed in
- // later when updating ImageHandle
+ // later when updating ImageHandle. They may also be updated with new
+ // values if the platform provides an override of RomImage and RomSize.
//
- ASSERT ((mRomImageTable[Index].RomImage == NULL) || (RomImage == mRomImageTable[Index].RomImage));
- ASSERT ((mRomImageTable[Index].RomSize == 0) || (RomSize == mRomImageTable[Index].RomSize));
break;
}
}