From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web12.50.1594056275259800342 for ; Mon, 06 Jul 2020 10:24:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=Gmwcnmxn; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: lorena.r.de.leon.vazquez@intel.com) IronPort-SDR: jS8m+TbNB7ENB2Z51TVVA1Sw5jPw7cLbzGJJCPVdw9uaRz9dbblSZ8rfQLVEQ6CIHePnPkzVXf xsJfsZ5rckhw== X-IronPort-AV: E=McAfee;i="6000,8403,9673"; a="148964475" X-IronPort-AV: E=Sophos;i="5.75,320,1589266800"; d="scan'208,217,223";a="148964475" X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jul 2020 10:24:34 -0700 IronPort-SDR: +qOkdJesDFLP7u9IPYEfVobkW8pyGgY113hTY+VU8/P5Yu/wglej6Lwnk0dbNuM+VMMg+X0m+f ZNhtWyWMorFw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,320,1589266800"; d="scan'208,217,223";a="315234144" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by fmsmga002.fm.intel.com with ESMTP; 06 Jul 2020 10:24:33 -0700 Received: from fmsmsx113.amr.corp.intel.com (10.18.116.7) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 6 Jul 2020 10:24:33 -0700 Received: from FMSEDG002.ED.cps.intel.com (10.1.192.134) by FMSMSX113.amr.corp.intel.com (10.18.116.7) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 6 Jul 2020 10:24:33 -0700 Received: from NAM02-CY1-obe.outbound.protection.outlook.com (104.47.37.51) by edgegateway.intel.com (192.55.55.69) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 6 Jul 2020 10:24:30 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EBfIi3S4JYGY/AaIjh8BUdDZ22IPrC8OEgJqK//T3BWzj+guUiPA5T8kGJaWGhBqjLDD8n0Q+XBcstyQ3lizlpUuic3y5wM1PGLwhsIBwui7W7iTFH9+v5g756YjzeeksTmR0l8oihXVfriH4+F2roHGFMttKhLMya10SopNWXMxGc4mGn9IMJ8cxtIlVIgTfUvl7qxiVTYTx5O71iB0jIVFbPsx9OkcBqijcU3SKwOu93L4f0Mh4Z37KDZvqIuLFscyYklFRgUYTjctwmYivkuXGdY2cGvaR0Nx3p2i1Bl3sOp3NTaEdcmsXTNHmA+peoM4zr3ZXQUgEyA0B/kEOw== 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=Lt+qS2DIfPuJuryxtx2gNOzQNATTwX8AQE76MxfxrsA=; b=arDB1WKTzxqD+0VJIubJVT0S8Lm3OoyDZNfxRmQGfvY7AogQqW6CD5XlVtxfD39Sl+qvx4C/tqhxBHOTRcqbf15eQtrRRe/lnFod2d9fpLtpFra/5hOoNJu9Yur/elJG9+HB6JjD3gMxX6mc4JZZKtn4l+IYGMCIyCIK5NWWeUw6iKr+PLaeu8GSomGhKnQh349OZMVUxaDvPcKsTIuxwADo9lkFd4MFrpxPM5pnr6zlVWirNnweDR/kRIUh6qewAH1By6AeDD3iRgVpjVuFK+7jNNJlFycclq1Pmo67hYt8EVcEgadBNw0zNUpHXMrnewPpp5qb974nx4AuPreayg== 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=Lt+qS2DIfPuJuryxtx2gNOzQNATTwX8AQE76MxfxrsA=; b=GmwcnmxnqLCF0PH586DaYZO/kDGKgQcpFIc+u01b5usFkVKwQV6RIXF7ay6oAmj65B5yRTZVacyYJNddZI54+w8fHmuUNMi3Y9p9WVlFSvIBa5OIF/elSwo+n20Sumln85O4wY/uAzRyy+7DSkqWYaRCvU85jCLJwKUpAMVfa1E= Received: from BYAPR11MB2982.namprd11.prod.outlook.com (2603:10b6:a03:84::10) by BY5PR11MB3943.namprd11.prod.outlook.com (2603:10b6:a03:185::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.22; Mon, 6 Jul 2020 17:24:28 +0000 Received: from BYAPR11MB2982.namprd11.prod.outlook.com ([fe80::10ed:fe19:5b55:5f86]) by BYAPR11MB2982.namprd11.prod.outlook.com ([fe80::10ed:fe19:5b55:5f86%7]) with mapi id 15.20.3153.029; Mon, 6 Jul 2020 17:24:28 +0000 From: "De Leon Vazquez, Lorena R" 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 Thread-Topic: [edk2-devel] [edk2-platforms] [PATCH] IntelSiliconPkg: IOMMU generic bug fix Thread-Index: AdXw5cIqcI9g1CYLQByg/sbQxnIlIgABtlAQF+LrE7AAGPt4IAC3aFwg Date: Mon, 6 Jul 2020 17:24:28 +0000 Message-ID: References: <74D8A39837DF1E4DA445A8C0B3885C503F96301F@shsmsx102.ccr.corp.intel.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: dlp-reaction: no-action dlp-version: 11.2.0.6 dlp-product: dlpe-windows 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.55.52.217] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 6052563e-7ce9-4977-e66d-08d821d17059 x-ms-traffictypediagnostic: BY5PR11MB3943: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:8273; x-forefront-prvs: 04569283F9 x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: tDDQDhCXmKiu0frUN9GPIfV4oH54UUAB7qk05Y6DXgycwATW4b+JrVHD1vYbtU3FQW4wnuPtPGfR7QhJkhfLxKFuznhLsPqUEP9GJjPWZ4a3P0mk0Bz91lqTEui5U6MWltXYfZWirEjuXVJbSFvfwmCdAmlwk5PuLp4F4yDvMKdMyU95b+VPBbpnvxI5l1w9yyN+Ju5RG25bS9h7LKO5pJ34d/WMAmxAizeleMxMBkt/3HMhjBCIbxzK9bF4cavqDg0W/L8SNoQnz1lCp8F8guAA1v/1wsSZ7MYGvw5vqe9x3Rxv/+0Or4SVR02iMyuLmAn5cX6os1lgEphPYOg+cYtApn2cOEJctsFTkjnCoLpDf0keQ3SMmslyj77kSBY5cFvRGhfvHtN5kcD/UJ1oiLdHljmKsF5HQ53ZkVWiTHXO38fYtZJSxPpnUy+2LQCsZuKxbs6PpFiPw1XQjMo2Ag== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR11MB2982.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(366004)(136003)(396003)(376002)(39860400002)(346002)(76116006)(66616009)(66476007)(66556008)(64756008)(66946007)(66446008)(4326008)(6506007)(166002)(53546011)(2906002)(6636002)(76236003)(7696005)(26005)(83380400001)(186003)(9326002)(33656002)(5660300002)(107886003)(8936002)(478600001)(52536014)(99936003)(9686003)(71200400001)(55016002)(8676002)(316002)(86362001)(110136005)(41533002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: MuTPEAwNtj/K/OXQ9LJF1LCNe22J2yVrmwh3O40AWX8Q217YL5XVDydKPJiW+7RmfRGt+88Hj8w/TDFVaTiLDtCmbWSyQWoSxVZrSz2fHV0KlC91hygODkZpCaidTU2Jy84ZFyqgNoJLMugRxGE/UTl51C1mxsSA9pDgsbTveTn1rrv2Jqs4qoLDujonKAh42EWYlZJMUwyxv7bU18V9+f+I8yLOkKFp6Kg/ZB0l4oIuP8r7iloeJeHsHI3Lv/7bPe1NUa8ZF3aHo/7yeWJbYBIfMj1foSNE+Pt/2/9itUA4otIk2AfOkuaheEb3AKmnD7dubmnpOIIIDFXJGwO6pHFRjNP/WG+FhdF0PjFVq05v2XpKxjikG5JLLAF6HOatjyRG2cqN0jBQAsmnD+jKYFAq8Bm2lr2jvbY/fj8Z+u5fTNaMZFqJrn4LtON0clGYBHjG4+1wj6bHeAUwNN05V8TTqfecLv2mSs/D2ax9KJI= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BYAPR11MB2982.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6052563e-7ce9-4977-e66d-08d821d17059 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Jul 2020 17:24:28.7577 (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: zUtX4ZdYd7V61szyrHUjEzRVJN8oi6w+SnrivGNfshIsIEZanq/LvMouDNVVu9Aw0M8XMPaw6hnN4ki3/haigABltHvRdeTBTQgiSU+w5Lc9+hZrt4RJfP+d5Pmjsn6q X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR11MB3943 Return-Path: lorena.r.de.leon.vazquez@intel.com X-OriginatorOrg: intel.com X-Groupsio-MsgNum: 62100 Content-Language: en-US Content-Type: multipart/mixed; boundary="_004_BYAPR11MB29822CF1F2340CCD1DB130C6D9690BYAPR11MB2982namp_" --_004_BYAPR11MB29822CF1F2340CCD1DB130C6D9690BYAPR11MB2982namp_ Content-Type: multipart/alternative; boundary="_000_BYAPR11MB29822CF1F2340CCD1DB130C6D9690BYAPR11MB2982namp_" --_000_BYAPR11MB29822CF1F2340CCD1DB130C6D9690BYAPR11MB2982namp_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable 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, Jiewe= n ; 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_BYAPR11MB29822CF1F2340CCD1DB130C6D9690BYAPR11MB2982namp_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

Hi Liming,

I’ve attached the patch

 

Thanks,

Lorena

 

From: Gao, Liming <liming.gao@intel.com&g= t;
Sent: Thursday, July 2, 2020 8:54 PM
To: devel@edk2.groups.io; Lohr, Paul A <paul.a.lohr@intel.com>= ;; 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

 

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_BYAPR11MB29822CF1F2340CCD1DB130C6D9690BYAPR11MB2982namp_-- --_004_BYAPR11MB29822CF1F2340CCD1DB130C6D9690BYAPR11MB2982namp_ Content-Type: application/octet-stream; name="0001-IntelSiliconPkg-IOMMU-generic-bug-fix.patch" Content-Description: 0001-IntelSiliconPkg-IOMMU-generic-bug-fix.patch Content-Disposition: attachment; filename="0001-IntelSiliconPkg-IOMMU-generic-bug-fix.patch"; size=3009; creation-date="Mon, 06 Jul 2020 17:20:54 GMT"; modification-date="Mon, 06 Jul 2020 17:19:40 GMT" Content-Transfer-Encoding: base64 RnJvbSA4ZmZhMDVkMDQxMzU3MWMxNzE4YTJiMGZhNmY4ODNmZGRkN2UwMmIzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBsb3JlbmEgZGUgbGVvbiA8bG9yZW5hLnIuZGUubGVvbi52YXpx dWV6QGludGVsLmNvbT4KRGF0ZTogTW9uLCA2IEp1bCAyMDIwIDEyOjE3OjU5IC0wNTAwClN1Ympl Y3Q6IFtQQVRDSCAxLzFdIEludGVsU2lsaWNvblBrZzogSU9NTVUgZ2VuZXJpYyBidWcgZml4CgpM b29rcyBsaWtlIEFkZHJlc3N3aWR0aCBpcyBCSVQgd2lzZSB2YWx1ZXMuIFJpZ2h0IG5vdyB0aGVz ZSB2YWx1ZXMgYXJlIG5vdCB1c2VkIGFueQoKU3VnZ2VzdGVkLWJ5OiBTdGFyIFplbmcgc3Rhci56 ZW5nQGludGVsLmNvbQpTaWduZWQtb2ZmLWJ5OiBsb3JlbmEuci5kZS5sZW9uLnZhenF1ZXpAaW50 ZWwuY29tCi0tLQogLi4uL0ZlYXR1cmUvVlRkL0ludGVsVlRkRHhlL1RyYW5zbGF0aW9uVGFibGUu YyAgICAgICAgfCAxMSArKysrLS0tLS0tLQogLi4uL0ZlYXR1cmUvVlRkL0ludGVsVlRkRHhlL1Ry YW5zbGF0aW9uVGFibGVFeC5jICAgICAgfCAxMSArKysrLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2Vk LCA4IGluc2VydGlvbnMoKyksIDE0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NpbGljb24v SW50ZWwvSW50ZWxTaWxpY29uUGtnL0ZlYXR1cmUvVlRkL0ludGVsVlRkRHhlL1RyYW5zbGF0aW9u VGFibGUuYyBiL1NpbGljb24vSW50ZWwvSW50ZWxTaWxpY29uUGtnL0ZlYXR1cmUvVlRkL0ludGVs VlRkRHhlL1RyYW5zbGF0aW9uVGFibGUuYwppbmRleCBmY2ZmMDkyNWI4Li5hOTNiYjY1NTExIDEw MDY0NAotLS0gYS9TaWxpY29uL0ludGVsL0ludGVsU2lsaWNvblBrZy9GZWF0dXJlL1ZUZC9JbnRl bFZUZER4ZS9UcmFuc2xhdGlvblRhYmxlLmMKKysrIGIvU2lsaWNvbi9JbnRlbC9JbnRlbFNpbGlj b25Qa2cvRmVhdHVyZS9WVGQvSW50ZWxWVGREeGUvVHJhbnNsYXRpb25UYWJsZS5jCkBAIC0xMjgs MTQgKzEyOCwxMSBAQCBDcmVhdGVDb250ZXh0RW50cnkgKAogDQogICAgIERFQlVHICgoREVCVUdf SU5GTywiU291cmNlOiBTJTA0eCBCJTAyeCBEJTAyeCBGJTAyeFxuIiwgbVZ0ZFVuaXRJbmZvcm1h dGlvbltWdGRJbmRleF0uU2VnbWVudCwgU291cmNlSWQuQml0cy5CdXMsIFNvdXJjZUlkLkJpdHMu RGV2aWNlLCBTb3VyY2VJZC5CaXRzLkZ1bmN0aW9uKSk7DQogDQotICAgIHN3aXRjaCAobVZ0ZFVu aXRJbmZvcm1hdGlvbltWdGRJbmRleF0uQ2FwUmVnLkJpdHMuU0FHQVcpIHsNCi0gICAgY2FzZSBC SVQxOg0KLSAgICAgIENvbnRleHRFbnRyeS0+Qml0cy5BZGRyZXNzV2lkdGggPSAweDE7DQotICAg ICAgYnJlYWs7DQotICAgIGNhc2UgQklUMjoNCi0gICAgICBDb250ZXh0RW50cnktPkJpdHMuQWRk cmVzc1dpZHRoID0gMHgyOw0KLSAgICAgIGJyZWFrOw0KKyAgICBpZiAoKG1WdGRVbml0SW5mb3Jt YXRpb25bVnRkSW5kZXhdLkNhcFJlZy5CaXRzLlNBR0FXICYgQklUMikgPT0gMCkgew0KKyAgICAg IERFQlVHKChERUJVR19FUlJPUiwgIiEhISEgNC1sZXZlbCBwYWdlLXRhYmxlIGlzIG5vdCBzdXBw b3J0ZWQgb24gVlREICVkICEhISFcbiIsIFZ0ZEluZGV4KSk7DQorICAgICAgcmV0dXJuIGVycm9y Ow0KICAgICB9DQorICAgIENvbnRleHRFbnRyeS0+Qml0cy5BZGRyZXNzV2lkdGggPSAweDI7DQog ICB9DQogDQogICBGbHVzaFBhZ2VUYWJsZU1lbW9yeSAoVnRkSW5kZXgsIChVSU5UTiltVnRkVW5p dEluZm9ybWF0aW9uW1Z0ZEluZGV4XS5Sb290RW50cnlUYWJsZSwgRUZJX1BBR0VTX1RPX1NJWkUo RW50cnlUYWJsZVBhZ2VzKSk7DQpkaWZmIC0tZ2l0IGEvU2lsaWNvbi9JbnRlbC9JbnRlbFNpbGlj b25Qa2cvRmVhdHVyZS9WVGQvSW50ZWxWVGREeGUvVHJhbnNsYXRpb25UYWJsZUV4LmMgYi9TaWxp Y29uL0ludGVsL0ludGVsU2lsaWNvblBrZy9GZWF0dXJlL1ZUZC9JbnRlbFZUZER4ZS9UcmFuc2xh dGlvblRhYmxlRXguYwppbmRleCBlZThjOWUzYWQyLi5kOWZlNDcwYzRjIDEwMDY0NAotLS0gYS9T aWxpY29uL0ludGVsL0ludGVsU2lsaWNvblBrZy9GZWF0dXJlL1ZUZC9JbnRlbFZUZER4ZS9UcmFu c2xhdGlvblRhYmxlRXguYworKysgYi9TaWxpY29uL0ludGVsL0ludGVsU2lsaWNvblBrZy9GZWF0 dXJlL1ZUZC9JbnRlbFZUZER4ZS9UcmFuc2xhdGlvblRhYmxlRXguYwpAQCAtNzgsMTQgKzc4LDEx IEBAIENyZWF0ZUV4dENvbnRleHRFbnRyeSAoCiANCiAgICAgREVCVUcgKChERUJVR19JTkZPLCJE T01BSU46IFMlMDR4LCBCJTAyeCBEJTAyeCBGJTAyeFxuIiwgbVZ0ZFVuaXRJbmZvcm1hdGlvbltW dGRJbmRleF0uU2VnbWVudCwgU291cmNlSWQuQml0cy5CdXMsIFNvdXJjZUlkLkJpdHMuRGV2aWNl LCBTb3VyY2VJZC5CaXRzLkZ1bmN0aW9uKSk7DQogDQotICAgIHN3aXRjaCAobVZ0ZFVuaXRJbmZv cm1hdGlvbltWdGRJbmRleF0uQ2FwUmVnLkJpdHMuU0FHQVcpIHsNCi0gICAgY2FzZSBCSVQxOg0K LSAgICAgIEV4dENvbnRleHRFbnRyeS0+Qml0cy5BZGRyZXNzV2lkdGggPSAweDE7DQotICAgICAg YnJlYWs7DQotICAgIGNhc2UgQklUMjoNCi0gICAgICBFeHRDb250ZXh0RW50cnktPkJpdHMuQWRk cmVzc1dpZHRoID0gMHgyOw0KLSAgICAgIGJyZWFrOw0KKyAgICBpZiAoKG1WdGRVbml0SW5mb3Jt YXRpb25bVnRkSW5kZXhdLkNhcFJlZy5CaXRzLlNBR0FXICYgQklUMikgPT0gMCkgew0KKyAgICAg IERFQlVHKChERUJVR19FUlJPUiwgIiEhISEgNC1sZXZlbCBwYWdlLXRhYmxlIGlzIG5vdCBzdXBw b3J0ZWQgb24gVlREICVkICEhISFcbiIsIFZ0ZEluZGV4KSk7DQorICAgICAgcmV0dXJuIGVycm9y Ow0KICAgICB9DQorICAgIENvbnRleHRFbnRyeS0+Qml0cy5BZGRyZXNzV2lkdGggPSAweDI7DQog ICB9DQogDQogICBGbHVzaFBhZ2VUYWJsZU1lbW9yeSAoVnRkSW5kZXgsIChVSU5UTiltVnRkVW5p dEluZm9ybWF0aW9uW1Z0ZEluZGV4XS5FeHRSb290RW50cnlUYWJsZSwgRUZJX1BBR0VTX1RPX1NJ WkUoRW50cnlUYWJsZVBhZ2VzKSk7DQotLSAKMi4yMS4wLndpbmRvd3MuMQoK --_004_BYAPR11MB29822CF1F2340CCD1DB130C6D9690BYAPR11MB2982namp_--