[PATCH] REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4074

["Jiading Zhang" <jdzhang@kunluntech.com.cn>]

[-- Attachment #1: Type: text/plain, Size: 2543 bytes --]

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/Bus/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               *InputContext;
+  DEVICE_CONTEXT              *OutputContext;
EFI_PHYSICAL_ADDRESS        PhyAddr;

ASSERT (Xhc->UsbDevContext[SlotId].SlotId != 0);
@@ -3965,10 +3966,14 @@ XhcEvaluateContext (
// 4.6.7 Evaluate Context
//
InputContext = Xhc->UsbDevContext[SlotId].InputContext;
+  OutputContext = Xhc->UsbDevContext[SlotId].OutputContext;
ZeroMem (InputContext, sizeof (INPUT_CONTEXT));

+  CopyMem (&InputContext->EP[0], &OutputContext->EP[0], sizeof (ENDPOINT_CONTEXT));
+
InputContext->InputControlContext.Dword2 |= BIT1;
InputContext->EP[0].MaxPacketSize         = MaxPacketSize;
+  InputContext->EP[0].EPState               = 0;

ZeroMem (&CmdTrbEvalu, sizeof (CmdTrbEvalu));
PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, InputContext, sizeof (INPUT_CONTEXT));
@@ -4013,6 +4018,7 @@ XhcEvaluateContext64 (
CMD_TRB_EVALUATE_CONTEXT    CmdTrbEvalu;
EVT_TRB_COMMAND_COMPLETION  *EvtTrb;
INPUT_CONTEXT_64            *InputContext;
+  DEVICE_CONTEXT_64           *OutputContext;
EFI_PHYSICAL_ADDRESS        PhyAddr;

ASSERT (Xhc->UsbDevContext[SlotId].SlotId != 0);
@@ -4021,10 +4027,14 @@ XhcEvaluateContext64 (
// 4.6.7 Evaluate Context
//
InputContext = Xhc->UsbDevContext[SlotId].InputContext;
+  OutputContext = Xhc->UsbDevContext[SlotId].OutputContext;
ZeroMem (InputContext, sizeof (INPUT_CONTEXT_64));

+  CopyMem (&InputContext->EP[0], &OutputContext->EP[0], sizeof (ENDPOINT_CONTEXT_64));
+
InputContext->InputControlContext.Dword2 |= BIT1;
InputContext->EP[0].MaxPacketSize         = MaxPacketSize;
+  InputContext->EP[0].EPState               = 0;

ZeroMem (&CmdTrbEvalu, sizeof (CmdTrbEvalu));
PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, InputContext, sizeof (INPUT_CONTEXT_64));
--
2.20.1.windows.1

[-- Attachment #2: Type: text/html, Size: 4067 bytes --]