From c12bbc14900aa5c70eec8c0576757c2182db3d01 Mon Sep 17 00:00:00 2001 From: Xianglei Cai Date: Tue, 7 May 2024 09:19:32 +0800 Subject: [PATCH] MdeModulePkg/XhciDxe: Reset endpoint while USB Transaction error https://bugzilla.tianocore.org/show_bug.cgi?id=4556 Based on XHCI spec 4.8.3, software should do the reset endpoint while USB Transaction occur. Add the error code for USB Transaction error since UEFI spec don't have the related definition. Cc: Ray Ni Cc: Liming Gao Cc: Krzysztof Lewandowski Cc: Jenny Huang Cc: More Shih Signed-off-by: Xianglei Cai Reviewed-by: Krzysztof Lewandowski Reviewed-by: Liming Gao --- MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c | 5 ++++- MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c | 5 ++++- MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.h | 7 +++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c index f4e61d223c..cf6b32959e 100644 --- a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c +++ b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c @@ -825,7 +825,10 @@ XhcTransfer ( *TransferResult = Urb->Result; *DataLength = Urb->Completed; - if ((*TransferResult == EFI_USB_ERR_STALL) || (*TransferResult == EFI_USB_ERR_BABBLE)) { + // + // Based on XHCI spec 4.8.3, software should do the reset endpoint while USB Transaction occur. + // + if ((*TransferResult == EFI_USB_ERR_STALL) || (*TransferResult == EFI_USB_ERR_BABBLE) || (*TransferResult == EDKII_USB_ERR_TRANSACTION)) { ASSERT (Status == EFI_DEVICE_ERROR); RecoveryStatus = XhcRecoverHaltedEndpoint (Xhc, Urb); if (EFI_ERROR (RecoveryStatus)) { diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c index 5d735008ba..a97ed44dbf 100644 --- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c +++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c @@ -1192,8 +1192,11 @@ XhcCheckUrbResult ( DEBUG ((DEBUG_ERROR, "XhcCheckUrbResult: ERR_BUFFER! Completecode = %x\n", EvtTrb->Completecode)); goto EXIT; + // + // Based on XHCI spec 4.8.3, software should do the reset endpoint while USB Transaction occur. + // case TRB_COMPLETION_USB_TRANSACTION_ERROR: - CheckedUrb->Result |= EFI_USB_ERR_TIMEOUT; + CheckedUrb->Result |= EDKII_USB_ERR_TRANSACTION; CheckedUrb->Finished = TRUE; DEBUG ((DEBUG_ERROR, "XhcCheckUrbResult: TRANSACTION_ERROR! Completecode = %x\n", EvtTrb->Completecode)); goto EXIT; diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.h b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.h index 7c85f7993b..e606e212a1 100644 --- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.h +++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.h @@ -78,6 +78,13 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #define TRB_COMPLETION_STOPPED 26 #define TRB_COMPLETION_STOPPED_LENGTH_INVALID 27 +// +// USB Transfer Results Internal Definition +// Based on XHCI spec 4.8.3, software should do the reset endpoint while USB Transaction occur. +// Add the error code for USB Transaction error since UEFI spec don't have the related definition. +// +#define EDKII_USB_ERR_TRANSACTION 0x200 + // // The topology string used to present usb device location //