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

MdeModulePkg/PciBus: Change local variable AddressSpace to Descriptor 

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Ruiyu Ni 2016-02-15 14:53:05 +08:00
parent 1b4c244b0e
commit 4653749963
1 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
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 - 2015, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2016, 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
@ -1774,9 +1774,8 @@ PciIoGetBarAttributes (
OUT VOID **Resources OPTIONAL OUT VOID **Resources OPTIONAL
) )
{ {
UINT8 *Configuration;
PCI_IO_DEVICE *PciIoDevice; PCI_IO_DEVICE *PciIoDevice;
EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *AddressSpace; EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *Descriptor;
EFI_ACPI_END_TAG_DESCRIPTOR *End; EFI_ACPI_END_TAG_DESCRIPTOR *End;
PciIoDevice = PCI_IO_DEVICE_FROM_PCI_IO_THIS (This); PciIoDevice = PCI_IO_DEVICE_FROM_PCI_IO_THIS (This);
@ -1798,19 +1797,18 @@ PciIoGetBarAttributes (
} }
if (Resources != NULL) { if (Resources != NULL) {
Configuration = AllocateZeroPool (sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) + sizeof (EFI_ACPI_END_TAG_DESCRIPTOR)); Descriptor = AllocateZeroPool (sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) + sizeof (EFI_ACPI_END_TAG_DESCRIPTOR));
if (Configuration == NULL) { if (Descriptor == NULL) {
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;
} }
AddressSpace = (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *) Configuration; *Resources = Descriptor;
AddressSpace->Desc = ACPI_ADDRESS_SPACE_DESCRIPTOR; Descriptor->Desc = ACPI_ADDRESS_SPACE_DESCRIPTOR;
AddressSpace->Len = (UINT16) (sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) - 3); Descriptor->Len = (UINT16) (sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) - 3);
Descriptor->AddrRangeMin = PciIoDevice->PciBar[BarIndex].BaseAddress;
AddressSpace->AddrRangeMin = PciIoDevice->PciBar[BarIndex].BaseAddress; Descriptor->AddrLen = PciIoDevice->PciBar[BarIndex].Length;
AddressSpace->AddrLen = PciIoDevice->PciBar[BarIndex].Length; Descriptor->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:
@ -1818,59 +1816,59 @@ PciIoGetBarAttributes (
// //
// Io // Io
// //
AddressSpace->ResType = ACPI_ADDRESS_SPACE_TYPE_IO; Descriptor->ResType = ACPI_ADDRESS_SPACE_TYPE_IO;
break; break;
case PciBarTypeMem32: case PciBarTypeMem32:
// //
// Mem // Mem
// //
AddressSpace->ResType = ACPI_ADDRESS_SPACE_TYPE_MEM; Descriptor->ResType = ACPI_ADDRESS_SPACE_TYPE_MEM;
// //
// 32 bit // 32 bit
// //
AddressSpace->AddrSpaceGranularity = 32; Descriptor->AddrSpaceGranularity = 32;
break; break;
case PciBarTypePMem32: case PciBarTypePMem32:
// //
// Mem // Mem
// //
AddressSpace->ResType = ACPI_ADDRESS_SPACE_TYPE_MEM; Descriptor->ResType = ACPI_ADDRESS_SPACE_TYPE_MEM;
// //
// prefechable // prefechable
// //
AddressSpace->SpecificFlag = 0x6; Descriptor->SpecificFlag = 0x6;
// //
// 32 bit // 32 bit
// //
AddressSpace->AddrSpaceGranularity = 32; Descriptor->AddrSpaceGranularity = 32;
break; break;
case PciBarTypeMem64: case PciBarTypeMem64:
// //
// Mem // Mem
// //
AddressSpace->ResType = ACPI_ADDRESS_SPACE_TYPE_MEM; Descriptor->ResType = ACPI_ADDRESS_SPACE_TYPE_MEM;
// //
// 64 bit // 64 bit
// //
AddressSpace->AddrSpaceGranularity = 64; Descriptor->AddrSpaceGranularity = 64;
break; break;
case PciBarTypePMem64: case PciBarTypePMem64:
// //
// Mem // Mem
// //
AddressSpace->ResType = ACPI_ADDRESS_SPACE_TYPE_MEM; Descriptor->ResType = ACPI_ADDRESS_SPACE_TYPE_MEM;
// //
// prefechable // prefechable
// //
AddressSpace->SpecificFlag = 0x6; Descriptor->SpecificFlag = 0x6;
// //
// 64 bit // 64 bit
// //
AddressSpace->AddrSpaceGranularity = 64; Descriptor->AddrSpaceGranularity = 64;
break; break;
default: default:
@ -1880,11 +1878,9 @@ PciIoGetBarAttributes (
// //
// put the checksum // put the checksum
// //
End = (EFI_ACPI_END_TAG_DESCRIPTOR *) (AddressSpace + 1); End = (EFI_ACPI_END_TAG_DESCRIPTOR *) (Descriptor + 1);
End->Desc = ACPI_END_TAG_DESCRIPTOR; End->Desc = ACPI_END_TAG_DESCRIPTOR;
End->Checksum = 0; End->Checksum = 0;
*Resources = Configuration;
} }
return EFI_SUCCESS; return EFI_SUCCESS;