<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40"> <head> <meta http-equiv="Content-Type" content="text/html; charset=us-ascii"> <meta name="Generator" content="Microsoft Word 15 (filtered medium)"> <style></style> </head> <body lang="EN-US" link="#0563C1" vlink="#954F72"> <div class="WordSection1"> Paul: <o:p></o:p> This patch is missing to be merged. <o:p></o:p> <o:p> </o:p> Lorena: <o:p></o:p> I can’t extract the patch from the mail. Can you send the patch to me? I can help merge it. <o:p></o:p> <o:p> </o:p> Thanks<o:p></o:p> Liming<o:p></o:p> <div> <div style="border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0in 0in 0in"> From: devel@edk2.groups.io <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 <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<o:p></o:p> </div> </div> <o:p> </o:p> Hello,<o:p></o:p> <o:p> </o:p> It seems this did not get checked in. Is there 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.<o:p></o:p> <o:p> </o:p> <div> Paul A. Lohr – Server Firmware Enabling<o:p></o:p> 512.239.9073 (cell)<o:p></o:p> 512.794.5044 (work)<o:p></o:p> </div> <o:p> </o:p> <div> <div style="border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0in 0in 0in"> From: <a href="mailto:devel@edk2.groups.io">devel@edk2.groups.io</a> <<a href="mailto:devel@edk2.groups.io">devel@edk2.groups.io</a>> On Behalf Of Yao, Jiewen Sent: Monday, March 2, 2020 5:46 PM To: De Leon Vazquez, Lorena R <<a href="mailto:lorena.r.de.leon.vazquez@intel.com">lorena.r.de.leon.vazquez@intel.com</a>>; <a href="mailto:devel@edk2.groups.io">devel@edk2.groups.io</a> Cc: Kinney, Michael D <<a href="mailto:michael.d.kinney@intel.com">michael.d.kinney@intel.com</a>> Subject: Re: [edk2-devel] [edk2-platforms] [PATCH] IntelSiliconPkg: IOMMU generic bug fix<o:p></o:p> </div> </div> <o:p> </o:p> Reviewed-by: <a href="mailto:jiewen.yao@intel.com">jiewen.yao@intel.com</a><o:p></o:p> <o:p> </o:p> <div style="border:none;border-left:solid blue 1.5pt;padding:0in 0in 0in 4.0pt"> <div> <div style="border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0in 0in 0in"> From: De Leon Vazquez, Lorena R <<a href="mailto:lorena.r.de.leon.vazquez@intel.com">lorena.r.de.leon.vazquez@intel.com</a>> Sent: Tuesday, March 3, 2020 7:04 AM To: <a href="mailto:devel@edk2.groups.io">devel@edk2.groups.io</a> Cc: Yao, Jiewen <<a href="mailto:jiewen.yao@intel.com">jiewen.yao@intel.com</a>>; Kinney, Michael D <<a href="mailto:michael.d.kinney@intel.com">michael.d.kinney@intel.com</a>> Subject: [edk2-platforms] [PATCH] IntelSiliconPkg: IOMMU generic bug fix <o:p> </o:p> </div> </div> <o:p> </o:p> Looks like Addresswidth is BIT wise values. Right now these values are not used any<o:p></o:p> <o:p> </o:p> Suggested-by: Star Zeng <a href="mailto:star.zeng@intel.com">star.zeng@intel.com</a><o:p></o:p> Signed-off-by: <a href="mailto:lorena.r.de.leon.vazquez@intel.com">lorena.r.de.leon.vazquez@intel.com</a> <o:p></o:p> <o:p> </o:p> --<o:p></o:p> .../Feature/VTd/IntelVTdDxe/TranslationTable.c | 11 ++++-------<o:p></o:p> .../Feature/VTd/IntelVTdDxe/TranslationTableEx.c | 11 ++++-------<o:p></o:p> 2 files changed, 8 insertions(+), 14 deletions(-)<o:p></o:p> <o:p> </o:p> diff --git a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/TranslationTable.c b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/TranslationTable.c<o:p></o:p> index cc970c0..61fbb4a 100644<o:p></o:p> --- a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/TranslationTable.c<o:p></o:p> +++ b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/TranslationTable.c<o:p></o:p> @@ -128,14 +128,11 @@ CreateContextEntry (<o:p></o:p> <o:p> </o:p> DEBUG ((DEBUG_INFO,"Source: S%04x B%02x D%02x F%02x\n", mVtdUnitInformation[VtdIndex].Segment, SourceId.Bits.Bus, SourceId.Bits.Device, SourceId.Bits.Function));<o:p></o:p> <o:p> </o:p> - switch (mVtdUnitInformation[VtdIndex].CapReg.Bits.SAGAW) {<o:p></o:p> - case BIT1:<o:p></o:p> - ContextEntry->Bits.AddressWidth = 0x1;<o:p></o:p> - break;<o:p></o:p> - case BIT2:<o:p></o:p> - ContextEntry->Bits.AddressWidth = 0x2;<o:p></o:p> - break;<o:p></o:p> + if ((mVtdUnitInformation[VtdIndex].CapReg.Bits.SAGAW & BIT2) == 0) {<o:p></o:p> + DEBUG((DEBUG_ERROR, "!!!! 4-level page-table is not supported on VTD %d !!!!\n", VtdIndex));<o:p></o:p> + return error;<o:p></o:p> }<o:p></o:p> + ContextEntry->Bits.AddressWidth = 0x2;<o:p></o:p> }<o:p></o:p> <o:p> </o:p> FlushPageTableMemory (VtdIndex, (UINTN)mVtdUnitInformation[VtdIndex].RootEntryTable, EFI_PAGES_TO_SIZE(EntryTablePages));<o:p></o:p> diff --git a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/TranslationTableEx.c b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/TranslationTableEx.c<o:p></o:p> index 0da1611..6bd31b7 100644<o:p></o:p> --- a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/TranslationTableEx.c<o:p></o:p> +++ b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/TranslationTableEx.c<o:p></o:p> @@ -78,14 +78,11 @@ CreateExtContextEntry (<o:p></o:p> <o:p> </o:p> DEBUG ((DEBUG_INFO,"DOMAIN: S%04x, B%02x D%02x F%02x\n", mVtdUnitInformation[VtdIndex].Segment, SourceId.Bits.Bus, SourceId.Bits.Device, SourceId.Bits.Function));<o:p></o:p> <o:p> </o:p> - switch (mVtdUnitInformation[VtdIndex].CapReg.Bits.SAGAW) {<o:p></o:p> - case BIT1:<o:p></o:p> - ExtContextEntry->Bits.AddressWidth = 0x1;<o:p></o:p> - break;<o:p></o:p> - case BIT2:<o:p></o:p> - ExtContextEntry->Bits.AddressWidth = 0x2;<o:p></o:p> - break;<o:p></o:p> + if ((mVtdUnitInformation[VtdIndex].CapReg.Bits.SAGAW & BIT2) == 0) {<o:p></o:p> + DEBUG((DEBUG_ERROR, "!!!! 4-level page-table is not supported on VTD %d !!!!\n", VtdIndex));<o:p></o:p> + return error;<o:p></o:p> }<o:p></o:p> + ContextEntry->Bits.AddressWidth = 0x2;<o:p></o:p> }<o:p></o:p> <o:p> </o:p> FlushPageTableMemory (VtdIndex, (UINTN)mVtdUnitInformation[VtdIndex].ExtRootEntryTable, EFI_PAGES_TO_SIZE(EntryTablePages));<o:p></o:p> -- <o:p></o:p> 2.21.0.windows.1<o:p></o:p> <o:p> </o:p> </div> <div> </o:p> </div> </div> </body> </html> <div width="1" style="color:white;clear:both">_._,_._,_</div> <hr> Groups.io Links: You receive all messages sent to this group. <a target="_blank" href="https://edk2.groups.io/g/devel/message/62002">View/Reply Online (#62002)</a> | | <a target="_blank" href="https://groups.io/mt/71688474/1813853">Mute This Topic</a> | <a href="https://edk2.groups.io/g/devel/post">New Topic</a> <a href="https://edk2.groups.io/g/devel/editsub/1813853">Your Subscription</a> | <a href="mailto:devel+owner@edk2.groups.io">Contact Group Owner</a> | <a href="https://edk2.groups.io/g/devel/unsub">Unsubscribe</a> [edk2-devel-archive@redhat.com] <div width="1" style="color:white;clear:both">_._,_._,_</div>