tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-29 08:34:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg/PciBus: Count multiple hotplug resource paddings

Browse Source 
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=720

The current implementation assumes there is only one hotplug resource
padding for each resource type. It's not true considering
DegradeResource(): MEM64 resource could be degraded to MEM32
resource.

The patch treat the resource paddings using the same logic as
treating typical/actual resources and the total resource of a bridge
is set to the MAX of typical/actual resources and resource paddings.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
This commit is contained in:
Ruiyu Ni 2017-09-30 13:10:08 +08:00
parent f8f0e454e1
commit 728d74973c
1 changed files with 22 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
PCI resouces support functions implemntation for PCI Bus module. PCI resouces support functions implemntation for PCI Bus module.
Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2017, 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
@ -343,14 +343,9 @@ CalculateResourceAperture (
IN PCI_RESOURCE_NODE *Bridge IN PCI_RESOURCE_NODE *Bridge
) )
{ {
UINT64 Aperture; UINT64 Aperture[2];
LIST_ENTRY *CurrentLink; LIST_ENTRY *CurrentLink;
PCI_RESOURCE_NODE *Node; PCI_RESOURCE_NODE *Node;
UINT64 PaddingAperture;
UINT64 Offset;
Aperture = 0;
PaddingAperture = 0;
if (Bridge == NULL) { if (Bridge == NULL) {
return ; return ;
@ -362,6 +357,8 @@ CalculateResourceAperture (
return ; return ;
} }
Aperture[PciResUsageTypical] = 0;
Aperture[PciResUsagePadding] = 0;
// //
// Assume the bridge is aligned // Assume the bridge is aligned
// //
@ -369,58 +366,30 @@ CalculateResourceAperture (
; !IsNull (&Bridge->ChildList, CurrentLink) ; !IsNull (&Bridge->ChildList, CurrentLink)
; CurrentLink = GetNextNode (&Bridge->ChildList, CurrentLink) ; CurrentLink = GetNextNode (&Bridge->ChildList, CurrentLink)
) { ) {
Node = RESOURCE_NODE_FROM_LINK (CurrentLink); Node = RESOURCE_NODE_FROM_LINK (CurrentLink);
if (Node->ResourceUsage == PciResUsagePadding) {
ASSERT (PaddingAperture == 0);
PaddingAperture = Node->Length;
continue;
}
// //
// Apply padding resource if available // It's possible for a bridge to contain multiple padding resource
// nodes due to DegradeResource().
// //
Offset = Aperture & (Node->Alignment); ASSERT ((Node->ResourceUsage == PciResUsageTypical) ||
(Node->ResourceUsage == PciResUsagePadding));
if (Offset != 0) { ASSERT (Node->ResourceUsage < ARRAY_SIZE (Aperture));
Aperture = Aperture + (Node->Alignment + 1) - Offset;
}
// //
// Recode current aperture as a offset // Recode current aperture as a offset
// this offset will be used in future real allocation // Apply padding resource to meet alignment requirement
// Node offset will be used in future real allocation
// //
Node->Offset = Aperture; Node->Offset = ALIGN_VALUE (Aperture[Node->ResourceUsage], Node->Alignment + 1);
// //
// Increment aperture by the length of node // Record the total aperture.
// //
Aperture += Node->Length; Aperture[Node->ResourceUsage] = Node->Offset + Node->Length;
} }
// //
// At last, adjust the aperture with the bridge's // Adjust the bridge's alignment to the MAX (first) alignment of all children.
// alignment
//
Offset = Aperture & (Bridge->Alignment);
if (Offset != 0) {
Aperture = Aperture + (Bridge->Alignment + 1) - Offset;
}
//
// If the bridge has already padded the resource and the
// amount of padded resource is larger, then keep the
// padded resource
//
if (Bridge->Length < Aperture) {
Bridge->Length = Aperture;
}
//
// Adjust the bridge's alignment to the first child's alignment
// if the bridge has at least one child
// //
CurrentLink = Bridge->ChildList.ForwardLink; CurrentLink = Bridge->ChildList.ForwardLink;
if (CurrentLink != &Bridge->ChildList) { if (CurrentLink != &Bridge->ChildList) {
@ -430,11 +399,17 @@ CalculateResourceAperture (
} }
} }
//
// At last, adjust the aperture with the bridge's alignment
//
Aperture[PciResUsageTypical] = ALIGN_VALUE (Aperture[PciResUsageTypical], Bridge->Alignment + 1);
Aperture[PciResUsagePadding] = ALIGN_VALUE (Aperture[PciResUsagePadding], Bridge->Alignment + 1);
// //
// Hotplug controller needs padding resources. // Hotplug controller needs padding resources.
// Use the larger one between the padding resource and actual occupied resource. // Use the larger one between the padding resource and actual occupied resource.
// //
Bridge->Length = MAX (Bridge->Length, PaddingAperture); Bridge->Length = MAX (Aperture[PciResUsageTypical], Aperture[PciResUsagePadding]);
} }
/** /**