tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-23 05:34:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg/XhciDxe: Error handling enhancement for XhcExecTransfer

Browse Source 
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Feng Tian <feng.tian@intel.com>
Reviewed-by: Baraneedharan Anbazhagan <anbazhagan@hp.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17879 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Feng Tian 2015-07-08 05:54:21 +00:00 committed by erictian
parent 6a46c1a2a6
commit a40a5c08be
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
View File

@ -1027,7 +1027,7 @@ IsTransferRingTrb (
@return Whether the result of URB transfer is finialized. @return Whether the result of URB transfer is finialized.
**/ **/
EFI_STATUS BOOLEAN
XhcCheckUrbResult ( XhcCheckUrbResult (
IN USB_XHCI_INSTANCE *Xhc, IN USB_XHCI_INSTANCE *Xhc,
IN URB *Urb IN URB *Urb
@ -1058,7 +1058,6 @@ XhcCheckUrbResult (
if (XhcIsHalt (Xhc) || XhcIsSysError (Xhc)) { if (XhcIsHalt (Xhc) || XhcIsSysError (Xhc)) {
Urb->Result |= EFI_USB_ERR_SYSTEM; Urb->Result |= EFI_USB_ERR_SYSTEM;
Status = EFI_DEVICE_ERROR;
goto EXIT; goto EXIT;
} }
@ -1189,7 +1188,7 @@ EXIT:
XhcWriteRuntimeReg (Xhc, XHC_ERDP_OFFSET + 4, XHC_HIGH_32BIT (PhyAddr)); XhcWriteRuntimeReg (Xhc, XHC_ERDP_OFFSET + 4, XHC_HIGH_32BIT (PhyAddr));
} }
return Status; return Urb->Finished;
} }
@ -1219,6 +1218,7 @@ XhcExecTransfer (
UINTN Loop; UINTN Loop;
UINT8 SlotId; UINT8 SlotId;
UINT8 Dci; UINT8 Dci;
BOOLEAN Finished;
if (CmdTransfer) { if (CmdTransfer) {
SlotId = 0; SlotId = 0;
@ -1241,8 +1241,8 @@ XhcExecTransfer (
XhcRingDoorBell (Xhc, SlotId, Dci); XhcRingDoorBell (Xhc, SlotId, Dci);
for (Index = 0; Index < Loop; Index++) { for (Index = 0; Index < Loop; Index++) {
Status = XhcCheckUrbResult (Xhc, Urb); Finished = XhcCheckUrbResult (Xhc, Urb);
if (Urb->Finished) { if (Finished) {
break; break;
} }
gBS->Stall (XHC_1_MICROSECOND); gBS->Stall (XHC_1_MICROSECOND);
@ -1250,6 +1250,9 @@ XhcExecTransfer (
if (Index == Loop) { if (Index == Loop) {
Urb->Result = EFI_USB_ERR_TIMEOUT; Urb->Result = EFI_USB_ERR_TIMEOUT;
Status = EFI_TIMEOUT;
} else if (Urb->Result != EFI_USB_NOERROR) {
Status = EFI_DEVICE_ERROR;
} }
return Status; return Status;