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

6
IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfg.c
View File

@ -53,7 +53,7 @@ PciCfgRead (
{
UINTN PciLibAddress;
PciLibAddress = COMMON_TO_PCILIB_ADDRESS (Address);
PciLibAddress = PciCfgAddressConvert ((EFI_PEI_PCI_CFG_PPI_PCI_ADDRESS *) &Address);
switch (Width) {
case EfiPeiPciCfgWidthUint8:
* (UINT8 *) Buffer = PciRead8 (PciLibAddress);
@ -103,7 +103,7 @@ PciCfgWrite (
{
UINTN PciLibAddress;
PciLibAddress = COMMON_TO_PCILIB_ADDRESS (Address);
PciLibAddress = PciCfgAddressConvert ((EFI_PEI_PCI_CFG_PPI_PCI_ADDRESS *) &Address);
switch (Width) {
case EfiPeiPciCfgWidthUint8:
PciWrite8 (PciLibAddress, *(UINT8 *) Buffer);
@ -153,7 +153,7 @@ PciCfgModify (
{
UINTN PciLibAddress;
PciLibAddress = COMMON_TO_PCILIB_ADDRESS (Address);
PciLibAddress = PciCfgAddressConvert ((EFI_PEI_PCI_CFG_PPI_PCI_ADDRESS *) &Address);
switch (Width) {
case EfiPeiPciCfgWidthUint8:
PciAndThenOr8 (PciLibAddress, (UINT8)~ClearBits, (UINT8)SetBits);

28
IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfg2.c
View File

@ -71,6 +71,28 @@ EFI_PEI_PPI_DESCRIPTOR gPciCfgPpiList = {
&gPciCfgPpi
};
/**
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.
**/
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.
@ -107,7 +129,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);
@ -158,7 +180,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));
@ -216,7 +238,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));

20
IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfgInternal.h
View File

@ -28,12 +28,20 @@
#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.
**/
UINTN
PciCfgAddressConvert (
EFI_PEI_PCI_CFG_PPI_PCI_ADDRESS *Address
);
/**