sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug in PciCfg to support PCI express address.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3549 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
yshang1
2007-08-06 03:52:01 +00:00
parent 38d64b3250
commit d8b61daacc
9 changed files with 70 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
View File

@@ -67,7 +67,6 @@
BaseMemoryLib
PeiServicesTablePointerLib
CustomDecompressLib
TianoDecompressLib
UefiDecompressLib
PeCoffLoaderLib
CacheMaintenanceLib

2
MdeModulePkg/MdeModulePkg.dsc
View File

@@ -79,7 +79,7 @@
ReportStatusCodeLib|IntelFrameworkPkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
SmBusLib|MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLib.inf
SmBusLib|MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLibSmbus2Ppi.inf
[LibraryClasses.common.DXE_CORE]
HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf

32
MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c
View File

@@ -22,13 +22,27 @@
#include <IndustryStandard\Pci.h>
#define COMMON_TO_PCILIB_ADDRESS(A) (UINTN)PCI_LIB_ADDRESS( \
((EFI_PEI_PCI_CFG_PPI_PCI_ADDRESS *) &A)->Bus, \
((EFI_PEI_PCI_CFG_PPI_PCI_ADDRESS *) &A)->Device, \
((EFI_PEI_PCI_CFG_PPI_PCI_ADDRESS *) &A)->Function, \
((EFI_PEI_PCI_CFG_PPI_PCI_ADDRESS *) &A)->Register \
)
/**
Convert EFI_PEI_PCI_CFG_PPI_PCI_ADDRESS to PCI_LIB_ADDRESS.
@param Address PCI address with
EFI_PEI_PCI_CFG_PPI_PCI_ADDRESS format.
@return The PCI address with PCI_LIB_ADDRESS format.
**/
STATIC
UINTN
PciCfgAddressConvert (
EFI_PEI_PCI_CFG_PPI_PCI_ADDRESS *Address
)
{
if (Address->ExtendedRegister == 0) {
return PCI_LIB_ADDRESS (Address->Bus, Address->Device, Address->Function, Address->Register);
}
return PCI_LIB_ADDRESS (Address->Bus, Address->Device, Address->Function, Address->ExtendedRegister);
}
/**
Reads from a given location in the PCI configuration space.
@@ -206,7 +220,7 @@ PciCfg2Read (
{
UINTN PciLibAddress;
PciLibAddress = COMMON_TO_PCILIB_ADDRESS (Address);
PciLibAddress = PciCfgAddressConvert ((EFI_PEI_PCI_CFG_PPI_PCI_ADDRESS *) &Address);
if (Width == EfiPeiPciCfgWidthUint8) {
*((UINT8 *) Buffer) = PciRead8 (PciLibAddress);
@@ -257,7 +271,7 @@ PciCfg2Write (
{
UINTN PciLibAddress;
PciLibAddress = COMMON_TO_PCILIB_ADDRESS (Address);
PciLibAddress = PciCfgAddressConvert ((EFI_PEI_PCI_CFG_PPI_PCI_ADDRESS *) &Address);
if (Width == EfiPeiPciCfgWidthUint8) {
PciWrite8 (PciLibAddress, *((UINT8 *) Buffer));
@@ -315,7 +329,7 @@ PciCfg2Modify (
{
UINTN PciLibAddress;
PciLibAddress = COMMON_TO_PCILIB_ADDRESS (Address);
PciLibAddress = PciCfgAddressConvert ((EFI_PEI_PCI_CFG_PPI_PCI_ADDRESS *) &Address);
if (Width == EfiPeiPciCfgWidthUint8) {
PciAndThenOr8 (PciLibAddress, ~(*(UINT8 *)ClearBits), *((UINT8 *) SetBits));