Reviewed-by: Ray Ni <ray...@intel.com> -----Original Message----- From: Kinney, Michael D <michael.d.kin...@intel.com> Sent: Saturday, January 22, 2022 9:41 AM To: devel@edk2.groups.io Cc: Wu, Hao A <hao.a...@intel.com>; Ni, Ray <ray...@intel.com>; Zeng, Star <star.z...@intel.com> Subject: [Patch 1/1] 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...@intel.com> Cc: Ray Ni <ray...@intel.com> Cc: Star Zeng <star.z...@intel.com> Signed-off-by: Michael D Kinney <michael.d.kin...@intel.com> --- MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c index 5535bd3013b8..cb845ec2b186 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; } } -- 2.32.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#86105): https://edk2.groups.io/g/devel/message/86105 Mute This Topic: https://groups.io/mt/88598310/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
