Revision: 18822
http://sourceforge.net/p/edk2/code/18822
Author: vanjeff
Date: 2015-11-16 08:20:17 +0000 (Mon, 16 Nov 2015)
Log Message:
-----------
MdeModulePkg: Fix a PciBusDxe hot plug bug
For a hot plug bridge with device attached, PciBusDxe driver reserves
the resources which equal to the total amount of padding resource
returned from HotPlug->GetResourcePadding() and the actual occupied
resource by the attached device. The behavior is incorrect.
Correct behavior is to reserve the bigger one between the padding
resource and the actual occupied resource.
(Sync patch r18719 from main trunk.)
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <[email protected]>
Reviewed-by: Feng Tian <[email protected]>
Revision Links:
--------------
http://sourceforge.net/p/edk2/code/18719
Modified Paths:
--------------
branches/UDK2015/MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.c
branches/UDK2015/MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c
Modified: branches/UDK2015/MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.c
===================================================================
--- branches/UDK2015/MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.c 2015-11-16
08:19:27 UTC (rev 18821)
+++ branches/UDK2015/MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.c 2015-11-16
08:20:17 UTC (rev 18822)
@@ -976,7 +976,8 @@
UINT8 Device;
UINT8 Func;
UINT64 Address;
- UINTN SecondBus;
+ UINT8 SecondBus;
+ UINT8 PaddedSubBus;
UINT16 Register;
UINTN HpIndex;
PCI_IO_DEVICE *PciDevice;
@@ -1210,7 +1211,7 @@
Status = PciScanBus (
PciDevice,
- (UINT8) (SecondBus),
+ SecondBus,
SubBusNumber,
PaddedBusRange
);
@@ -1226,12 +1227,16 @@
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, StartBusNumber, (UINT8)
(BusRange), &PaddedSubBus);
if (EFI_ERROR (Status)) {
return Status;
}
+ *SubBusNumber = MAX (PaddedSubBus, *SubBusNumber);
}
}
Modified: branches/UDK2015/MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c
===================================================================
--- branches/UDK2015/MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c
2015-11-16 08:19:27 UTC (rev 18821)
+++ branches/UDK2015/MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c
2015-11-16 08:20:17 UTC (rev 18822)
@@ -1,7 +1,7 @@
/** @file
PCI resouces support functions implemntation for PCI Bus module.
-Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
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
@@ -196,6 +196,7 @@
PCI_RESOURCE_NODE *Node;
UINT64 Offset;
EFI_PCI_PLATFORM_POLICY PciPolicy;
+ UINT64 PaddingAperture;
if (!mPolicyDetermined) {
//
@@ -228,21 +229,27 @@
mPolicyDetermined = TRUE;
}
- Aperture = 0;
+ Aperture = 0;
+ PaddingAperture = 0;
if (Bridge == NULL) {
return ;
}
- CurrentLink = Bridge->ChildList.ForwardLink;
-
//
// Assume the bridge is aligned
//
- while (CurrentLink != &Bridge->ChildList) {
+ for ( CurrentLink = GetFirstNode (&Bridge->ChildList)
+ ; !IsNull (&Bridge->ChildList, CurrentLink)
+ ; CurrentLink = GetNextNode (&Bridge->ChildList, CurrentLink)
+ ) {
Node = RESOURCE_NODE_FROM_LINK (CurrentLink);
-
+ if (Node->ResourceUsage == PciResUsagePadding) {
+ ASSERT (PaddingAperture == 0);
+ PaddingAperture = Node->Length;
+ continue;
+ }
//
// Consider the aperture alignment
//
@@ -293,13 +300,10 @@
// Increment aperture by the length of node
//
Aperture += Node->Length;
-
- CurrentLink = CurrentLink->ForwardLink;
}
//
- // At last, adjust the aperture with the bridge's
- // alignment
+ // Adjust the aperture with the bridge's alignment
//
Offset = Aperture & (Bridge->Alignment);
@@ -319,6 +323,12 @@
Bridge->Alignment = Node->Alignment;
}
}
+
+ //
+ // Hotplug controller needs padding resources.
+ // Use the larger one between the padding resource and actual occupied
resource.
+ //
+ Bridge->Length = MAX (Bridge->Length, PaddingAperture);
}
/**
@@ -336,10 +346,11 @@
UINT64 Aperture;
LIST_ENTRY *CurrentLink;
PCI_RESOURCE_NODE *Node;
-
+ UINT64 PaddingAperture;
UINT64 Offset;
- Aperture = 0;
+ Aperture = 0;
+ PaddingAperture = 0;
if (Bridge == NULL) {
return ;
@@ -351,14 +362,20 @@
return ;
}
- CurrentLink = Bridge->ChildList.ForwardLink;
-
//
// Assume the bridge is aligned
//
- while (CurrentLink != &Bridge->ChildList) {
+ for ( CurrentLink = GetFirstNode (&Bridge->ChildList)
+ ; !IsNull (&Bridge->ChildList, CurrentLink)
+ ; CurrentLink = GetNextNode (&Bridge->ChildList, CurrentLink)
+ ) {
Node = RESOURCE_NODE_FROM_LINK (CurrentLink);
+ if (Node->ResourceUsage == PciResUsagePadding) {
+ ASSERT (PaddingAperture == 0);
+ PaddingAperture = Node->Length;
+ continue;
+ }
//
// Apply padding resource if available
@@ -381,11 +398,6 @@
// Increment aperture by the length of node
//
Aperture += Node->Length;
-
- //
- // Consider the aperture alignment
- //
- CurrentLink = CurrentLink->ForwardLink;
}
//
@@ -407,7 +419,7 @@
}
//
- // At last, adjust the bridge's alignment to the first child's alignment
+ // Adjust the bridge's alignment to the first child's alignment
// if the bridge has at least one child
//
CurrentLink = Bridge->ChildList.ForwardLink;
@@ -417,6 +429,12 @@
Bridge->Alignment = Node->Alignment;
}
}
+
+ //
+ // Hotplug controller needs padding resources.
+ // Use the larger one between the padding resource and actual occupied
resource.
+ //
+ Bridge->Length = MAX (Bridge->Length, PaddingAperture);
}
/**
------------------------------------------------------------------------------
Presto, an open source distributed SQL query engine for big data, initially
developed by Facebook, enables you to easily query your data on Hadoop in a
more interactive manner. Teradata is also now providing full enterprise
support for Presto. Download a free open source copy now.
http://pubads.g.doubleclick.net/gampad/clk?id=250295911&iu=/4140
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
