tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-31 01:24:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Ruiyu Ni 2017-10-27 11:37:18 +08:00
parent 221c8fd512
commit 84ed8edff1
1 changed files with 47 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c
View File

@ -53,10 +53,29 @@ PciRomAddImageMapping (
IN UINT64 RomSize IN UINT64 RomSize
) )
{ {
UINTN Index;
PCI_ROM_IMAGE *NewTable; PCI_ROM_IMAGE *NewTable;
if (mNumberOfPciRomImages == mMaxNumberOfPciRomImages) { for (Index = 0; Index < mNumberOfPciRomImages; Index++) {
if (mRomImageTable[Index].Seg == Seg &&
mRomImageTable[Index].Bus == Bus &&
mRomImageTable[Index].Dev == Dev &&
mRomImageTable[Index].Func == Func) {
//
// Expect once RomImage and RomSize are recorded, they will be passed in
// later when updating ImageHandle
//
ASSERT ((mRomImageTable[Index].RomImage == NULL) || (RomImage == mRomImageTable[Index].RomImage));
ASSERT ((mRomImageTable[Index].RomSize == 0 ) || (RomSize == mRomImageTable[Index].RomSize ));
break;
}
}
if (Index == mNumberOfPciRomImages) {
//
// Rom Image Table buffer needs to grow.
//
if (mNumberOfPciRomImages == mMaxNumberOfPciRomImages) {
NewTable = ReallocatePool ( NewTable = ReallocatePool (
mMaxNumberOfPciRomImages * sizeof (PCI_ROM_IMAGE), mMaxNumberOfPciRomImages * sizeof (PCI_ROM_IMAGE),
(mMaxNumberOfPciRomImages + 0x20) * sizeof (PCI_ROM_IMAGE), (mMaxNumberOfPciRomImages + 0x20) * sizeof (PCI_ROM_IMAGE),
@ -69,17 +88,21 @@ PciRomAddImageMapping (
mRomImageTable = NewTable; mRomImageTable = NewTable;
mMaxNumberOfPciRomImages += 0x20; mMaxNumberOfPciRomImages += 0x20;
} }
//
mRomImageTable[mNumberOfPciRomImages].ImageHandle = ImageHandle; // Record the new PCI device
mRomImageTable[mNumberOfPciRomImages].Seg = Seg; //
mRomImageTable[mNumberOfPciRomImages].Bus = Bus; mRomImageTable[Index].Seg = Seg;
mRomImageTable[mNumberOfPciRomImages].Dev = Dev; mRomImageTable[Index].Bus = Bus;
mRomImageTable[mNumberOfPciRomImages].Func = Func; mRomImageTable[Index].Dev = Dev;
mRomImageTable[mNumberOfPciRomImages].RomImage = RomImage; mRomImageTable[Index].Func = Func;
mRomImageTable[mNumberOfPciRomImages].RomSize = RomSize;
mNumberOfPciRomImages++; mNumberOfPciRomImages++;
} }
mRomImageTable[Index].ImageHandle = ImageHandle;
mRomImageTable[Index].RomImage = RomImage;
mRomImageTable[Index].RomSize = RomSize;
}
/** /**
Get Option rom driver's mapping for PCI device. Get Option rom driver's mapping for PCI device.
@ -96,26 +119,23 @@ PciRomGetImageMapping (
{ {
EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL *PciRootBridgeIo; EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL *PciRootBridgeIo;
UINTN Index; UINTN Index;
BOOLEAN Found;
PciRootBridgeIo = PciIoDevice->PciRootBridgeIo; PciRootBridgeIo = PciIoDevice->PciRootBridgeIo;
Found = FALSE;
for (Index = 0; Index < mNumberOfPciRomImages; Index++) { for (Index = 0; Index < mNumberOfPciRomImages; Index++) {
if (mRomImageTable[Index].Seg == PciRootBridgeIo->SegmentNumber && if (mRomImageTable[Index].Seg == PciRootBridgeIo->SegmentNumber &&
mRomImageTable[Index].Bus == PciIoDevice->BusNumber && mRomImageTable[Index].Bus == PciIoDevice->BusNumber &&
mRomImageTable[Index].Dev == PciIoDevice->DeviceNumber && mRomImageTable[Index].Dev == PciIoDevice->DeviceNumber &&
mRomImageTable[Index].Func == PciIoDevice->FunctionNumber ) { mRomImageTable[Index].Func == PciIoDevice->FunctionNumber ) {
Found = TRUE;
if (mRomImageTable[Index].ImageHandle != NULL) { if (mRomImageTable[Index].ImageHandle != NULL) {
AddDriver (PciIoDevice, mRomImageTable[Index].ImageHandle); AddDriver (PciIoDevice, mRomImageTable[Index].ImageHandle);
} else { }
PciIoDevice->PciIo.RomImage = mRomImageTable[Index].RomImage; PciIoDevice->PciIo.RomImage = mRomImageTable[Index].RomImage;
PciIoDevice->PciIo.RomSize = mRomImageTable[Index].RomSize; PciIoDevice->PciIo.RomSize = mRomImageTable[Index].RomSize;
} return TRUE;
} }
} }
return Found; return FALSE;
} }