From nobody Mon Apr 29 15:36:21 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1506748237832617.633322776086; Fri, 29 Sep 2017 22:10:37 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id D6E3121E1B74F; Fri, 29 Sep 2017 22:07:19 -0700 (PDT) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id B4DD22095E52D for ; Fri, 29 Sep 2017 22:07:18 -0700 (PDT) Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga105.jf.intel.com with ESMTP; 29 Sep 2017 22:10:34 -0700 Received: from ray-dev.ccr.corp.intel.com ([10.239.9.7]) by orsmga005.jf.intel.com with ESMTP; 29 Sep 2017 22:10:33 -0700 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.100; helo=mga07.intel.com; envelope-from=ruiyu.ni@intel.com; receiver=edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,456,1500966000"; d="scan'208";a="155053601" From: Ruiyu Ni To: edk2-devel@lists.01.org Date: Sat, 30 Sep 2017 13:10:30 +0800 Message-Id: <20170930051030.200300-1-ruiyu.ni@intel.com> X-Mailer: git-send-email 2.12.2.windows.2 Subject: [edk2] [PATCH] MdeModulePkg/PciBus: Count multiple hotplug resource paddings X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laszlo Ersek MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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 Cc: Laszlo Ersek Reviewed-by: Star Zeng Tested-by: Laszlo Ersek --- .../Bus/Pci/PciBusDxe/PciResourceSupport.c | 67 +++++++-----------= ---- 1 file changed, 21 insertions(+), 46 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c b/MdeModul= ePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c index e93134613b..f086b1732d 100644 --- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c +++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c @@ -343,14 +343,9 @@ CalculateResourceAperture ( IN PCI_RESOURCE_NODE *Bridge ) { - UINT64 Aperture; + UINT64 Aperture[2]; LIST_ENTRY *CurrentLink; PCI_RESOURCE_NODE *Node; - UINT64 PaddingAperture; - UINT64 Offset; - - Aperture =3D 0; - PaddingAperture =3D 0; =20 if (Bridge =3D=3D NULL) { return ; @@ -362,6 +357,8 @@ CalculateResourceAperture ( return ; } =20 + Aperture[PciResUsageTypical] =3D 0; + Aperture[PciResUsagePadding] =3D 0; // // Assume the bridge is aligned // @@ -369,58 +366,30 @@ CalculateResourceAperture ( ; !IsNull (&Bridge->ChildList, CurrentLink) ; CurrentLink =3D GetNextNode (&Bridge->ChildList, CurrentLink) ) { - Node =3D RESOURCE_NODE_FROM_LINK (CurrentLink); - if (Node->ResourceUsage =3D=3D PciResUsagePadding) { - ASSERT (PaddingAperture =3D=3D 0); - PaddingAperture =3D Node->Length; - continue; - } =20 // - // Apply padding resource if available + // It's possible for a bridge to contain multiple padding resource + // nodes due to DegradeResource(). // - Offset =3D Aperture & (Node->Alignment); - - if (Offset !=3D 0) { - - Aperture =3D Aperture + (Node->Alignment + 1) - Offset; - - } - + ASSERT ((Node->ResourceUsage =3D=3D PciResUsageTypical) || + (Node->ResourceUsage =3D=3D PciResUsagePadding)); + ASSERT (Node->ResourceUsage < ARRAY_SIZE (Aperture)); // // 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 =3D Aperture; + Node->Offset =3D ALIGN_VALUE (Aperture[Node->ResourceUsage], Node->Ali= gnment + 1); =20 // - // Increment aperture by the length of node + // Record the total aperture. // - Aperture +=3D Node->Length; - } - - // - // At last, adjust the aperture with the bridge's - // alignment - // - Offset =3D Aperture & (Bridge->Alignment); - if (Offset !=3D 0) { - Aperture =3D Aperture + (Bridge->Alignment + 1) - Offset; + Aperture[Node->ResourceUsage] =3D Node->Offset + Node->Length; } =20 // - // 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 =3D Aperture; - } - - // - // Adjust the bridge's alignment to the first child's alignment - // if the bridge has at least one child + // Adjust the bridge's alignment to the MAX (first) alignment of all chi= ldren. // CurrentLink =3D Bridge->ChildList.ForwardLink; if (CurrentLink !=3D &Bridge->ChildList) { @@ -431,10 +400,16 @@ CalculateResourceAperture ( } =20 // + // At last, adjust the aperture with the bridge's alignment + // + Aperture[PciResUsageTypical] =3D ALIGN_VALUE (Aperture[PciResUsageTypica= l], Bridge->Alignment + 1); + Aperture[PciResUsagePadding] =3D ALIGN_VALUE (Aperture[PciResUsagePaddin= g], Bridge->Alignment + 1); + + // // Hotplug controller needs padding resources. // Use the larger one between the padding resource and actual occupied r= esource. // - Bridge->Length =3D MAX (Bridge->Length, PaddingAperture); + Bridge->Length =3D MAX (Aperture[PciResUsageTypical], Aperture[PciResUsa= gePadding]); } =20 /** --=20 2.12.2.windows.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel