Revision: 13707
http://edk2.svn.sourceforge.net/edk2/?rev=13707&view=rev
Author: niruiyu
Date: 2012-09-07 03:15:25 +0000 (Fri, 07 Sep 2012)
Log Message:
-----------
Cache the state whether the ROM image contains EFI Option ROM when loading the
ROM content from PCI device to memory to avoid re-parsing the ROM image to
check the EFI Option ROM.
Signed-off-by: Ruiyu Ni<[email protected]>
Reviewed-by: Elvin Li<[email protected]>
Modified Paths:
--------------
trunk/edk2/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h
trunk/edk2/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c
trunk/edk2/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c
trunk/edk2/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.h
Modified: trunk/edk2/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h
===================================================================
--- trunk/edk2/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h 2012-09-07 01:55:33 UTC
(rev 13706)
+++ trunk/edk2/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h 2012-09-07 03:15:25 UTC
(rev 13707)
@@ -1,7 +1,7 @@
/** @file
Header files and data structures needed by PCI Bus module.
-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
which accompanies this distribution. The full text of the license may be
found at
@@ -251,6 +251,11 @@
BOOLEAN AllOpRomProcessed;
//
+ // TRUE if the ROM image contains EFI OpROM
+ //
+ BOOLEAN HasEfiOpRom;
+
+ //
// TRUE if there is any EFI driver in the OptionRom
//
BOOLEAN BusOverride;
Modified: trunk/edk2/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c
===================================================================
--- trunk/edk2/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c
2012-09-07 01:55:33 UTC (rev 13706)
+++ trunk/edk2/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c
2012-09-07 03:15:25 UTC (rev 13707)
@@ -1,7 +1,7 @@
/** @file
Supporting functions implementaion for PCI devices management.
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
which accompanies this distribution. The full text of the license may be
found at
@@ -214,7 +214,6 @@
UINT8 PciExpressCapRegOffset;
EFI_PCI_IO_PROTOCOL *PciIo;
UINT8 Data8;
- BOOLEAN HasEfiImage;
//
// Install the pciio protocol, device path protocol
@@ -315,12 +314,7 @@
}
}
- //
- // Determine if there are EFI images in the option rom
- //
- HasEfiImage = ContainEfiImage (PciIoDevice->PciIo.RomImage,
PciIoDevice->PciIo.RomSize);
-
- if (HasEfiImage) {
+ if (PciIoDevice->HasEfiOpRom) {
Status = gBS->InstallMultipleProtocolInterfaces (
&PciIoDevice->Handle,
&gEfiLoadFile2ProtocolGuid,
@@ -350,7 +344,7 @@
// The OpRom is got from platform in the above code
// or loaded from device in the previous round of bus enumeration
//
- if (HasEfiImage) {
+ if (PciIoDevice->HasEfiOpRom) {
ProcessOpRomImage (PciIoDevice);
}
}
@@ -374,7 +368,7 @@
&PciIoDevice->PciIo,
NULL
);
- if (HasEfiImage) {
+ if (PciIoDevice->HasEfiOpRom) {
gBS->UninstallMultipleProtocolInterfaces (
&PciIoDevice->Handle,
&gEfiLoadFile2ProtocolGuid,
Modified: trunk/edk2/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c
===================================================================
--- trunk/edk2/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c
2012-09-07 01:55:33 UTC (rev 13706)
+++ trunk/edk2/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c
2012-09-07 03:15:25 UTC (rev 13707)
@@ -310,51 +310,6 @@
}
/**
- Check if the RomImage contains EFI Images.
-
- @param RomImage The ROM address of Image for check.
- @param RomSize Size of ROM for check.
-
- @retval TRUE ROM contain EFI Image.
- @retval FALSE ROM not contain EFI Image.
-
-**/
-BOOLEAN
-ContainEfiImage (
- IN VOID *RomImage,
- IN UINT64 RomSize
- )
-{
- PCI_EXPANSION_ROM_HEADER *RomHeader;
- PCI_DATA_STRUCTURE *RomPcir;
-
- RomHeader = RomImage;
- if (RomHeader == NULL) {
- return FALSE;
- }
- ASSERT (RomHeader->Signature == PCI_EXPANSION_ROM_HEADER_SIGNATURE);
-
- while ((UINT8 *) RomHeader < (UINT8 *) RomImage + RomSize) {
- if (RomHeader->Signature != PCI_EXPANSION_ROM_HEADER_SIGNATURE) {
- RomHeader = (PCI_EXPANSION_ROM_HEADER *) ((UINT8 *) RomHeader + 512);
- continue;
- }
-
- RomPcir = (PCI_DATA_STRUCTURE *) ((UINT8 *) RomHeader +
RomHeader->PcirOffset);
- ASSERT (RomPcir->Signature == PCI_DATA_STRUCTURE_SIGNATURE);
-
- if (RomPcir->CodeType == PCI_CODE_TYPE_EFI_IMAGE) {
- return TRUE;
- }
-
- RomHeader = (PCI_EXPANSION_ROM_HEADER *) ((UINT8 *) RomHeader +
RomPcir->Length * 512);
- }
-
- return FALSE;
-}
-
-
-/**
Load Option Rom image for specified PCI device.
@param PciDevice Pci device instance.
@@ -385,6 +340,7 @@
UINT32 LegacyImageLength;
UINT8 *RomInMemory;
UINT8 CodeType;
+ BOOLEAN HasEfiOpRom;
RomSize = PciDevice->RomSize;
@@ -436,6 +392,7 @@
RetStatus = EFI_NOT_FOUND;
FirstCheck = TRUE;
LegacyImageLength = 0;
+ HasEfiOpRom = FALSE;
do {
PciDevice->PciRootBridgeIo->Mem.Read (
@@ -486,6 +443,8 @@
if (RomPcir->CodeType == PCI_CODE_TYPE_PCAT_IMAGE) {
CodeType = PCI_CODE_TYPE_PCAT_IMAGE;
LegacyImageLength = ((UINT32)((EFI_LEGACY_EXPANSION_ROM_HEADER
*)RomHeader)->Size512) * 512;
+ } else if (RomPcir->CodeType == PCI_CODE_TYPE_EFI_IMAGE) {
+ HasEfiOpRom = TRUE;
}
Indicator = RomPcir->Indicator;
RomImageSize = RomImageSize + RomPcir->ImageLength * 512;
@@ -525,6 +484,7 @@
RomDecode (PciDevice, RomBarIndex, RomBar, FALSE);
+ PciDevice->HasEfiOpRom = HasEfiOpRom;
PciDevice->EmbeddedRom = TRUE;
PciDevice->PciIo.RomSize = RomImageSize;
PciDevice->PciIo.RomImage = RomInMemory;
Modified: trunk/edk2/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.h
===================================================================
--- trunk/edk2/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.h
2012-09-07 01:55:33 UTC (rev 13706)
+++ trunk/edk2/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.h
2012-09-07 03:15:25 UTC (rev 13707)
@@ -1,7 +1,7 @@
/** @file
PCI Rom supporting funtions declaration for PCI Bus module.
-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
which accompanies this distribution. The full text of the license may be
found at
@@ -61,23 +61,6 @@
);
/**
- Check if the RomImage contains EFI Images.
-
- @param RomImage The ROM address of Image for check.
- @param RomSize Size of ROM for check.
-
- @retval TRUE ROM contain EFI Image.
- @retval FALSE ROM not contain EFI Image.
-
-**/
-BOOLEAN
-ContainEfiImage (
- IN VOID *RomImage,
- IN UINT64 RomSize
- );
-
-
-/**
Get Pci device's oprom information.
@param PciIoDevice Input Pci device instance.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
