From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web10.5762.1594298677140767058 for ; Thu, 09 Jul 2020 05:44:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=wrPH1wfU; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: liming.gao@intel.com) IronPort-SDR: GBTJdhmXhDBkQDX8F5RzYJTq7S4p6sxMIe1roDtX3/LfT2U0FRa1WS8+YwU5RYxcy52VA3+t4e qNF5hSemhcNg== X-IronPort-AV: E=McAfee;i="6000,8403,9676"; a="232859908" X-IronPort-AV: E=Sophos;i="5.75,331,1589266800"; d="scan'208,217";a="232859908" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jul 2020 05:44:36 -0700 IronPort-SDR: bbAUODpoI3iU/W7Vroo6IaF/j6JFHa9V+ImQ6wDykH27Pd6T/625cmr29BOvRHCZ2mOxR4AZmy WaLq6CZn4hBQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,331,1589266800"; d="scan'208,217";a="389131036" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga001.fm.intel.com with ESMTP; 09 Jul 2020 05:44:36 -0700 Received: from fmsmsx153.amr.corp.intel.com (10.18.125.6) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 9 Jul 2020 05:44:35 -0700 Received: from FMSEDG001.ED.cps.intel.com (10.1.192.133) by FMSMSX153.amr.corp.intel.com (10.18.125.6) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 9 Jul 2020 05:44:35 -0700 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.174) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 9 Jul 2020 05:44:35 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LPaRpH87A7VqKH3UZW3Q2cB5MPfBbAw+LkIa2IDv/yJaxN0e83lTaAHlXUJ7lSOSjBx2RC2HJyX2XSl9YgY/hXOOtDYwTgp/g+Cu9VjN4dplMd5FMHDHajqzfBy7FwK4739Pw8+v2h76qu6ozI2JvPrH/sVAglPECGMCDaVHAQ2TdUYBffnxMj02AN8p6C63E2QACyYj7/wWVB3T2Bun83GA6Ng/6wLoiXNzkn8ElmjnozOwZOf5oqkYuluzCxbXJyV44qzjZB0hTMZvyqWFvuUocldFW/XJgPVZtq0iZrxARcRVPJXi09so2lsZAtGOAIr1gBProSNCGgIsnavJSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HEfeO3C+pZdCDqAO8rfykQDadRG7mXHM94kDchmndoA=; b=nf0ZzDrCF+6y7Bv5JJ6TnOrMZI4k3F5/UW3ZyIGQ3deeWAgcBYn6rWCGyGg9EilkxJgbOtGCdLxC/i5RTHpER+bUsmBdZRoO9xmix4Ulq0NdLWMtwyuVwCL/0QIv0R7rjIOOJOIsWnZFHPzGpm9LivgM+WaYbhhKl0mCwxZ4rplOzN4YbnxwpufG3x3ZzM0ufMepdh9z8PoLSY08/IvfGkuFMVH2YdHSyL/afoB+/oWza7svETI3ZnIXR626oxteMJ4YjKblBDOxW+R2DOK5r5U51LHDC2u561Z2BoCt3UJIIUMC4IWo8E5efWnQVOEV1gPT94o/3pMmMgTIVDTNqA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HEfeO3C+pZdCDqAO8rfykQDadRG7mXHM94kDchmndoA=; b=wrPH1wfUFxGnXcLIkhUY6ie/bMZgqpd5Qzm3jibOFMtoykuhm+J3HFaNlXSqAOsBT0QHoIul9AboSAsWOd5gzB00+gjlYw23n1eaw6yvFpYQ52ZFT8c9TeUL7BG0SEYyGMinCDLuiTubdUj0COmGkRrVXb/iOEx7UmNnrKJtyyc= Received: from MWHPR11MB1630.namprd11.prod.outlook.com (2603:10b6:301:e::7) by MWHPR11MB1374.namprd11.prod.outlook.com (2603:10b6:300:24::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.20; Thu, 9 Jul 2020 12:44:33 +0000 Received: from MWHPR11MB1630.namprd11.prod.outlook.com ([fe80::7847:b564:1b55:b67e]) by MWHPR11MB1630.namprd11.prod.outlook.com ([fe80::7847:b564:1b55:b67e%6]) with mapi id 15.20.3174.021; Thu, 9 Jul 2020 12:44:33 +0000 From: "Liming Gao" To: "De Leon Vazquez, Lorena R" , "devel@edk2.groups.io" , "Lohr, Paul A" , "Yao, Jiewen" CC: "Kinney, Michael D" Subject: Re: [edk2-devel] [edk2-platforms] [PATCH] IntelSiliconPkg: IOMMU generic bug fix Thread-Topic: [edk2-devel] [edk2-platforms] [PATCH] IntelSiliconPkg: IOMMU generic bug fix Thread-Index: AdXw5cIqcI9g1CYLQByg/sbQxnIlIgABtlAQF+LrE7AAGPt4IAC3aFwgAI0ZORA= Date: Thu, 9 Jul 2020 12:44:33 +0000 Message-ID: References: <74D8A39837DF1E4DA445A8C0B3885C503F96301F@shsmsx102.ccr.corp.intel.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.2.0.6 dlp-product: dlpe-windows dlp-reaction: no-action authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.198.147.213] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 6e8a827b-e159-4b10-2197-08d82405d4af x-ms-traffictypediagnostic: MWHPR11MB1374: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:8273; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: /xXA0mjb9oJJEYT3ugtiV/yeyXdHd+0NIKUnB805NNLFit2OYBR4auzEvGvoNZuOA7ZUvSTbpQhNy+HG3UGAsDYGMCPIdJBEMei7BnMa9x48pkJdmFy+zbak8stK91WEQuggzt98LsWZJUdE/MUCJ47+TDtItQvQYull57Xtwc1N+TjJZsLSfVmJCwXH/CfCPVcC4tsM2XpFnR78UJc9TMXy93uJDei3nDreNZpSdP8FzFtZKS1ey1ZDTR0lB91ZI8+ENNSzOYJD5hg4LsbezczfYMA9PttBetdCX9ye6H1+Hzmc2GSzDrRM/jSgjkyeGnf4LK0xwkacyV71TzqJhL87qy4sz+snM+MAeymI2KxPx2sLELWy7g9cPCYFtjoHIW2u6U4/vqyAgBM4BphJjXJVTx0z9/J690UzIweWOMY5rXtxvbJcEepbjHD7KCySctiJ+UB1bhSKPKcznw+1QQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR11MB1630.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(39860400002)(346002)(136003)(376002)(396003)(366004)(53546011)(66476007)(76116006)(7696005)(66556008)(9686003)(66446008)(64756008)(110136005)(186003)(86362001)(8936002)(5660300002)(26005)(55016002)(6506007)(4326008)(316002)(52536014)(66946007)(107886003)(166002)(2906002)(33656002)(83380400001)(8676002)(76236003)(6636002)(71200400001)(478600001)(41533002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: k+WoxkWEzW0lFY8tOoO3iIpHsCPbC/o4Y9Hzk8QxgmMJJEjgx/cRvbARZEDEvOzow1IagTF8qjHombnyBVP7z/PJzVkPFUSrDx88ayrMtUBh5+mi5F1l/bIBk2x3IYHDbjeSpXDMWcqN/577QuE/w2tLNpZGPvQ3Kx0m4r8ZgV776xX9iUIDYN27LB6gKFePq/u/UgtfyiG1nVvxmVg80PInqcb8RSgwijiaxINMD05nAdhQzQfK5wIzwJxI4cVPfQePam/78o3e8ntsiGU94Ww5XugYBbVLiiDS59nL9yiovwD6REQfJjr7asZShUmAqcNCM+DyXK5zyz6+h/vdiY9N3BrC5USuRMvCMRxwZjeaIbNuXIx/wFCBvVQt3au48ynet0f+pXfQweiR6AeQ8M2cnstNCi2KNJOyIe0Il19NNUfi6MioHQXe0JzlEe9SUusNcFGnU2D3ApQgVpFhIXqZxPiADeh+jcmR3lWjM7RC1q3PKmU/oWDt+pOoVMl8 MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MWHPR11MB1630.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6e8a827b-e159-4b10-2197-08d82405d4af X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Jul 2020 12:44:33.3349 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: S0hwxIu5Ui+yBluEM65fARAko4hhhQT/n4mkRoxhaihgtuKuGmcMiX7qscyfNNNyqYc9aao5txdfn98mwsX5oA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1374 Return-Path: liming.gao@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: multipart/alternative; boundary="_000_MWHPR11MB16301C866BE810FFF019E8E880640MWHPR11MB1630namp_" --_000_MWHPR11MB16301C866BE810FFF019E8E880640MWHPR11MB1630namp_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Lorena: I have one minor comment on this patch. The error return status should b= e EFI_UNSUPPORTED. + return error; =3D=3D> return EFI_UNSUPPORTED; Thanks Liming From: De Leon Vazquez, Lorena R Sent: Tuesday, July 7, 2020 1:24 AM To: Gao, Liming ; devel@edk2.groups.io; Lohr, Paul A= ; Yao, Jiewen Cc: Kinney, Michael D Subject: RE: [edk2-devel] [edk2-platforms] [PATCH] IntelSiliconPkg: IOMMU = generic bug fix Hi Liming, I've attached the patch Thanks, Lorena From: Gao, Liming > Sent: Thursday, July 2, 2020 8:54 PM To: devel@edk2.groups.io; Lohr, Paul A >; Yao, Jiewen >; De Leon Vazquez, Lorena R > Cc: Kinney, Michael D > Subject: RE: [edk2-devel] [edk2-platforms] [PATCH] IntelSiliconPkg: IOMMU = generic bug fix Paul: This patch is missing to be merged. Lorena: I can't extract the patch from the mail. Can you send the patch to me? I= can help merge it. Thanks Liming From: devel@edk2.groups.io > On Behalf Of Lohr, Paul A Sent: Thursday, July 2, 2020 9:56 PM To: devel@edk2.groups.io; Yao, Jiewen >; De Leon Vazquez, Lorena R = > Cc: Kinney, Michael D > Subject: Re: [edk2-devel] [edk2-platforms] [PATCH] IntelSiliconPkg: IOMMU = generic bug fix Hello, It seems this did not get checked in. Is there something wrong with the p= atch itself? Or was this simply submitted incorrectly? I don't see a Bugz= illa associated with it is why I ask. Paul A. Lohr - Server Firmware Enabling 512.239.9073 (cell) 512.794.5044 (work) From: devel@edk2.groups.io > On Behalf Of Yao, Jiewen Sent: Monday, March 2, 2020 5:46 PM To: De Leon Vazquez, Lorena R >; devel@edk2.groups.io Cc: Kinney, Michael D > Subject: Re: [edk2-devel] [edk2-platforms] [PATCH] IntelSiliconPkg: IOMMU = generic bug fix Reviewed-by: jiewen.yao@intel.com From: De Leon Vazquez, Lorena R > Sent: Tuesday, March 3, 2020 7:04 AM To: devel@edk2.groups.io Cc: Yao, Jiewen >; Kinne= y, Michael D = > Subject: [edk2-platforms] [PATCH] IntelSiliconPkg: IOMMU generic bug fix Looks like Addresswidth is BIT wise values. Right now these values are not= used any Suggested-by: Star Zeng star.zeng@intel.com Signed-off-by: lorena.r.de.leon.vazquez@intel.com -- .../Feature/VTd/IntelVTdDxe/TranslationTable.c | 11 ++++------- .../Feature/VTd/IntelVTdDxe/TranslationTableEx.c | 11 ++++------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/Transla= tionTable.c b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/Transla= tionTable.c index cc970c0..61fbb4a 100644 --- a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/TranslationTab= le.c +++ b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/TranslationTab= le.c @@ -128,14 +128,11 @@ CreateContextEntry ( DEBUG ((DEBUG_INFO,"Source: S%04x B%02x D%02x F%02x\n", mVtdUnitInfor= mation[VtdIndex].Segment, SourceId.Bits.Bus, SourceId.Bits.Device, SourceId= .Bits.Function)); - switch (mVtdUnitInformation[VtdIndex].CapReg.Bits.SAGAW) { - case BIT1: - ContextEntry->Bits.AddressWidth =3D 0x1; - break; - case BIT2: - ContextEntry->Bits.AddressWidth =3D 0x2; - break; + if ((mVtdUnitInformation[VtdIndex].CapReg.Bits.SAGAW & BIT2) =3D=3D 0= ) { + DEBUG((DEBUG_ERROR, "!!!! 4-level page-table is not supported on VT= D %d !!!!\n", VtdIndex)); + return error; } + ContextEntry->Bits.AddressWidth =3D 0x2; } FlushPageTableMemory (VtdIndex, (UINTN)mVtdUnitInformation[VtdIndex].Ro= otEntryTable, EFI_PAGES_TO_SIZE(EntryTablePages)); diff --git a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/Transla= tionTableEx.c b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/Trans= lationTableEx.c index 0da1611..6bd31b7 100644 --- a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/TranslationTab= leEx.c +++ b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/TranslationTab= leEx.c @@ -78,14 +78,11 @@ CreateExtContextEntry ( DEBUG ((DEBUG_INFO,"DOMAIN: S%04x, B%02x D%02x F%02x\n", mVtdUnitInfo= rmation[VtdIndex].Segment, SourceId.Bits.Bus, SourceId.Bits.Device, SourceI= d.Bits.Function)); - switch (mVtdUnitInformation[VtdIndex].CapReg.Bits.SAGAW) { - case BIT1: - ExtContextEntry->Bits.AddressWidth =3D 0x1; - break; - case BIT2: - ExtContextEntry->Bits.AddressWidth =3D 0x2; - break; + if ((mVtdUnitInformation[VtdIndex].CapReg.Bits.SAGAW & BIT2) =3D=3D 0= ) { + DEBUG((DEBUG_ERROR, "!!!! 4-level page-table is not supported on VT= D %d !!!!\n", VtdIndex)); + return error; } + ContextEntry->Bits.AddressWidth =3D 0x2; } FlushPageTableMemory (VtdIndex, (UINTN)mVtdUnitInformation[VtdIndex].Ex= tRootEntryTable, EFI_PAGES_TO_SIZE(EntryTablePages)); -- 2.21.0.windows.1 --_000_MWHPR11MB16301C866BE810FFF019E8E880640MWHPR11MB1630namp_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

Lorena:

  I have one minor comment on this patch. The = error return status should be EFI_UNSUPPORTED.

 

+      return error;

è

return EFI_UNSUPPORTED;

 

Thanks

Liming

From: De Leon Vazquez, Lorena R <lorena.r= .de.leon.vazquez@intel.com>
Sent: Tuesday, July 7, 2020 1:24 AM
To: Gao, Liming <liming.gao@intel.com>; devel@edk2.groups.io;= Lohr, Paul A <paul.a.lohr@intel.com>; Yao, Jiewen <jiewen.yao@int= el.com>
Cc: Kinney, Michael D <michael.d.kinney@intel.com>
Subject: RE: [edk2-devel] [edk2-platforms] [PATCH] IntelSiliconPkg:= IOMMU generic bug fix

 

Hi Liming,

I’ve attached the patch

 

Thanks,

Lorena

 

From: Gao, Liming <liming.gao@intel.com>
Sent: Thursday, July 2, 2020 8:54 PM
To: devel@edk2.groups.io; Lohr, Paul A <paul.a.lohr@in= tel.com>; Yao, Jiewen <ji= ewen.yao@intel.com>; De Leon Vazquez, Lorena R <lorena.r.de.l= eon.vazquez@intel.com>
Cc: Kinney, Michael D <michael.d.kinney@intel.com>
Subject: RE: [edk2-devel] [edk2-platforms] [PATCH] IntelSiliconPkg:= IOMMU generic bug fix

 

Paul:

  This patch is missing to be merged.

 

Lorena:

  I can’t extract the patch from th= e mail. Can you send the patch to me? I can help merge it.

 

Thanks

Liming

From: devel@edk2.groups.io <deve= l@edk2.groups.io> On Behalf Of Lohr, Paul A
Sent: Thursday, July 2, 2020 9:56 PM
To: devel@edk2.groups.io; Yao, Jiewen <jiewen.yao@intel= .com>; De Leon Vazquez, Lorena R <lorena.r.de.leon.vazquez@intel.com>
Cc: Kinney, Michael D <michael.d.kinney@intel.com>
Subject: Re: [edk2-devel] [edk2-platforms] [PATCH] IntelSiliconPkg:= IOMMU generic bug fix

 

Hello,

 

It seems this did not get checked in.  Is ther= e something wrong with the patch itself?  Or was this simply submitted= incorrectly?  I don’t see a Bugzilla associated with it is why = I ask.

 

Paul A. Lohr – S= erver Firmware Enabling

512.239.9073 (cell)<= /o:p>

512.794.5044 (work)<= /o:p>

 

From: devel@edk2.groups.io <deve= l@edk2.groups.io> On Behalf Of Yao, Jiewen
Sent: Monday, March 2, 2020 5:46 PM
To: De Leon Vazquez, Lorena R <lorena.r.de.leon.vazquez@intel.com>; devel@edk2.groups.io
Cc: Kinney, Michael D <michael.d.kinney@intel.com>
Subject: Re: [edk2-devel] [edk2-platforms] [PATCH] IntelSiliconPkg:= IOMMU generic bug fix

 

Reviewed-by: jiewen.yao@intel.com

 

From: De Leon Vazquez, Lorena R <lorena.r.de.leon.vazquez@in= tel.com>
Sent: Tuesday, March 3, 2020 7:04 AM
To: devel@edk2.groups.io
Cc: Yao, Jiewen <jiewen.= yao@intel.com>; Kinney, Michael D <michael.d.kinney@intel.com>
Subject: [edk2-platforms] [PATCH] IntelSiliconPkg: IOMMU generic bu= g fix

 

Looks like Addresswidth is BIT wise values. Right n= ow these values are not used any

 

Suggested-by: Sta= r Zeng star.zeng@intel.com<= /span>

Signed-off-by: lorena.r.de.leon.vaz= quez@intel.com

 

--

.../Feature/VTd/IntelVTdDxe/TranslationTable.c = ;       | 11 ++++-------=

.../Feature/VTd/IntelVTdDxe/TranslationTableEx.c&nb= sp;     | 11 ++++-------

2 files changed, 8 insertions(+), 14 deletions(= -)

 

diff --git a/Silicon/Intel/IntelSiliconPkg/Feature/= VTd/IntelVTdDxe/TranslationTable.c b/Silicon/Intel/IntelSiliconPkg/Feature/= VTd/IntelVTdDxe/TranslationTable.c

index cc970c0..61fbb4a 100644

--- a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/Int= elVTdDxe/TranslationTable.c

+++ b/Silicon/Intel/IntelSiliconPkg/Fea= ture/VTd/IntelVTdDxe/TranslationTable.c

@@ -128,14 +128,11 @@ CreateContextEntry (=

 

     DEBUG ((DEBUG_INFO,&q= uot;Source: S%04x B%02x D%02x F%02x\n", mVtdUnitInformation[VtdIndex].= Segment, SourceId.Bits.Bus, SourceId.Bits.Device, SourceId.Bits.Function));=

 

-    switch (mVtdUnitInformation[Vtd= Index].CapReg.Bits.SAGAW) {

-    case BIT1:

-      ContextEntry->Bi= ts.AddressWidth =3D 0x1;

-      break;

-    case BIT2:

-      ContextEntry->Bi= ts.AddressWidth =3D 0x2;

-      break;

+    if ((mVtdUnitInformation[Vt= dIndex].CapReg.Bits.SAGAW & BIT2) =3D=3D 0) {

+      DEBUG((DEBUG_ER= ROR, "!!!! 4-level page-table is not supported on VTD %d !!!!\n",= VtdIndex));

+      return error;

     }

+    ContextEntry->Bits.Addre= ssWidth =3D 0x2;

   }

 

   FlushPageTableMemory (VtdIndex, (= UINTN)mVtdUnitInformation[VtdIndex].RootEntryTable, EFI_PAGES_TO_SIZE(Entry= TablePages));

diff --git a/Silicon/Intel/IntelSiliconPkg/Feature/= VTd/IntelVTdDxe/TranslationTableEx.c b/Silicon/Intel/IntelSiliconPkg/Featur= e/VTd/IntelVTdDxe/TranslationTableEx.c

index 0da1611..6bd31b7 100644

--- a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/Int= elVTdDxe/TranslationTableEx.c

+++ b/Silicon/Intel/IntelSiliconPkg/Fea= ture/VTd/IntelVTdDxe/TranslationTableEx.c

@@ -78,14 +78,11 @@ CreateExtContextEntry (

 

     DEBUG ((DEBUG_INFO,&q= uot;DOMAIN: S%04x, B%02x D%02x F%02x\n", mVtdUnitInformation[VtdIndex]= .Segment, SourceId.Bits.Bus, SourceId.Bits.Device, SourceId.Bits.Function))= ;

 

-    switch (mVtdUnitInformation[Vtd= Index].CapReg.Bits.SAGAW) {

-    case BIT1:

-      ExtContextEntry->= ;Bits.AddressWidth =3D 0x1;

-      break;

-    case BIT2:

-      ExtContextEntry->= ;Bits.AddressWidth =3D 0x2;

-      break;

+    if ((mVtdUnitInformation[Vt= dIndex].CapReg.Bits.SAGAW & BIT2) =3D=3D 0) {

+      DEBUG((DEBUG_ER= ROR, "!!!! 4-level page-table is not supported on VTD %d !!!!\n",= VtdIndex));

+      return error;

     }

+    ContextEntry->Bits.Addre= ssWidth =3D 0x2;

   }

 

   FlushPageTableMemory (VtdIndex, (= UINTN)mVtdUnitInformation[VtdIndex].ExtRootEntryTable, EFI_PAGES_TO_SIZE(En= tryTablePages));

--

2.21.0.windows.1

 

--_000_MWHPR11MB16301C866BE810FFF019E8E880640MWHPR11MB1630namp_--