From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mx.groups.io with SMTP id smtpd.web11.8297.1596036165620731189 for ; Wed, 29 Jul 2020 08:22:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=QdPSj96r; spf=pass (domain: intel.com, ip: 134.134.136.20, mailfrom: lorena.r.de.leon.vasquez@intel.com) IronPort-SDR: 4SL8jrPTUQmcecO8QaeK/dDV87lFAA37bJNDUj6tt23z71GfqSNgF5KAsQdWhJRrHh1wMEZWEc E1bVUc9lHmGw== X-IronPort-AV: E=McAfee;i="6000,8403,9697"; a="139448338" X-IronPort-AV: E=Sophos;i="5.75,410,1589266800"; d="scan'208,217,223";a="139448338" X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jul 2020 08:22:44 -0700 IronPort-SDR: Trm2W17slmQJZHhha4hvjgCdWThAYV/4ziPHwoOsTG17dwZpVDuWNoBE4gHOanUV0EWol0Z1kq nll0lBqz/X1g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,410,1589266800"; d="scan'208,217,223";a="320772714" Received: from orsmsx102.amr.corp.intel.com ([10.22.225.129]) by orsmga008.jf.intel.com with ESMTP; 29 Jul 2020 08:22:43 -0700 Received: from orsmsx161.amr.corp.intel.com (10.22.240.84) by ORSMSX102.amr.corp.intel.com (10.22.225.129) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 29 Jul 2020 08:22:43 -0700 Received: from ORSEDG001.ED.cps.intel.com (10.7.248.4) by ORSMSX161.amr.corp.intel.com (10.22.240.84) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 29 Jul 2020 08:22:43 -0700 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.176) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 29 Jul 2020 08:22:43 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AzKphs/iKOO0ihIr9DmL1yCoxlS/wb9prXLJFC8m99krJtQxFNq2Sdlx38YRZLHWiPJJKPPJZ5zyVTjvBBzhIU8f1bnIVovsZQNP1Xx1SM+oYiXc+KB39yPRejjOQini3Aw60G8ss9zGbm90SpU3V2fRCKMawaj7v+eBhGfO0P0p0N/Wif34SbxK5PVDD+VTTO74ytwf8yIcTjs1dU0qEUgAAMwV+OdvEW7KUdhHMMKnQb3UUKoBWJPzcD+46wIn1Rys8jCKrwm/LJErIIxprwyChCZ3udASj5k66jVzZMFDFNx3UUFJluNFYegBbBz+oOF6ctFWxVXjvO+47ItwWg== 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=lvWBoqSzcCS/3rCQNYs1TXZsGU/m+fJLV7rQH38S4Vc=; b=ZN9Jbuo6QteDEdC5EEYsWJ0sQBFb7zssb7XEsGaKUUBwYc/WmyGMuLB/yyFlAN29ECuPaVm4umuDXgjfyym+6bhVHGkJBI2hWstmmtKlKTNkAEy+E1se7EsWtroHTLu082LUQiSHjMk02bmnUg8MKIrUoKs1BjcDZCYK1EV6FKz7xXdHRqsOpWoYsRMXfKHqmT7/NArd8MSTD9U2CrpI/gQjLDbHedI5mdVnRPe2JfGzFQGUpgZrlOfhmthRRG/veNJWRlhap/f0h7uUJRTbTzF/DsG5vxkI8G2jW8n3+5RSlYRl1nvBWSOJfJT9+9LCiD1sA74UxUfBwBT4/vzW+Q== 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=lvWBoqSzcCS/3rCQNYs1TXZsGU/m+fJLV7rQH38S4Vc=; b=QdPSj96rELzYD2mxQU+xOTwt5QKvAhIOETmLbwGi3CRTSWG/trsc1wk4eoPtF10hy1i7rTD6WoTzmEukXvcdTH2NqUcd2HuISvw+79abV/iTjSCUlIdmz+OdN9zBrNKw7ByD9mYrDD4lMAK0Vi8D4KwG7t5qhqMigggDVvQDg6g= Received: from BYAPR11MB2982.namprd11.prod.outlook.com (2603:10b6:a03:84::10) by BYAPR11MB3238.namprd11.prod.outlook.com (2603:10b6:a03:7e::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3239.16; Wed, 29 Jul 2020 15:22:41 +0000 Received: from BYAPR11MB2982.namprd11.prod.outlook.com ([fe80::611e:a05f:e696:e25d]) by BYAPR11MB2982.namprd11.prod.outlook.com ([fe80::611e:a05f:e696:e25d%4]) with mapi id 15.20.3239.017; Wed, 29 Jul 2020 15:22:41 +0000 From: "De Leon Vasquez, 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+LrE7AAGPt4IAC3aFwgAI0ZORAD82aOoA== Date: Wed, 29 Jul 2020 15:22:41 +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: [189.163.162.78] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: dbd40e8e-281e-4293-afed-08d833d33c42 x-ms-traffictypediagnostic: BYAPR11MB3238: 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: sfVtMZ+MBMfCH61BS29nOVWEPou8Mfwy57dKBKKrzNm/sVVRkNBs4sFL002keNXdTWr6MOJp9oJdch/5rMVXzBSxVXVRk59Bk0PRQCnKCpPSA2qJGkeph++eHu6lNitJmxNZ1iiQtWlbHru4gjYGIXSZuQMksy8EXPM+cpnV7CsPG8b4ZAve75ixTvyW6oE+gNxj4udfGn9vdf3PSNMjjIvBJw4t26BjRry/fecpzIWaUxGCsLU/l2j9rklRE7FWjj38HnWqdSHpCJET4M49OJQls2qgMuYUEWND+/CPBJcBJsLbrCxF/nmnssXBImOaJxHTdXX2u06er0YNVJCU/49VmWGb5aUEHvIg9+33lVSeJj7IgrBvIli2UAVjWS4yIfpWInIzGwh9fOQsC4gd+RN/NUFVQTwTaywz/R0nNQ2a5iStfZAuV+LL0/7Tt5Vvx5MMRv9+fH3Nlueugjx8WA== 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)(376002)(39860400002)(366004)(136003)(346002)(396003)(8676002)(76236003)(33656002)(99936003)(83380400001)(8936002)(6636002)(4326008)(166002)(110136005)(71200400001)(316002)(66476007)(52536014)(66946007)(86362001)(55016002)(5660300002)(107886003)(76116006)(66616009)(6506007)(66446008)(53546011)(66556008)(7696005)(2906002)(478600001)(186003)(64756008)(26005)(9686003)(41533002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: X615dn1FdfjxF8+ClJFyQn7joB9AITw5Tle+QXvXJS6+HAfiemf0kS6vTHi5k4WtCZ2EWe1r601RSyFzsnu120DsWUWNlw8IJCGHhN44waOv1lGiHMmBmCPayTCa3yUAkizx6jORr6epoziDp6kONttuv5srsrxbbJh6tW79D/MJO+kSPfptJA74x6sEqRh+r8agXiecGTv4gZD3egH8Z99ej5j4d5ZUeWWJzC4qp5QqEGaNNdou0qIGd2X70FfHMzo6dnLRu4atVMKXq4l1O/CQTpWaKDT3S7JHPGkFABzEZujqGHpIiKRp+16iznp3RfNJKG5pe5OawOlDdMRbYtq0ZQE/3XZJ3OtEVJVVHIhXpOqu0YvmwqZpoHHpZmLVZ6PEUZ/kOyRkHgeGiNAefbl1BHYmpO3ZivaDPYBTb/i0IvpmtPh26BDeGxLVap8WqWjiPjeR2MnxvuMHYPdWiLrJeBNRO/QS742mxCJkcHwpN88FwVMdOIl5S4DP1+TdOyAl53rvcjtWfC1vttoXBaS4PLFvke8OVTsDMRzgUTUhpt1zTq6kjsEkIEOO42Mbg3MagMhHTgPoKnlRR+X8EcmmsH9fbRKiBWjRzeXUzH7lLiv6XbH99/Rb0D77LSTs9kVYiMNempiHtGoJ/9PUuw== 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: dbd40e8e-281e-4293-afed-08d833d33c42 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jul 2020 15:22:41.3375 (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: ySfVUxro3tRKJZP8MwCitRvwebn19VWVYDboX7Wj+K7ISjCFDBQ/KumQ3bsxoAkmMEY1rO2lQ8nQ91LDyS0BDeZIxZGQbaNnbnJaTsSz5c/irQTjEygGPaGgSGHc8E4z X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB3238 Return-Path: lorena.r.de.leon.vasquez@intel.com X-OriginatorOrg: intel.com X-Groupsio-MsgNum: 63453 Content-Language: en-US Content-Type: multipart/mixed; boundary="_004_BYAPR11MB29823D87704350F0C40CF57CD0700BYAPR11MB2982namp_" --_004_BYAPR11MB29823D87704350F0C40CF57CD0700BYAPR11MB2982namp_ Content-Type: multipart/alternative; boundary="_000_BYAPR11MB29823D87704350F0C40CF57CD0700BYAPR11MB2982namp_" --_000_BYAPR11MB29823D87704350F0C40CF57CD0700BYAPR11MB2982namp_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable I've attached patch with modifications suggested From: Gao, Liming Sent: Thursday, July 9, 2020 7:45 AM 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 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_BYAPR11MB29823D87704350F0C40CF57CD0700BYAPR11MB2982namp_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

I’ve attached patch with modifications sugges= ted  

 

From: Gao, Liming <liming.gao@intel.com&g= t;
Sent: Thursday, July 9, 2020 7:45 AM
To: De Leon Vazquez, Lorena R <lorena.r.de.leon.vazquez@intel.co= m>; devel@edk2.groups.io; Lohr, Paul A <paul.a.lohr@intel.com>; Ya= o, Jiewen <jiewen.yao@intel.com>
Cc: Kinney, Michael D <michael.d.kinney@intel.com>
Subject: RE: [edk2-devel] [edk2-platforms] [PATCH] IntelSiliconPkg:= IOMMU generic bug fix

 

Lorena:

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

 

+      return error;<= /o:p>

è

return EFI_UNSUPPORTED;

 

Thanks

Liming

From: De Leon Vazquez, Lorena R <lorena.r.de.leon.vazquez@in= tel.com>
Sent: Tuesday, July 7, 2020 1:24 AM
To: Gao, Liming <liming.= gao@intel.com>; devel@edk2.groups.io; Lohr, Pa= ul A <paul.a.lohr@intel.com= >; Yao, Jiewen <jiewen.yao@in= tel.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/Feature/VTd/Int= elVTdDxe/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[VtdInd= ex].CapReg.Bits.SAGAW & BIT2) =3D=3D 0) {

+      DEBUG((DEBUG_ERROR,= "!!!! 4-level page-table is not supported on VTD %d !!!!\n", Vtd= Index));

+      return error;<= /o:p>

     }

+    ContextEntry->Bits.AddressWi= dth =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/Feature/VTd/Int= elVTdDxe/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[VtdInd= ex].CapReg.Bits.SAGAW & BIT2) =3D=3D 0) {

+      DEBUG((DEBUG_ERROR,= "!!!! 4-level page-table is not supported on VTD %d !!!!\n", Vtd= Index));

+      return error;<= /o:p>

     }

+    ContextEntry->Bits.AddressWi= dth =3D 0x2;

   }

 

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

--

2.21.0.windows.1

 

--_000_BYAPR11MB29823D87704350F0C40CF57CD0700BYAPR11MB2982namp_-- --_004_BYAPR11MB29823D87704350F0C40CF57CD0700BYAPR11MB2982namp_ 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=3086; creation-date="Mon, 06 Jul 2020 17:20:54 GMT"; modification-date="Wed, 29 Jul 2020 15:19:22 GMT" Content-Transfer-Encoding: base64 RnJvbSA0NDdiYmFhNmI4NjA4Nzg3ZjMyZTQ1YjdkY2NmYWUwMmRjOTEzOTY4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBsb3JlbmEgZGUgbGVvbiA8bG9yZW5hLnIuZGUubGVvbi52YXpx dWV6QGludGVsLmNvbT4KRGF0ZTogV2VkLCAyOSBKdWwgMjAyMCAxMDoxNjo0NyAtMDUwMApTdWJq ZWN0OiBbUGF0Y2ggVjJdIEludGVsU2lsaWNvblBrZzogSU9NTVUgZ2VuZXJpYyBidWcgZml4CgpM b29rcyBsaWtlIEFkZHJlc3N3aWR0aCBpcyBCSVQgd2lzZSB2YWx1ZXMuIFJpZ2h0IG5vdyB0aGVz ZSB2YWx1ZXMgYXJlIG5vdCB1c2VkIGFueQoKQlo6IGh0dHBzOi8vYnVnemlsbGEudGlhbm9jb3Jl Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjQwMQoKU3VnZ2VzdGVkLWJ5OiBTdGFyIFplbmcgc3Rhci56 ZW5nQGludGVsLmNvbQpTaWduZWQtb2ZmLWJ5OiBsb3JlbmEuci5kZS5sZW9uLnZhc3F1ZXpAaW50 ZWwuY29tCi0tLQogLi4uL0ZlYXR1cmUvVlRkL0ludGVsVlRkRHhlL1RyYW5zbGF0aW9uVGFibGUu YyAgICAgICAgfCAxMSArKysrLS0tLS0tLQogLi4uL0ZlYXR1cmUvVlRkL0ludGVsVlRkRHhlL1Ry YW5zbGF0aW9uVGFibGVFeC5jICAgICAgfCAxMSArKysrLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2Vk LCA4IGluc2VydGlvbnMoKyksIDE0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NpbGljb24v SW50ZWwvSW50ZWxTaWxpY29uUGtnL0ZlYXR1cmUvVlRkL0ludGVsVlRkRHhlL1RyYW5zbGF0aW9u VGFibGUuYyBiL1NpbGljb24vSW50ZWwvSW50ZWxTaWxpY29uUGtnL0ZlYXR1cmUvVlRkL0ludGVs VlRkRHhlL1RyYW5zbGF0aW9uVGFibGUuYwppbmRleCBmY2ZmMDkyNWI4Li4yMDFkNjYzZDhmIDEw MDY0NAotLS0gYS9TaWxpY29uL0ludGVsL0ludGVsU2lsaWNvblBrZy9GZWF0dXJlL1ZUZC9JbnRl bFZUZER4ZS9UcmFuc2xhdGlvblRhYmxlLmMKKysrIGIvU2lsaWNvbi9JbnRlbC9JbnRlbFNpbGlj b25Qa2cvRmVhdHVyZS9WVGQvSW50ZWxWVGREeGUvVHJhbnNsYXRpb25UYWJsZS5jCkBAIC0xMjgs MTQgKzEyOCwxMSBAQCBDcmVhdGVDb250ZXh0RW50cnkgKAogDQogICAgIERFQlVHICgoREVCVUdf SU5GTywiU291cmNlOiBTJTA0eCBCJTAyeCBEJTAyeCBGJTAyeFxuIiwgbVZ0ZFVuaXRJbmZvcm1h dGlvbltWdGRJbmRleF0uU2VnbWVudCwgU291cmNlSWQuQml0cy5CdXMsIFNvdXJjZUlkLkJpdHMu RGV2aWNlLCBTb3VyY2VJZC5CaXRzLkZ1bmN0aW9uKSk7DQogDQotICAgIHN3aXRjaCAobVZ0ZFVu aXRJbmZvcm1hdGlvbltWdGRJbmRleF0uQ2FwUmVnLkJpdHMuU0FHQVcpIHsNCi0gICAgY2FzZSBC SVQxOg0KLSAgICAgIENvbnRleHRFbnRyeS0+Qml0cy5BZGRyZXNzV2lkdGggPSAweDE7DQotICAg ICAgYnJlYWs7DQotICAgIGNhc2UgQklUMjoNCi0gICAgICBDb250ZXh0RW50cnktPkJpdHMuQWRk cmVzc1dpZHRoID0gMHgyOw0KLSAgICAgIGJyZWFrOw0KKyAgICBpZiAoKG1WdGRVbml0SW5mb3Jt YXRpb25bVnRkSW5kZXhdLkNhcFJlZy5CaXRzLlNBR0FXICYgQklUMikgPT0gMCkgew0KKyAgICAg IERFQlVHKChERUJVR19FUlJPUiwgIiEhISEgNC1sZXZlbCBwYWdlLXRhYmxlIGlzIG5vdCBzdXBw b3J0ZWQgb24gVlREICVkICEhISFcbiIsIFZ0ZEluZGV4KSk7DQorICAgICAgcmV0dXJuIEVGSV9V TlNVUFBPUlRFRDsNCiAgICAgfQ0KKyAgICBDb250ZXh0RW50cnktPkJpdHMuQWRkcmVzc1dpZHRo ID0gMHgyOw0KICAgfQ0KIA0KICAgRmx1c2hQYWdlVGFibGVNZW1vcnkgKFZ0ZEluZGV4LCAoVUlO VE4pbVZ0ZFVuaXRJbmZvcm1hdGlvbltWdGRJbmRleF0uUm9vdEVudHJ5VGFibGUsIEVGSV9QQUdF U19UT19TSVpFKEVudHJ5VGFibGVQYWdlcykpOw0KZGlmZiAtLWdpdCBhL1NpbGljb24vSW50ZWwv SW50ZWxTaWxpY29uUGtnL0ZlYXR1cmUvVlRkL0ludGVsVlRkRHhlL1RyYW5zbGF0aW9uVGFibGVF eC5jIGIvU2lsaWNvbi9JbnRlbC9JbnRlbFNpbGljb25Qa2cvRmVhdHVyZS9WVGQvSW50ZWxWVGRE eGUvVHJhbnNsYXRpb25UYWJsZUV4LmMKaW5kZXggZWU4YzllM2FkMi4uZjFiZTczODg1YSAxMDA2 NDQKLS0tIGEvU2lsaWNvbi9JbnRlbC9JbnRlbFNpbGljb25Qa2cvRmVhdHVyZS9WVGQvSW50ZWxW VGREeGUvVHJhbnNsYXRpb25UYWJsZUV4LmMKKysrIGIvU2lsaWNvbi9JbnRlbC9JbnRlbFNpbGlj b25Qa2cvRmVhdHVyZS9WVGQvSW50ZWxWVGREeGUvVHJhbnNsYXRpb25UYWJsZUV4LmMKQEAgLTc4 LDE0ICs3OCwxMSBAQCBDcmVhdGVFeHRDb250ZXh0RW50cnkgKAogDQogICAgIERFQlVHICgoREVC VUdfSU5GTywiRE9NQUlOOiBTJTA0eCwgQiUwMnggRCUwMnggRiUwMnhcbiIsIG1WdGRVbml0SW5m b3JtYXRpb25bVnRkSW5kZXhdLlNlZ21lbnQsIFNvdXJjZUlkLkJpdHMuQnVzLCBTb3VyY2VJZC5C aXRzLkRldmljZSwgU291cmNlSWQuQml0cy5GdW5jdGlvbikpOw0KIA0KLSAgICBzd2l0Y2ggKG1W dGRVbml0SW5mb3JtYXRpb25bVnRkSW5kZXhdLkNhcFJlZy5CaXRzLlNBR0FXKSB7DQotICAgIGNh c2UgQklUMToNCi0gICAgICBFeHRDb250ZXh0RW50cnktPkJpdHMuQWRkcmVzc1dpZHRoID0gMHgx Ow0KLSAgICAgIGJyZWFrOw0KLSAgICBjYXNlIEJJVDI6DQotICAgICAgRXh0Q29udGV4dEVudHJ5 LT5CaXRzLkFkZHJlc3NXaWR0aCA9IDB4MjsNCi0gICAgICBicmVhazsNCisgICAgaWYgKChtVnRk VW5pdEluZm9ybWF0aW9uW1Z0ZEluZGV4XS5DYXBSZWcuQml0cy5TQUdBVyAmIEJJVDIpID09IDAp IHsNCisgICAgICBERUJVRygoREVCVUdfRVJST1IsICIhISEhIDQtbGV2ZWwgcGFnZS10YWJsZSBp cyBub3Qgc3VwcG9ydGVkIG9uIFZURCAlZCAhISEhXG4iLCBWdGRJbmRleCkpOw0KKyAgICAgIHJl dHVybiBFRklfVU5TVVBQT1JURUQ7DQogICAgIH0NCisgICAgQ29udGV4dEVudHJ5LT5CaXRzLkFk ZHJlc3NXaWR0aCA9IDB4MjsNCiAgIH0NCiANCiAgIEZsdXNoUGFnZVRhYmxlTWVtb3J5IChWdGRJ bmRleCwgKFVJTlROKW1WdGRVbml0SW5mb3JtYXRpb25bVnRkSW5kZXhdLkV4dFJvb3RFbnRyeVRh YmxlLCBFRklfUEFHRVNfVE9fU0laRShFbnRyeVRhYmxlUGFnZXMpKTsNCi0tIAoyLjIxLjAud2lu ZG93cy4xCgo= --_004_BYAPR11MB29823D87704350F0C40CF57CD0700BYAPR11MB2982namp_--