From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.88; helo=mga01.intel.com; envelope-from=ruiyu.ni@intel.com; receiver=edk2-devel@lists.01.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id B9CE22034A88B for ; Thu, 26 Oct 2017 23:50:57 -0700 (PDT) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Oct 2017 23:54:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,303,1505804400"; d="scan'208";a="1030015309" Received: from ray-dev.ccr.corp.intel.com ([10.239.9.7]) by orsmga003.jf.intel.com with ESMTP; 26 Oct 2017 23:54:43 -0700 From: Ruiyu Ni To: edk2-devel@lists.01.org Cc: Star Zeng Date: Fri, 27 Oct 2017 14:54:37 +0800 Message-Id: <20171027065438.284440-3-ruiyu.ni@intel.com> X-Mailer: git-send-email 2.12.2.windows.2 In-Reply-To: <20171027065438.284440-1-ruiyu.ni@intel.com> References: <20171027065438.284440-1-ruiyu.ni@intel.com> Subject: [PATCH 2/3] MdeModulePkg/PciBus: Don't create entry when recording ImageHandle X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Oct 2017 06:50:58 -0000 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 Cc: Star Zeng --- MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c | 72 ++++++++++++++++++---------- 1 file changed, 46 insertions(+), 26 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c index 0eef41739c..fc6f579293 100644 --- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c +++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c @@ -53,31 +53,54 @@ PciRomAddImageMapping ( IN UINT64 RomSize ) { + UINTN Index; PCI_ROM_IMAGE *NewTable; - if (mNumberOfPciRomImages == mMaxNumberOfPciRomImages) { - - NewTable = ReallocatePool ( - mMaxNumberOfPciRomImages * sizeof (PCI_ROM_IMAGE), - (mMaxNumberOfPciRomImages + 0x20) * sizeof (PCI_ROM_IMAGE), - mRomImageTable - ); - if (NewTable == NULL) { - return ; + 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; } + } - mRomImageTable = NewTable; - mMaxNumberOfPciRomImages += 0x20; + if (Index == mNumberOfPciRomImages) { + // + // Rom Image Table buffer needs to grow. + // + if (mNumberOfPciRomImages == mMaxNumberOfPciRomImages) { + NewTable = ReallocatePool ( + mMaxNumberOfPciRomImages * sizeof (PCI_ROM_IMAGE), + (mMaxNumberOfPciRomImages + 0x20) * sizeof (PCI_ROM_IMAGE), + mRomImageTable + ); + if (NewTable == NULL) { + return ; + } + + mRomImageTable = NewTable; + mMaxNumberOfPciRomImages += 0x20; + } + // + // Record the new PCI device + // + mRomImageTable[Index].Seg = Seg; + mRomImageTable[Index].Bus = Bus; + mRomImageTable[Index].Dev = Dev; + mRomImageTable[Index].Func = Func; + mNumberOfPciRomImages++; } - mRomImageTable[mNumberOfPciRomImages].ImageHandle = ImageHandle; - mRomImageTable[mNumberOfPciRomImages].Seg = Seg; - mRomImageTable[mNumberOfPciRomImages].Bus = Bus; - mRomImageTable[mNumberOfPciRomImages].Dev = Dev; - mRomImageTable[mNumberOfPciRomImages].Func = Func; - mRomImageTable[mNumberOfPciRomImages].RomImage = RomImage; - mRomImageTable[mNumberOfPciRomImages].RomSize = RomSize; - mNumberOfPciRomImages++; + mRomImageTable[Index].ImageHandle = ImageHandle; + mRomImageTable[Index].RomImage = RomImage; + mRomImageTable[Index].RomSize = RomSize; } /** @@ -96,26 +119,23 @@ PciRomGetImageMapping ( { EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL *PciRootBridgeIo; UINTN Index; - BOOLEAN Found; PciRootBridgeIo = PciIoDevice->PciRootBridgeIo; - Found = FALSE; for (Index = 0; Index < mNumberOfPciRomImages; Index++) { if (mRomImageTable[Index].Seg == PciRootBridgeIo->SegmentNumber && mRomImageTable[Index].Bus == PciIoDevice->BusNumber && mRomImageTable[Index].Dev == PciIoDevice->DeviceNumber && mRomImageTable[Index].Func == PciIoDevice->FunctionNumber ) { - Found = TRUE; if (mRomImageTable[Index].ImageHandle != NULL) { AddDriver (PciIoDevice, mRomImageTable[Index].ImageHandle); - } else { - PciIoDevice->PciIo.RomImage = mRomImageTable[Index].RomImage; - PciIoDevice->PciIo.RomSize = mRomImageTable[Index].RomSize; } + PciIoDevice->PciIo.RomImage = mRomImageTable[Index].RomImage; + PciIoDevice->PciIo.RomSize = mRomImageTable[Index].RomSize; + return TRUE; } } - return Found; + return FALSE; } -- 2.12.2.windows.2