MdeModulePkg/PciBus: Don't create entry when recording ImageHandle

The patch shouldn't impact functionality.

Original code records the ImageHandle of Option ROM by creating a
new entry. It's not necessary.
The patch updates the ImageHandle in the old entry.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c
index 0eef41739c7def96d62a3c1652485f26828f4c07..fc6f5792939f6b4a487a52a818756ce7a59ca642 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c
@@ -53,31 +53,54 @@ PciRomAddImageMapping (
   IN  UINT64      RomSize\r
   )\r
 {\r
+  UINTN           Index;\r
   PCI_ROM_IMAGE   *NewTable;\r
 \r
-  if (mNumberOfPciRomImages == mMaxNumberOfPciRomImages) {\r
-\r
-    NewTable = ReallocatePool (\r
-                 mMaxNumberOfPciRomImages * sizeof (PCI_ROM_IMAGE),\r
-                 (mMaxNumberOfPciRomImages + 0x20) * sizeof (PCI_ROM_IMAGE),\r
-                 mRomImageTable\r
-                 );\r
-    if (NewTable == NULL) {\r
-      return ;\r
+  for (Index = 0; Index < mNumberOfPciRomImages; Index++) {\r
+    if (mRomImageTable[Index].Seg  == Seg &&\r
+        mRomImageTable[Index].Bus  == Bus &&\r
+        mRomImageTable[Index].Dev  == Dev &&\r
+        mRomImageTable[Index].Func == Func) {\r
+      //\r
+      // Expect once RomImage and RomSize are recorded, they will be passed in\r
+      // later when updating ImageHandle\r
+      //\r
+      ASSERT ((mRomImageTable[Index].RomImage == NULL) || (RomImage == mRomImageTable[Index].RomImage));\r
+      ASSERT ((mRomImageTable[Index].RomSize  == 0   ) || (RomSize  == mRomImageTable[Index].RomSize ));\r
+      break;\r
     }\r
+  }\r
 \r
-    mRomImageTable            = NewTable;\r
-    mMaxNumberOfPciRomImages += 0x20;\r
+  if (Index == mNumberOfPciRomImages) {\r
+    //\r
+    // Rom Image Table buffer needs to grow.\r
+    //\r
+    if (mNumberOfPciRomImages == mMaxNumberOfPciRomImages) {\r
+      NewTable = ReallocatePool (\r
+                   mMaxNumberOfPciRomImages * sizeof (PCI_ROM_IMAGE),\r
+                   (mMaxNumberOfPciRomImages + 0x20) * sizeof (PCI_ROM_IMAGE),\r
+                   mRomImageTable\r
+                   );\r
+      if (NewTable == NULL) {\r
+        return ;\r
+      }\r
+\r
+      mRomImageTable            = NewTable;\r
+      mMaxNumberOfPciRomImages += 0x20;\r
+    }\r
+    //\r
+    // Record the new PCI device\r
+    //\r
+    mRomImageTable[Index].Seg  = Seg;\r
+    mRomImageTable[Index].Bus  = Bus;\r
+    mRomImageTable[Index].Dev  = Dev;\r
+    mRomImageTable[Index].Func = Func;\r
+    mNumberOfPciRomImages++;\r
   }\r
 \r
-  mRomImageTable[mNumberOfPciRomImages].ImageHandle = ImageHandle;\r
-  mRomImageTable[mNumberOfPciRomImages].Seg         = Seg;\r
-  mRomImageTable[mNumberOfPciRomImages].Bus         = Bus;\r
-  mRomImageTable[mNumberOfPciRomImages].Dev         = Dev;\r
-  mRomImageTable[mNumberOfPciRomImages].Func        = Func;\r
-  mRomImageTable[mNumberOfPciRomImages].RomImage    = RomImage;\r
-  mRomImageTable[mNumberOfPciRomImages].RomSize     = RomSize;\r
-  mNumberOfPciRomImages++;\r
+  mRomImageTable[Index].ImageHandle = ImageHandle;\r
+  mRomImageTable[Index].RomImage    = RomImage;\r
+  mRomImageTable[Index].RomSize     = RomSize;\r
 }\r
 \r
 /**\r
@@ -96,26 +119,23 @@ PciRomGetImageMapping (
 {\r
   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL *PciRootBridgeIo;\r
   UINTN                           Index;\r
-  BOOLEAN                         Found;\r
 \r
   PciRootBridgeIo = PciIoDevice->PciRootBridgeIo;\r
-  Found           = FALSE;\r
 \r
   for (Index = 0; Index < mNumberOfPciRomImages; Index++) {\r
     if (mRomImageTable[Index].Seg  == PciRootBridgeIo->SegmentNumber &&\r
         mRomImageTable[Index].Bus  == PciIoDevice->BusNumber         &&\r
         mRomImageTable[Index].Dev  == PciIoDevice->DeviceNumber      &&\r
         mRomImageTable[Index].Func == PciIoDevice->FunctionNumber    ) {\r
-        Found = TRUE;\r
 \r
       if (mRomImageTable[Index].ImageHandle != NULL) {\r
         AddDriver (PciIoDevice, mRomImageTable[Index].ImageHandle);\r
-      } else {\r
-        PciIoDevice->PciIo.RomImage = mRomImageTable[Index].RomImage;\r
-        PciIoDevice->PciIo.RomSize  = mRomImageTable[Index].RomSize;\r
       }\r
+      PciIoDevice->PciIo.RomImage = mRomImageTable[Index].RomImage;\r
+      PciIoDevice->PciIo.RomSize  = mRomImageTable[Index].RomSize;\r
+      return TRUE;\r
     }\r
   }\r
 \r
-  return Found;\r
+  return FALSE;\r
 }\r