From nobody Sun May 5 12:17:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+82217+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+82217+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1634546571; cv=none; d=zohomail.com; s=zohoarc; b=dLkmHH05xORwbm9n/0rs4navRA4zAlJc7vg85vA8smWtwCWLBOTWRQ1dqkKewPc/8xfwGAG8wAn2l8yQrA3Ru8LAn5H2pV/8QTZs5ThK0CbCS3o2mXRhLQ5/KlOeWdfC3iaU/OcMoy+NcLdVUkERcgUfcWDawh3VMxFYX/QhFWk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634546571; h=Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:Sender:Subject:To; bh=MeRkzxAOpR6Uid0sw3/ffzAeTcP79/9Aj6MdzWU9ntA=; b=hGCxHwZ4tTapHhP82PyooGVMzYn+lYxjdjcZyom7U+t0DFAHS7bzZsuTFeu5jWYKj+KeZ7mxMowsB7NcD9YIOYPLydUp1v8naJLzg9PJFgUEhv6sPCQaAFCionQU6JS4i4fEBjmBdnHY7cG8YhFa0dE8Y/WRHk8L/LyVk9B3iEg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+82217+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1634546571572653.9787430388108; Mon, 18 Oct 2021 01:42:51 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id JBGCYY1788612xnNZudr7iyp; Mon, 18 Oct 2021 01:42:51 -0700 X-Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web08.34080.1634546570720655918 for ; Mon, 18 Oct 2021 01:42:50 -0700 X-IronPort-AV: E=McAfee;i="6200,9189,10140"; a="314397232" X-IronPort-AV: E=Sophos;i="5.85,381,1624345200"; d="scan'208";a="314397232" X-Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Oct 2021 01:42:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,381,1624345200"; d="scan'208";a="629092498" X-Received: from shwdesssddpdwei.ccr.corp.intel.com ([10.239.157.43]) by fmsmga001.fm.intel.com with ESMTP; 18 Oct 2021 01:42:47 -0700 From: "Sheng Wei" To: devel@edk2.groups.io Cc: Robert Kowalewski , Jenny Huang , Ray Ni , Rangasai V Chaganty , Albecki Mateusz Subject: [edk2-devel] [PATCH v2] IntelSiliconPkg/IntelVTdDxe: Support Multi PCI Root Bus Date: Mon, 18 Oct 2021 16:42:44 +0800 Message-Id: <20211018084244.15316-1-w.sheng@intel.com> Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,w.sheng@intel.com X-Gm-Message-State: jIhwXWEV4V5wBc6EhQpB7RhVx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1634546571; bh=jKLR/ySmBx01qDyKtcghqNxygKf9CMTYgOIdkg5Id4s=; h=Cc:Date:From:Reply-To:Subject:To; b=Mpyuyl6mo0VhM9vfasE7/QOilttVHYStXTvWIQWQHRNhXOKPj24VInqpen216tfVpvV 3nSSYVCAOWYRHxBtq7u/ICQ8S40ussLBCZs0+hJLoV1LO5ywphkG1ulBonOzX/x5ssH2H mtMUJnCocSOzHUywI/9XohLsU7W1nHUHe68= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1634546573306100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Some system may has multi PCI root bus. It needs to use function PciHostBridgeGetRootBridges () to get the root bus count. Then, scan each root bus to get all devices. REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3695 Signed-off-by: Robert Kowalewski Signed-off-by: Sheng Wei Cc: Jenny Huang Cc: Ray Ni Cc: Rangasai V Chaganty Cc: Robert Kowalewski Cc: Albecki Mateusz --- .../Feature/VTd/IntelVTdDxe/DmaProtection.h | 1 + .../Feature/VTd/IntelVTdDxe/DmarAcpiTable.c | 17 +++++++++++++= +--- .../Feature/VTd/IntelVTdDxe/IntelVTdDxe.inf | 1 + 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmaProte= ction.h b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmaProtecti= on.h index a24fbc37..97061de5 100644 --- a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmaProtection.h +++ b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmaProtection.h @@ -23,6 +23,7 @@ #include #include #include +#include =20 #include #include diff --git a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpi= Table.c b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTab= le.c index 2d9b4374..e717aeb2 100644 --- a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c +++ b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c @@ -682,6 +682,9 @@ ProcessDhrd ( UINT8 SecondaryBusNumber; EFI_STATUS Status; VTD_SOURCE_ID SourceId; + PCI_ROOT_BRIDGE *RootBridges; + UINTN RootBridgeCount; + UINTN Index; =20 mVtdUnitInformation[VtdIndex].VtdUnitBaseAddress =3D (UINTN)DmarDrhd->Re= gisterBaseAddress; DEBUG ((DEBUG_INFO," VTD (%d) BaseAddress - 0x%016lx\n", VtdIndex, Dma= rDrhd->RegisterBaseAddress)); @@ -692,9 +695,17 @@ ProcessDhrd ( mVtdUnitInformation[VtdIndex].PciDeviceInfo.IncludeAllFlag =3D TRUE; DEBUG ((DEBUG_INFO," ProcessDhrd: with INCLUDE ALL\n")); =20 - Status =3D ScanPciBus((VOID *)VtdIndex, DmarDrhd->SegmentNumber, 0, Sc= anBusCallbackRegisterPciDevice); - if (EFI_ERROR (Status)) { - return Status; + RootBridges =3D PciHostBridgeGetRootBridges (&RootBridgeCount); + if ((RootBridges =3D=3D NULL) || (RootBridgeCount =3D=3D 0)) { + return EFI_UNSUPPORTED; + } + DEBUG ((DEBUG_INFO,"Find %d root bridges\n", RootBridgeCount)); + for (Index =3D 0; Index < RootBridgeCount; Index++) { + DEBUG ((DEBUG_INFO,"Scan root bridges : %d, Segment : %d, Bus : 0x%0= 2X\n", Index, RootBridges[Index].Segment, RootBridges[Index].Bus.Base)); + Status =3D ScanPciBus((VOID *)VtdIndex, (UINT16) RootBridges[Index].= Segment, (UINT8) RootBridges[Index].Bus.Base, ScanBusCallbackRegisterPciDev= ice); + if (EFI_ERROR (Status)) { + return Status; + } } } else { mVtdUnitInformation[VtdIndex].PciDeviceInfo.IncludeAllFlag =3D FALSE; diff --git a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/IntelVTd= Dxe.inf b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/IntelVTdDxe= .inf index 220636ad..25ff86f4 100644 --- a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/IntelVTdDxe.inf +++ b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/IntelVTdDxe.inf @@ -55,6 +55,7 @@ PerformanceLib PrintLib ReportStatusCodeLib + PciHostBridgeLib =20 [Guids] gEfiEventExitBootServicesGuid ## CONSUMES ## Event --=20 2.16.2.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#82217): https://edk2.groups.io/g/devel/message/82217 Mute This Topic: https://groups.io/mt/86408993/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-