From nobody Thu May 9 13:20:19 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+94030+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+94030+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=kunluntech.com.cn ARC-Seal: i=1; a=rsa-sha256; t=1663730141; cv=none; d=zohomail.com; s=zohoarc; b=YXi38DhSZx/Tq+1vxNg+Z7is+nfedfG6/+RFiHsBHy5JzvAVc/pwwex1TLT93YshOU7Cygb7s4Mq59O/Av+rIZrs/ME4FkaCp7H2w3SXmH1LaePPfFooMhsutJzGQK3xNf0ocdGzWedwbQDWQi3kthJhagM65TL6lqnBeJ3CUDE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663730141; h=Content-Type:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=Cj074XISAVvVXy8R2RoyaxJK9pcEeQHUuMJT1rv3n1c=; b=eEt2JN7/7Q/fqfk7hf5tcmjLV7e5jn/TNDC00QWXwxtrngQxCey7azskh5E2wc+XbJVirsszRP5HHccFsEQaBLDXOf+PEMBX/Bd1nVttuWJNaJT7XzWgpXFCvqzFtd7nH1mzGiBD6Hl2XSukw6IbYyWxo3IMZb7jbq3d8hR5eSU= 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+94030+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 1663730141375644.6145634130921; Tue, 20 Sep 2022 20:15:41 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id pyGEYY1788612xzksu0Ac524; Tue, 20 Sep 2022 20:15:41 -0700 Subject: [edk2-devel] [PATCH] REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4074 To: devel@edk2.groups.io From: "Jiading Zhang" X-Originating-Location: Tokyo, JP (192.109.233.224) X-Originating-Platform: Windows Chrome 105 User-Agent: GROUPS.IO Web Poster MIME-Version: 1.0 Date: Tue, 20 Sep 2022 20:15:40 -0700 Message-ID: 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,jdzhang@kunluntech.com.cn X-Gm-Message-State: 145D3vVbAwin2ryC7hcnCb8zx1787277AA= Content-Type: multipart/alternative; boundary="DEHup7GUCOkVJOYO6cgM" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1663730141; bh=L7pguX4WyLbjFG+M8H3ZV+EFhnxkHWauEmH2Tb7cfeY=; h=Content-Type:Date:From:Reply-To:Subject:To; b=m4XFBeD3grqledzYmcEkyJTSpmZjEqwHfRNzgsEykLjoB2ZgmrMKh235thvRXCpqSq9 oSPmtKBdqbk81UwamdW/YV7TwvyRQ14jTOvRBpNslBlKzhBPVemhTrI+ViKP+6BjeIMdY dPt/vJokXfXM2Jy+JyBWyKYTJQGOTmbk1t4= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1663730142359100001 --DEHup7GUCOkVJOYO6cgM Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Update XhcEvaluateContext/XhcEvaluateContext64 to properly initialize the i= nput context for Evaluate Context command. Signed-off-by: jdzhang Reviewed-by: Hao A Wu > Reviewed-by: Hao A Wu --- MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c b/MdeModulePkg/Bus/Pc= i/XhciDxe/XhciSched.c index c2906e06fd..4f2e9c3f6b 100644 --- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c +++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c @@ -3957,6 +3957,7 @@ XhcEvaluateContext ( CMD_TRB_EVALUATE_CONTEXT=C2=A0 =C2=A0 CmdTrbEvalu; EVT_TRB_COMMAND_COMPLETION=C2=A0 *EvtTrb; INPUT_CONTEXT=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*InputC= ontext; +=C2=A0 DEVICE_CONTEXT=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 *Out= putContext; EFI_PHYSICAL_ADDRESS=C2=A0 =C2=A0 =C2=A0 =C2=A0 PhyAddr; ASSERT (Xhc->UsbDevContext[SlotId].SlotId !=3D 0); @@ -3965,10 +3966,14 @@ XhcEvaluateContext ( // 4.6.7 Evaluate Context // InputContext =3D Xhc->UsbDevContext[SlotId].InputContext; +=C2=A0 OutputContext =3D Xhc->UsbDevContext[SlotId].OutputContext; ZeroMem (InputContext, sizeof (INPUT_CONTEXT)); +=C2=A0 CopyMem (&InputContext->EP[0], &OutputContext->EP[0], sizeof (ENDPO= INT_CONTEXT)); + InputContext->InputControlContext.Dword2 |=3D BIT1; InputContext->EP[0].MaxPacketSize=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=3D MaxP= acketSize; +=C2=A0 InputContext->EP[0].EPState=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0=3D 0; ZeroMem (&CmdTrbEvalu, sizeof (CmdTrbEvalu)); PhyAddr=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =3D UsbHcGetPciAddr= ForHostAddr (Xhc->MemPool, InputContext, sizeof (INPUT_CONTEXT)); @@ -4013,6 +4018,7 @@ XhcEvaluateContext64 ( CMD_TRB_EVALUATE_CONTEXT=C2=A0 =C2=A0 CmdTrbEvalu; EVT_TRB_COMMAND_COMPLETION=C2=A0 *EvtTrb; INPUT_CONTEXT_64=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 *InputContext; +=C2=A0 DEVICE_CONTEXT_64=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*OutputCo= ntext; EFI_PHYSICAL_ADDRESS=C2=A0 =C2=A0 =C2=A0 =C2=A0 PhyAddr; ASSERT (Xhc->UsbDevContext[SlotId].SlotId !=3D 0); @@ -4021,10 +4027,14 @@ XhcEvaluateContext64 ( // 4.6.7 Evaluate Context // InputContext =3D Xhc->UsbDevContext[SlotId].InputContext; +=C2=A0 OutputContext =3D Xhc->UsbDevContext[SlotId].OutputContext; ZeroMem (InputContext, sizeof (INPUT_CONTEXT_64)); +=C2=A0 CopyMem (&InputContext->EP[0], &OutputContext->EP[0], sizeof (ENDPO= INT_CONTEXT_64)); + InputContext->InputControlContext.Dword2 |=3D BIT1; InputContext->EP[0].MaxPacketSize=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=3D MaxP= acketSize; +=C2=A0 InputContext->EP[0].EPState=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0=3D 0; ZeroMem (&CmdTrbEvalu, sizeof (CmdTrbEvalu)); PhyAddr=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =3D UsbHcGetPciAddr= ForHostAddr (Xhc->MemPool, InputContext, sizeof (INPUT_CONTEXT_64)); -- 2.20.1.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 (#94030): https://edk2.groups.io/g/devel/message/94030 Mute This Topic: https://groups.io/mt/93819720/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- --DEHup7GUCOkVJOYO6cgM Content-Type: text/html; charset="utf-8" Content-Transfer-Encoding: quoted-printable
Update XhcEvaluateContext/XhcEvaluateContext64 to properly initialize = the input context for Evaluate Context command.
 
Signed-off-by: jdzhang <jdzhang@kunluntech.com.cn>
---
 MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
 
diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c b/MdeModulePkg/B= us/Pci/XhciDxe/XhciSched.c
index c2906e06fd..4f2e9c3f6b 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
@@ -3957,6 +3957,7 @@ XhcEvaluateContext (
   CMD_TRB_EVALUATE_CONTEXT    CmdTrbEvalu;
   EVT_TRB_COMMAND_COMPLETION  *EvtTrb;
   INPUT_CONTEXT            &n= bsp;  *InputContext;
+  DEVICE_CONTEXT             = *OutputContext;
   EFI_PHYSICAL_ADDRESS        PhyAddr;<= /div>
 
   ASSERT (Xhc->UsbDevContext[SlotId].SlotId !=3D 0);
@@ -3965,10 +3966,14 @@ XhcEvaluateContext (
   // 4.6.7 Evaluate Context
   //
   InputContext =3D Xhc->UsbDevContext[SlotId].InputConte= xt;
+  OutputContext =3D Xhc->UsbDevContext[SlotId].OutputContext;=
   ZeroMem (InputContext, sizeof (INPUT_CONTEXT));
 
+  CopyMem (&InputContext->EP[0], &OutputContext->E= P[0], sizeof (ENDPOINT_CONTEXT));
+  
   InputContext->InputControlContext.Dword2 |=3D BIT1;
   InputContext->EP[0].MaxPacketSize      =    =3D MaxPacketSize;
+  InputContext->EP[0].EPState        &nbs= p;      =3D 0;
 
   ZeroMem (&CmdTrbEvalu, sizeof (CmdTrbEvalu));
   PhyAddr              = =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, InputContext, sizeof (INPU= T_CONTEXT));
@@ -4013,6 +4018,7 @@ XhcEvaluateContext64 (
   CMD_TRB_EVALUATE_CONTEXT    CmdTrbEvalu;
   EVT_TRB_COMMAND_COMPLETION  *EvtTrb;
   INPUT_CONTEXT_64           = *InputContext;
+  DEVICE_CONTEXT_64           *Out= putContext;
   EFI_PHYSICAL_ADDRESS        PhyAddr;<= /div>
 
   ASSERT (Xhc->UsbDevContext[SlotId].SlotId !=3D 0);
@@ -4021,10 +4027,14 @@ XhcEvaluateContext64 (
   // 4.6.7 Evaluate Context
   //
   InputContext =3D Xhc->UsbDevContext[SlotId].InputConte= xt;
+  OutputContext =3D Xhc->UsbDevContext[SlotId].OutputContext;=
   ZeroMem (InputContext, sizeof (INPUT_CONTEXT_64));
 
+  CopyMem (&InputContext->EP[0], &OutputContext->E= P[0], sizeof (ENDPOINT_CONTEXT_64));
+
   InputContext->InputControlContext.Dword2 |=3D BIT1;
   InputContext->EP[0].MaxPacketSize      =    =3D MaxPacketSize;
+  InputContext->EP[0].EPState        &nbs= p;      =3D 0;
 
   ZeroMem (&CmdTrbEvalu, sizeof (CmdTrbEvalu));
   PhyAddr              = =3D UsbHcGetPciAddrForHostAddr (Xhc->MemPool, InputContext, sizeof (INPU= T_CONTEXT_64));
-- 
2.20.1.windows.1
 
_._,_._,_
G= roups.io Links:

You receive all messages sent to this group.

Vi= ew/Reply Online (#94030) | | Mute This Topic | New Topic
Your Subscription | Contact Group Owner | Unsubscribe [importer@patchew.org]
_._,_._,_

=20 --DEHup7GUCOkVJOYO6cgM--