X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdeModulePkg%2FBus%2FPci%2FPciBusDxe%2FPciLib.c;h=dc1086606f1808af35a9f7d284211a750c289315;hb=cbbccf3cf39247456746949dfaa00ff4bbc6826f;hp=b3d91a8d3037ee43f85f060211d78a3d27567c9e;hpb=863986b3c8e67736d361b68e293d01e6f92f825c;p=mirror_edk2.git
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.c
index b3d91a8d30..dc1086606f 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.c
@@ -1,7 +1,8 @@
/** @file
Internal library implementation for PCI Bus module.
-Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+(C) Copyright 2015 Hewlett Packard Enterprise Development LP
This program and the accompanying materials
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
@@ -187,19 +188,21 @@ DumpBridgeResource (
BridgeResource->PciDev->PciBar[BridgeResource->Bar].BaseAddress,
BridgeResource->Length, BridgeResource->Alignment
));
- for ( Link = BridgeResource->ChildList.ForwardLink
- ; Link != &BridgeResource->ChildList
- ; Link = Link->ForwardLink
+ for ( Link = GetFirstNode (&BridgeResource->ChildList)
+ ; !IsNull (&BridgeResource->ChildList, Link)
+ ; Link = GetNextNode (&BridgeResource->ChildList, Link)
) {
Resource = RESOURCE_NODE_FROM_LINK (Link);
if (Resource->ResourceUsage == PciResUsageTypical) {
Bar = Resource->Virtual ? Resource->PciDev->VfPciBar : Resource->PciDev->PciBar;
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,
IS_PCI_BRIDGE (&Resource->PciDev->Pci) ? L"PPB" :
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)) ||
@@ -209,24 +212,20 @@ DumpBridgeResource (
//
// The resource requirement comes from the device itself.
//
- DEBUG ((
- EFI_D_INFO, " [%02x|%02x|%02x:%02x]\n",
- Resource->PciDev->BusNumber, Resource->PciDev->DeviceNumber,
- Resource->PciDev->FunctionNumber, Bar[Resource->Bar].Offset
- ));
+ DEBUG ((EFI_D_INFO, "%02x]", Bar[Resource->Bar].Offset));
} else {
//
// The resource requirement comes from the subordinate devices.
//
- DEBUG ((
- EFI_D_INFO, " [%02x|%02x|%02x:**]\n",
- Resource->PciDev->BusNumber, Resource->PciDev->DeviceNumber,
- Resource->PciDev->FunctionNumber
- ));
+ DEBUG ((EFI_D_INFO, "**]"));
}
} 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"));
}
}
}
@@ -234,63 +233,61 @@ DumpBridgeResource (
/**
Find the corresponding resource node for the Device in child list of BridgeResource.
- @param[in] Device Pointer to PCI_IO_DEVICE.
- @param[in] BridgeResource Pointer to PCI_RESOURCE_NODE.
+ @param[in] Device Pointer to PCI_IO_DEVICE.
+ @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 NULL No corresponding resource node for the Device.
+ @return Count of the resource descriptors returned.
**/
-PCI_RESOURCE_NODE *
+UINTN
FindResourceNode (
- IN PCI_IO_DEVICE *Device,
- IN PCI_RESOURCE_NODE *BridgeResource
+ IN PCI_IO_DEVICE *Device,
+ IN PCI_RESOURCE_NODE *BridgeResource,
+ OUT PCI_RESOURCE_NODE **DeviceResources OPTIONAL
)
{
LIST_ENTRY *Link;
PCI_RESOURCE_NODE *Resource;
+ UINTN Count;
+ Count = 0;
for ( Link = BridgeResource->ChildList.ForwardLink
; Link != &BridgeResource->ChildList
; Link = Link->ForwardLink
) {
Resource = RESOURCE_NODE_FROM_LINK (Link);
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.
- @param[in] Bridge Bridge device instance.
- @param[in] IoNode IO resource descriptor for the bridge device.
- @param[in] Mem32Node Mem32 resource descriptor for the bridge device.
- @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.
+ @param[in] Bridge Bridge device instance.
+ @param[in] Resources Resource descriptors for the bridge device.
+ @param[in] ResourceCount Count of resource descriptors.
**/
VOID
DumpResourceMap (
IN PCI_IO_DEVICE *Bridge,
- IN PCI_RESOURCE_NODE *IoNode,
- IN PCI_RESOURCE_NODE *Mem32Node,
- IN PCI_RESOURCE_NODE *PMem32Node,
- IN PCI_RESOURCE_NODE *Mem64Node,
- IN PCI_RESOURCE_NODE *PMem64Node
+ IN PCI_RESOURCE_NODE **Resources,
+ IN UINTN ResourceCount
)
{
- EFI_STATUS Status;
- LIST_ENTRY *Link;
- PCI_IO_DEVICE *Device;
- PCI_RESOURCE_NODE *ChildIoNode;
- PCI_RESOURCE_NODE *ChildMem32Node;
- PCI_RESOURCE_NODE *ChildPMem32Node;
- PCI_RESOURCE_NODE *ChildMem64Node;
- PCI_RESOURCE_NODE *ChildPMem64Node;
- CHAR16 *Str;
+ EFI_STATUS Status;
+ LIST_ENTRY *Link;
+ PCI_IO_DEVICE *Device;
+ UINTN Index;
+ CHAR16 *Str;
+ PCI_RESOURCE_NODE **ChildResources;
+ UINTN ChildResourceCount;
DEBUG ((EFI_D_INFO, "PciBus: Resource Map for "));
@@ -319,11 +316,9 @@ DumpResourceMap (
}
}
- DumpBridgeResource (IoNode);
- DumpBridgeResource (Mem32Node);
- DumpBridgeResource (PMem32Node);
- DumpBridgeResource (Mem64Node);
- DumpBridgeResource (PMem64Node);
+ for (Index = 0; Index < ResourceCount; Index++) {
+ DumpBridgeResource (Resources[Index]);
+ }
DEBUG ((EFI_D_INFO, "\n"));
for ( Link = Bridge->ChildList.ForwardLink
@@ -333,20 +328,19 @@ DumpResourceMap (
Device = PCI_IO_DEVICE_FROM_LINK (Link);
if (IS_PCI_BRIDGE (&Device->Pci)) {
- ChildIoNode = (IoNode == NULL ? NULL : FindResourceNode (Device, IoNode));
- ChildMem32Node = (Mem32Node == NULL ? NULL : FindResourceNode (Device, Mem32Node));
- ChildPMem32Node = (PMem32Node == NULL ? NULL : FindResourceNode (Device, PMem32Node));
- ChildMem64Node = (Mem64Node == NULL ? NULL : FindResourceNode (Device, Mem64Node));
- ChildPMem64Node = (PMem64Node == NULL ? NULL : FindResourceNode (Device, PMem64Node));
-
- DumpResourceMap (
- Device,
- ChildIoNode,
- ChildMem32Node,
- ChildPMem32Node,
- ChildMem64Node,
- ChildPMem64Node
- );
+ ChildResourceCount = 0;
+ for (Index = 0; Index < ResourceCount; Index++) {
+ ChildResourceCount += FindResourceNode (Device, Resources[Index], NULL);
+ }
+ 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 (Device, ChildResources, ChildResourceCount);
+ FreePool (ChildResources);
}
}
}
@@ -435,7 +429,7 @@ PciHostBridgeResourceAllocator (
//
//
- // If non-stardard PCI Bridge I/O window alignment is supported,
+ // If non-standard PCI Bridge I/O window alignment is supported,
// set I/O aligment to minimum possible alignment for root bridge.
//
IoBridge = CreateResourceNode (
@@ -528,7 +522,7 @@ PciHostBridgeResourceAllocator (
}
//
- // Based on the all the resource tree, contruct ACPI resource node to
+ // Based on the all the resource tree, construct ACPI resource node to
// submit the resource aperture to pci host bridge protocol
//
Status = ConstructAcpiResourceRequestor (
@@ -806,11 +800,11 @@ PciHostBridgeResourceAllocator (
// Create the entire system resource map from the information collected by
// enumerator. Several resource tree was created
//
- IoBridge = FindResourceNode (RootBridgeDev, &IoPool);
- Mem32Bridge = FindResourceNode (RootBridgeDev, &Mem32Pool);
- PMem32Bridge = FindResourceNode (RootBridgeDev, &PMem32Pool);
- Mem64Bridge = FindResourceNode (RootBridgeDev, &Mem64Pool);
- PMem64Bridge = FindResourceNode (RootBridgeDev, &PMem64Pool);
+ FindResourceNode (RootBridgeDev, &IoPool, &IoBridge);
+ FindResourceNode (RootBridgeDev, &Mem32Pool, &Mem32Bridge);
+ FindResourceNode (RootBridgeDev, &PMem32Pool, &PMem32Bridge);
+ FindResourceNode (RootBridgeDev, &Mem64Pool, &Mem64Bridge);
+ FindResourceNode (RootBridgeDev, &PMem64Pool, &PMem64Bridge);
ASSERT (IoBridge != NULL);
ASSERT (Mem32Bridge != NULL);
@@ -868,14 +862,13 @@ PciHostBridgeResourceAllocator (
// Dump the resource map for current root bridge
//
DEBUG_CODE (
- DumpResourceMap (
- RootBridgeDev,
- IoBridge,
- Mem32Bridge,
- PMem32Bridge,
- Mem64Bridge,
- PMem64Bridge
- );
+ PCI_RESOURCE_NODE *Resources[5];
+ Resources[0] = IoBridge;
+ Resources[1] = Mem32Bridge;
+ Resources[2] = PMem32Bridge;
+ Resources[3] = Mem64Bridge;
+ Resources[4] = PMem64Bridge;
+ DumpResourceMap (RootBridgeDev, Resources, ARRAY_SIZE (Resources));
);
FreePool (AcpiConfig);
@@ -983,7 +976,8 @@ PciScanBus (
UINT8 Device;
UINT8 Func;
UINT64 Address;
- UINTN SecondBus;
+ UINT8 SecondBus;
+ UINT8 PaddedSubBus;
UINT16 Register;
UINTN HpIndex;
PCI_IO_DEVICE *PciDevice;
@@ -992,6 +986,7 @@ PciScanBus (
UINT64 PciAddress;
EFI_HPC_PADDING_ATTRIBUTES Attributes;
EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *Descriptors;
+ EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *NextDescriptors;
UINT16 BusRange;
EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL *PciRootBridgeIo;
BOOLEAN BusPadding;
@@ -1022,6 +1017,13 @@ PciScanBus (
Func
);
+ if (EFI_ERROR (Status) && Func == 0) {
+ //
+ // go to next device if there is no Function 0
+ //
+ break;
+ }
+
if (EFI_ERROR (Status)) {
continue;
}
@@ -1123,14 +1125,14 @@ PciScanBus (
BusPadding = FALSE;
if (gPciHotPlugInit != NULL) {
- if (IsRootPciHotPlugBus (PciDevice->DevicePath, &HpIndex)) {
+ if (IsPciHotPlugBus (PciDevice)) {
//
// If it is initialized, get the padded bus range
//
Status = gPciHotPlugInit->GetResourcePadding (
gPciHotPlugInit,
- gPciRootHpcPool[HpIndex].HpbDevicePath,
+ PciDevice->DevicePath,
PciAddress,
&State,
(VOID **) &Descriptors,
@@ -1142,8 +1144,9 @@ PciScanBus (
}
BusRange = 0;
+ NextDescriptors = Descriptors;
Status = PciGetBusRange (
- &Descriptors,
+ &NextDescriptors,
NULL,
NULL,
&BusRange
@@ -1151,11 +1154,20 @@ PciScanBus (
FreePool (Descriptors);
- if (EFI_ERROR (Status)) {
- return Status;
- }
+ switch (Status) {
+ case EFI_SUCCESS:
+ BusPadding = TRUE;
+ break;
+
+ case EFI_NOT_FOUND:
+ //
+ // no bus number padding requested
+ //
+ break;
- BusPadding = TRUE;
+ default:
+ return Status;
+ }
}
}
}
@@ -1210,7 +1222,7 @@ PciScanBus (
Status = PciScanBus (
PciDevice,
- (UINT8) (SecondBus),
+ SecondBus,
SubBusNumber,
PaddedBusRange
);
@@ -1226,12 +1238,16 @@ PciScanBus (
if ((Attributes == EfiPaddingPciRootBridge) &&
(State & EFI_HPC_STATE_ENABLED) != 0 &&
(State & EFI_HPC_STATE_INITIALIZED) != 0) {
- *PaddedBusRange = (UINT8) ((UINT8) (BusRange) +*PaddedBusRange);
+ *PaddedBusRange = (UINT8) ((UINT8) (BusRange) + *PaddedBusRange);
} else {
- Status = PciAllocateBusNumber (PciDevice, *SubBusNumber, (UINT8) (BusRange), SubBusNumber);
+ //
+ // Reserve the larger one between the actual occupied bus number and padded bus number
+ //
+ Status = PciAllocateBusNumber (PciDevice, SecondBus, (UINT8) (BusRange), &PaddedSubBus);
if (EFI_ERROR (Status)) {
return Status;
}
+ *SubBusNumber = MAX (PaddedSubBus, *SubBusNumber);
}
}