Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

MdeModulePkg: Fix a PCI resource dumping bug in PciBusDxe driver 

The resource dumping logic contains a bug which cannot dump the
resource for hot plug controller correctly. The patch fixes this
bug.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18718 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Ruiyu Ni 2015-11-03 02:33:41 +00:00 committed by niruiyu
parent b3800cfd10
commit f67bd32dda
3 changed files with 162 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
View File

@ -324,6 +324,81 @@ PciSearchDevice (
return EFI_SUCCESS; return EFI_SUCCESS;
} }
/**
Dump the PPB padding resource information.
@param PciIoDevice PCI IO instance.
@param ResourceType The desired resource type to dump.
PciBarTypeUnknown means to dump all types of resources.
**/
VOID
DumpPpbPaddingResource (
IN PCI_IO_DEVICE *PciIoDevice,
IN PCI_BAR_TYPE ResourceType
)
{
EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *Descriptor;
PCI_BAR_TYPE Type;
if (PciIoDevice->ResourcePaddingDescriptors == NULL) {
return;
}
if (ResourceType == PciBarTypeIo16 || ResourceType == PciBarTypeIo32) {
ResourceType = PciBarTypeIo;
}
for (Descriptor = PciIoDevice->ResourcePaddingDescriptors; Descriptor->Desc != ACPI_END_TAG_DESCRIPTOR; Descriptor++) {
Type = PciBarTypeUnknown;
if (Descriptor->Desc == ACPI_ADDRESS_SPACE_DESCRIPTOR && Descriptor->ResType == ACPI_ADDRESS_SPACE_TYPE_IO) {
Type = PciBarTypeIo;
} else if (Descriptor->Desc == ACPI_ADDRESS_SPACE_DESCRIPTOR && Descriptor->ResType == ACPI_ADDRESS_SPACE_TYPE_MEM) {
if (Descriptor->AddrSpaceGranularity == 32) {
//
// prefechable
//
if (Descriptor->SpecificFlag == EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_CACHEABLE_PREFETCHABLE) {
Type = PciBarTypePMem32;
}
//
// Non-prefechable
//
if (Descriptor->SpecificFlag == 0) {
Type = PciBarTypeMem32;
}
}
if (Descriptor->AddrSpaceGranularity == 64) {
//
// prefechable
//
if (Descriptor->SpecificFlag == EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_CACHEABLE_PREFETCHABLE) {
Type = PciBarTypePMem64;
}
//
// Non-prefechable
//
if (Descriptor->SpecificFlag == 0) {
Type = PciBarTypeMem64;
}
}
}
if ((Type != PciBarTypeUnknown) && ((ResourceType == PciBarTypeUnknown) || (ResourceType == Type))) {
DEBUG ((
EFI_D_INFO,
" Padding: Type = %s; Alignment = 0x%lx;\tLength = 0x%lx\n",
mBarTypeStr[Type], Descriptor->AddrRangeMax, Descriptor->AddrLen
));
}
}
}
/** /**
Dump the PCI BAR information. Dump the PCI BAR information.
@ -586,7 +661,10 @@ GatherPpbInfo (
GetResourcePaddingPpb (PciIoDevice); GetResourcePaddingPpb (PciIoDevice);
DEBUG_CODE (DumpPciBars (PciIoDevice);); DEBUG_CODE (
DumpPpbPaddingResource (PciIoDevice, PciBarTypeUnknown);
DumpPciBars (PciIoDevice);
);
return PciIoDevice; return PciIoDevice;
} }

15
MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.h
View File

@ -1,7 +1,7 @@
/** @file /** @file
PCI emumeration support functions declaration for PCI Bus module. PCI emumeration support functions declaration for PCI Bus module.
Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2015, 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
@ -460,4 +460,17 @@ ResetAllPpbBusNumber (
IN UINT8 StartBusNumber IN UINT8 StartBusNumber
); );
/**
Dump the PPB padding resource information.
@param PciIoDevice PCI IO instance.
@param ResourceType The desired resource type to dump.
PciBarTypeUnknown means to dump all types of resources.
**/
VOID
DumpPpbPaddingResource (
IN PCI_IO_DEVICE *PciIoDevice,
IN PCI_BAR_TYPE ResourceType
);
#endif #endif

146
MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
Internal library implementation for PCI Bus module. Internal library implementation for PCI Bus module.
Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
(C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR> (C) Copyright 2015 Hewlett Packard Enterprise Development LP<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
@ -188,19 +188,21 @@ DumpBridgeResource (
BridgeResource->PciDev->PciBar[BridgeResource->Bar].BaseAddress, BridgeResource->PciDev->PciBar[BridgeResource->Bar].BaseAddress,
BridgeResource->Length, BridgeResource->Alignment BridgeResource->Length, BridgeResource->Alignment
)); ));
for ( Link = BridgeResource->ChildList.ForwardLink for ( Link = GetFirstNode (&BridgeResource->ChildList)
; Link != &BridgeResource->ChildList ; !IsNull (&BridgeResource->ChildList, Link)
; Link = Link->ForwardLink ; Link = GetNextNode (&BridgeResource->ChildList, Link)
) { ) {
Resource = RESOURCE_NODE_FROM_LINK (Link); Resource = RESOURCE_NODE_FROM_LINK (Link);
if (Resource->ResourceUsage == PciResUsageTypical) { if (Resource->ResourceUsage == PciResUsageTypical) {
Bar = Resource->Virtual ? Resource->PciDev->VfPciBar : Resource->PciDev->PciBar; Bar = Resource->Virtual ? Resource->PciDev->VfPciBar : Resource->PciDev->PciBar;
DEBUG (( DEBUG ((
EFI_D_INFO, " Base = 0x%lx;\tLength = 0x%lx;\tAlignment = 0x%lx;\tOwner = %s ", EFI_D_INFO, " Base = 0x%lx;\tLength = 0x%lx;\tAlignment = 0x%lx;\tOwner = %s [%02x|%02x|%02x:",
Bar[Resource->Bar].BaseAddress, Resource->Length, Resource->Alignment, Bar[Resource->Bar].BaseAddress, Resource->Length, Resource->Alignment,
IS_PCI_BRIDGE (&Resource->PciDev->Pci) ? L"PPB" : IS_PCI_BRIDGE (&Resource->PciDev->Pci) ? L"PPB" :
IS_CARDBUS_BRIDGE (&Resource->PciDev->Pci) ? L"P2C" : IS_CARDBUS_BRIDGE (&Resource->PciDev->Pci) ? L"P2C" :
L"PCI" L"PCI",
Resource->PciDev->BusNumber, Resource->PciDev->DeviceNumber,
Resource->PciDev->FunctionNumber
)); ));
if ((!IS_PCI_BRIDGE (&Resource->PciDev->Pci) && !IS_CARDBUS_BRIDGE (&Resource->PciDev->Pci)) || if ((!IS_PCI_BRIDGE (&Resource->PciDev->Pci) && !IS_CARDBUS_BRIDGE (&Resource->PciDev->Pci)) ||
@ -210,24 +212,20 @@ DumpBridgeResource (
// //
// The resource requirement comes from the device itself. // The resource requirement comes from the device itself.
// //
DEBUG (( DEBUG ((EFI_D_INFO, "%02x]", Bar[Resource->Bar].Offset));
EFI_D_INFO, " [%02x|%02x|%02x:%02x]\n",
Resource->PciDev->BusNumber, Resource->PciDev->DeviceNumber,
Resource->PciDev->FunctionNumber, Bar[Resource->Bar].Offset
));
} else { } else {
// //
// The resource requirement comes from the subordinate devices. // The resource requirement comes from the subordinate devices.
// //
DEBUG (( DEBUG ((EFI_D_INFO, "**]"));
EFI_D_INFO, " [%02x|%02x|%02x:**]\n",
Resource->PciDev->BusNumber, Resource->PciDev->DeviceNumber,
Resource->PciDev->FunctionNumber
));
} }
} else { } else {
DEBUG ((EFI_D_INFO, " Padding:Length = 0x%lx;\tAlignment = 0x%lx\n", Resource->Length, Resource->Alignment)); DEBUG ((EFI_D_INFO, " Base = Padding;\tLength = 0x%lx;\tAlignment = 0x%lx", Resource->Length, Resource->Alignment));
} }
if (BridgeResource->ResType != Resource->ResType) {
DEBUG ((EFI_D_INFO, "; Type = %s", mBarTypeStr[MIN (Resource->ResType, PciBarTypeMaxType)]));
}
DEBUG ((EFI_D_INFO, "\n"));
} }
} }
} }
@ -235,63 +233,61 @@ DumpBridgeResource (
/** /**
Find the corresponding resource node for the Device in child list of BridgeResource. Find the corresponding resource node for the Device in child list of BridgeResource.
@param[in] Device Pointer to PCI_IO_DEVICE. @param[in] Device Pointer to PCI_IO_DEVICE.
@param[in] BridgeResource Pointer to PCI_RESOURCE_NODE. @param[in] BridgeResource Pointer to PCI_RESOURCE_NODE.
@param[out] DeviceResources Pointer to a buffer to receive resources for the Device.
@return !NULL The corresponding resource node for the Device. @return Count of the resource descriptors returned.
@return NULL No corresponding resource node for the Device.
**/ **/
PCI_RESOURCE_NODE * UINTN
FindResourceNode ( FindResourceNode (
IN PCI_IO_DEVICE *Device, IN PCI_IO_DEVICE *Device,
IN PCI_RESOURCE_NODE *BridgeResource IN PCI_RESOURCE_NODE *BridgeResource,
OUT PCI_RESOURCE_NODE **DeviceResources OPTIONAL
) )
{ {
LIST_ENTRY *Link; LIST_ENTRY *Link;
PCI_RESOURCE_NODE *Resource; PCI_RESOURCE_NODE *Resource;
UINTN Count;
Count = 0;
for ( Link = BridgeResource->ChildList.ForwardLink for ( Link = BridgeResource->ChildList.ForwardLink
; Link != &BridgeResource->ChildList ; Link != &BridgeResource->ChildList
; Link = Link->ForwardLink ; Link = Link->ForwardLink
) { ) {
Resource = RESOURCE_NODE_FROM_LINK (Link); Resource = RESOURCE_NODE_FROM_LINK (Link);
if (Resource->PciDev == Device) { if (Resource->PciDev == Device) {
return Resource; if (DeviceResources != NULL) {
DeviceResources[Count] = Resource;
}
Count++;
} }
} }
return NULL; return Count;
} }
/** /**
Dump the resource map of all the devices under Bridge. Dump the resource map of all the devices under Bridge.
@param[in] Bridge Bridge device instance. @param[in] Bridge Bridge device instance.
@param[in] IoNode IO resource descriptor for the bridge device. @param[in] Resources Resource descriptors for the bridge device.
@param[in] Mem32Node Mem32 resource descriptor for the bridge device. @param[in] ResourceCount Count of resource descriptors.
@param[in] PMem32Node PMem32 resource descriptor for the bridge device.
@param[in] Mem64Node Mem64 resource descriptor for the bridge device.
@param[in] PMem64Node PMem64 resource descriptor for the bridge device.
**/ **/
VOID VOID
DumpResourceMap ( DumpResourceMap (
IN PCI_IO_DEVICE *Bridge, IN PCI_IO_DEVICE *Bridge,
IN PCI_RESOURCE_NODE *IoNode, IN PCI_RESOURCE_NODE **Resources,
IN PCI_RESOURCE_NODE *Mem32Node, IN UINTN ResourceCount
IN PCI_RESOURCE_NODE *PMem32Node,
IN PCI_RESOURCE_NODE *Mem64Node,
IN PCI_RESOURCE_NODE *PMem64Node
) )
{ {
EFI_STATUS Status; EFI_STATUS Status;
LIST_ENTRY *Link; LIST_ENTRY *Link;
PCI_IO_DEVICE *Device; PCI_IO_DEVICE *Device;
PCI_RESOURCE_NODE *ChildIoNode; UINTN Index;
PCI_RESOURCE_NODE *ChildMem32Node; CHAR16 *Str;
PCI_RESOURCE_NODE *ChildPMem32Node; PCI_RESOURCE_NODE **ChildResources;
PCI_RESOURCE_NODE *ChildMem64Node; UINTN ChildResourceCount;
PCI_RESOURCE_NODE *ChildPMem64Node;
CHAR16 *Str;
DEBUG ((EFI_D_INFO, "PciBus: Resource Map for ")); DEBUG ((EFI_D_INFO, "PciBus: Resource Map for "));
@ -320,11 +316,9 @@ DumpResourceMap (
} }
} }
DumpBridgeResource (IoNode); for (Index = 0; Index < ResourceCount; Index++) {
DumpBridgeResource (Mem32Node); DumpBridgeResource (Resources[Index]);
DumpBridgeResource (PMem32Node); }
DumpBridgeResource (Mem64Node);
DumpBridgeResource (PMem64Node);
DEBUG ((EFI_D_INFO, "\n")); DEBUG ((EFI_D_INFO, "\n"));
for ( Link = Bridge->ChildList.ForwardLink for ( Link = Bridge->ChildList.ForwardLink
@ -334,20 +328,19 @@ DumpResourceMap (
Device = PCI_IO_DEVICE_FROM_LINK (Link); Device = PCI_IO_DEVICE_FROM_LINK (Link);
if (IS_PCI_BRIDGE (&Device->Pci)) { if (IS_PCI_BRIDGE (&Device->Pci)) {
ChildIoNode = (IoNode == NULL ? NULL : FindResourceNode (Device, IoNode)); ChildResourceCount = 0;
ChildMem32Node = (Mem32Node == NULL ? NULL : FindResourceNode (Device, Mem32Node)); for (Index = 0; Index < ResourceCount; Index++) {
ChildPMem32Node = (PMem32Node == NULL ? NULL : FindResourceNode (Device, PMem32Node)); ChildResourceCount += FindResourceNode (Device, Resources[Index], NULL);
ChildMem64Node = (Mem64Node == NULL ? NULL : FindResourceNode (Device, Mem64Node)); }
ChildPMem64Node = (PMem64Node == NULL ? NULL : FindResourceNode (Device, PMem64Node)); ChildResources = AllocatePool (sizeof (PCI_RESOURCE_NODE *) * ChildResourceCount);
ASSERT (ChildResources != NULL);
ChildResourceCount = 0;
for (Index = 0; Index < ResourceCount; Index++) {
ChildResourceCount += FindResourceNode (Device, Resources[Index], &ChildResources[ChildResourceCount]);
}
DumpResourceMap ( DumpResourceMap (Device, ChildResources, ChildResourceCount);
Device, FreePool (ChildResources);
ChildIoNode,
ChildMem32Node,
ChildPMem32Node,
ChildMem64Node,
ChildPMem64Node
);
} }
} }
} }
@ -807,11 +800,11 @@ PciHostBridgeResourceAllocator (
// Create the entire system resource map from the information collected by // Create the entire system resource map from the information collected by
// enumerator. Several resource tree was created // enumerator. Several resource tree was created
// //
IoBridge = FindResourceNode (RootBridgeDev, &IoPool); FindResourceNode (RootBridgeDev, &IoPool, &IoBridge);
Mem32Bridge = FindResourceNode (RootBridgeDev, &Mem32Pool); FindResourceNode (RootBridgeDev, &Mem32Pool, &Mem32Bridge);
PMem32Bridge = FindResourceNode (RootBridgeDev, &PMem32Pool); FindResourceNode (RootBridgeDev, &PMem32Pool, &PMem32Bridge);
Mem64Bridge = FindResourceNode (RootBridgeDev, &Mem64Pool); FindResourceNode (RootBridgeDev, &Mem64Pool, &Mem64Bridge);
PMem64Bridge = FindResourceNode (RootBridgeDev, &PMem64Pool); FindResourceNode (RootBridgeDev, &PMem64Pool, &PMem64Bridge);
ASSERT (IoBridge != NULL); ASSERT (IoBridge != NULL);
ASSERT (Mem32Bridge != NULL); ASSERT (Mem32Bridge != NULL);
@ -869,14 +862,13 @@ PciHostBridgeResourceAllocator (
// Dump the resource map for current root bridge // Dump the resource map for current root bridge
// //
DEBUG_CODE ( DEBUG_CODE (
DumpResourceMap ( PCI_RESOURCE_NODE *Resources[5];
RootBridgeDev, Resources[0] = IoBridge;
IoBridge, Resources[1] = Mem32Bridge;
Mem32Bridge, Resources[2] = PMem32Bridge;
PMem32Bridge, Resources[3] = Mem64Bridge;
Mem64Bridge, Resources[4] = PMem64Bridge;
PMem64Bridge DumpResourceMap (RootBridgeDev, Resources, sizeof (Resources) / sizeof (Resources[0]));
);
); );
FreePool (AcpiConfig); FreePool (AcpiConfig);