tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change PciIo::GetBarAttributes() to return unsupported for a unsupported bar even it's below 6 to follow the UEFI Spec. 

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15535 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Ruiyu Ni 2014-05-15 07:22:27 +00:00 committed by niruiyu
parent ab82122dfe
commit 3bdb6d12a8
1 changed files with 73 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

159
MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
EFI PCI IO protocol functions implementation for PCI Bus module. EFI PCI IO protocol functions implementation for PCI Bus module.
Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -1779,14 +1779,10 @@ PciIoGetBarAttributes (
OUT VOID **Resources OPTIONAL OUT VOID **Resources OPTIONAL
) )
{ {
UINT8 *Configuration; UINT8 *Configuration;
UINT8 NumConfig;
PCI_IO_DEVICE *PciIoDevice; PCI_IO_DEVICE *PciIoDevice;
EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *Ptr; EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *AddressSpace;
EFI_ACPI_END_TAG_DESCRIPTOR *PtrEnd; EFI_ACPI_END_TAG_DESCRIPTOR *End;
NumConfig = 0;
PciIoDevice = PCI_IO_DEVICE_FROM_PCI_IO_THIS (This); PciIoDevice = PCI_IO_DEVICE_FROM_PCI_IO_THIS (This);
@ -1794,7 +1790,7 @@ PciIoGetBarAttributes (
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
} }
if (BarIndex >= PCI_MAX_BAR) { if ((BarIndex >= PCI_MAX_BAR) || (PciIoDevice->PciBar[BarIndex].BarType == PciBarTypeUnknown)) {
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} }
@ -1807,102 +1803,93 @@ PciIoGetBarAttributes (
} }
if (Resources != NULL) { if (Resources != NULL) {
Configuration = AllocateZeroPool (sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) + sizeof (EFI_ACPI_END_TAG_DESCRIPTOR));
if (PciIoDevice->PciBar[BarIndex].BarType != PciBarTypeUnknown) {
NumConfig = 1;
}
Configuration = AllocateZeroPool (sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) * NumConfig + sizeof (EFI_ACPI_END_TAG_DESCRIPTOR));
if (Configuration == NULL) { if (Configuration == NULL) {
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;
} }
Ptr = (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *) Configuration; AddressSpace = (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *) Configuration;
if (NumConfig == 1) { AddressSpace->Desc = ACPI_ADDRESS_SPACE_DESCRIPTOR;
Ptr->Desc = ACPI_ADDRESS_SPACE_DESCRIPTOR; AddressSpace->Len = (UINT16) (sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) - 3);
Ptr->Len = (UINT16) (sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) - 3);
Ptr->AddrRangeMin = PciIoDevice->PciBar[BarIndex].BaseAddress; AddressSpace->AddrRangeMin = PciIoDevice->PciBar[BarIndex].BaseAddress;
Ptr->AddrLen = PciIoDevice->PciBar[BarIndex].Length; AddressSpace->AddrLen = PciIoDevice->PciBar[BarIndex].Length;
Ptr->AddrRangeMax = PciIoDevice->PciBar[BarIndex].Alignment; AddressSpace->AddrRangeMax = PciIoDevice->PciBar[BarIndex].Alignment;
switch (PciIoDevice->PciBar[BarIndex].BarType) { switch (PciIoDevice->PciBar[BarIndex].BarType) {
case PciBarTypeIo16: case PciBarTypeIo16:
case PciBarTypeIo32: case PciBarTypeIo32:
// //
// Io // Io
// //
Ptr->ResType = ACPI_ADDRESS_SPACE_TYPE_IO; AddressSpace->ResType = ACPI_ADDRESS_SPACE_TYPE_IO;
break; break;
case PciBarTypeMem32: case PciBarTypeMem32:
// //
// Mem // Mem
// //
Ptr->ResType = ACPI_ADDRESS_SPACE_TYPE_MEM; AddressSpace->ResType = ACPI_ADDRESS_SPACE_TYPE_MEM;
// //
// 32 bit // 32 bit
// //
Ptr->AddrSpaceGranularity = 32; AddressSpace->AddrSpaceGranularity = 32;
break; break;
case PciBarTypePMem32: case PciBarTypePMem32:
// //
// Mem // Mem
// //
Ptr->ResType = ACPI_ADDRESS_SPACE_TYPE_MEM; AddressSpace->ResType = ACPI_ADDRESS_SPACE_TYPE_MEM;
// //
// prefechable // prefechable
// //
Ptr->SpecificFlag = 0x6; AddressSpace->SpecificFlag = 0x6;
// //
// 32 bit // 32 bit
// //
Ptr->AddrSpaceGranularity = 32; AddressSpace->AddrSpaceGranularity = 32;
break; break;
case PciBarTypeMem64: case PciBarTypeMem64:
// //
// Mem // Mem
// //
Ptr->ResType = ACPI_ADDRESS_SPACE_TYPE_MEM; AddressSpace->ResType = ACPI_ADDRESS_SPACE_TYPE_MEM;
// //
// 64 bit // 64 bit
// //
Ptr->AddrSpaceGranularity = 64; AddressSpace->AddrSpaceGranularity = 64;
break; break;
case PciBarTypePMem64: case PciBarTypePMem64:
// //
// Mem // Mem
// //
Ptr->ResType = ACPI_ADDRESS_SPACE_TYPE_MEM; AddressSpace->ResType = ACPI_ADDRESS_SPACE_TYPE_MEM;
// //
// prefechable // prefechable
// //
Ptr->SpecificFlag = 0x6; AddressSpace->SpecificFlag = 0x6;
// //
// 64 bit // 64 bit
// //
Ptr->AddrSpaceGranularity = 64; AddressSpace->AddrSpaceGranularity = 64;
break; break;
default: default:
break; break;
}
Ptr = (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *) ((UINT8 *) Ptr + sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR));
} }
// //
// put the checksum // put the checksum
// //
PtrEnd = (EFI_ACPI_END_TAG_DESCRIPTOR *) ((UINT8 *) Ptr); End = (EFI_ACPI_END_TAG_DESCRIPTOR *) (AddressSpace + 1);
PtrEnd->Desc = ACPI_END_TAG_DESCRIPTOR; End->Desc = ACPI_END_TAG_DESCRIPTOR;
PtrEnd->Checksum = 0; End->Checksum = 0;
*Resources = Configuration; *Resources = Configuration;
} }
return EFI_SUCCESS; return EFI_SUCCESS;