if (EFI_ERROR(RecoveryStatus)) {\r
DEBUG((EFI_D_ERROR, "XhcPeiControlTransfer: XhcPeiDequeueTrbFromEndpoint failed\n"));\r
}\r
- goto FREE_URB;\r
+ XhcPeiFreeUrb (Xhc, Urb);\r
+ goto ON_EXIT;\r
} else {\r
if (*TransferResult == EFI_USB_NOERROR) {\r
Status = EFI_SUCCESS;\r
DEBUG ((EFI_D_ERROR, "XhcPeiControlTransfer: XhcPeiRecoverHaltedEndpoint failed\n"));\r
}\r
Status = EFI_DEVICE_ERROR;\r
- goto FREE_URB;\r
+ XhcPeiFreeUrb (Xhc, Urb);\r
+ goto ON_EXIT;\r
} else {\r
- goto FREE_URB;\r
+ XhcPeiFreeUrb (Xhc, Urb);\r
+ goto ON_EXIT;\r
}\r
}\r
+ //\r
+ // Unmap data before consume.\r
+ //\r
+ XhcPeiFreeUrb (Xhc, Urb);\r
\r
//\r
// Hook Get_Descriptor request from UsbBus as we need evaluate context and configure endpoint.\r
Xhc->UsbDevContext[SlotId].ConfDesc = AllocateZeroPool (Xhc->UsbDevContext[SlotId].DevDesc.NumConfigurations * sizeof (EFI_USB_CONFIG_DESCRIPTOR *));\r
if (Xhc->UsbDevContext[SlotId].ConfDesc == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
- goto FREE_URB;\r
+ goto ON_EXIT;\r
}\r
if (Xhc->HcCParams.Data.Csz == 0) {\r
Status = XhcPeiEvaluateContext (Xhc, SlotId, MaxPacket0);\r
Xhc->UsbDevContext[SlotId].ConfDesc[Index] = AllocateZeroPool (*DataLength);\r
if (Xhc->UsbDevContext[SlotId].ConfDesc[Index] == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
- goto FREE_URB;\r
+ goto ON_EXIT;\r
}\r
CopyMem (Xhc->UsbDevContext[SlotId].ConfDesc[Index], Data, *DataLength);\r
}\r
*(UINT32 *) Data = *(UINT32 *) &PortStatus;\r
}\r
\r
-FREE_URB:\r
- XhcPeiFreeUrb (Xhc, Urb);\r
-\r
ON_EXIT:\r
\r
if (EFI_ERROR (Status)) {\r
return EFI_SUCCESS;\r
}\r
\r
+/**\r
+ One notified function to stop the Host Controller at the end of PEI\r
+\r
+ @param[in] PeiServices Pointer to PEI Services Table.\r
+ @param[in] NotifyDescriptor Pointer to the descriptor for the Notification event that\r
+ caused this function to execute.\r
+ @param[in] Ppi Pointer to the PPI data associated with this function.\r
+\r
+ @retval EFI_SUCCESS The function completes successfully\r
+ @retval others\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+XhcEndOfPei (\r
+ IN EFI_PEI_SERVICES **PeiServices,\r
+ IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDescriptor,\r
+ IN VOID *Ppi\r
+ )\r
+{\r
+ PEI_XHC_DEV *Xhc;\r
+\r
+ Xhc = PEI_RECOVERY_USB_XHC_DEV_FROM_THIS_NOTIFY(NotifyDescriptor);\r
+\r
+ XhcPeiHaltHC (Xhc, XHC_GENERIC_TIMEOUT);\r
+\r
+ return EFI_SUCCESS;\r
+}\r
+\r
/**\r
@param FileHandle Handle of the file being invoked.\r
@param PeiServices Describes the list of possible PEI Services.\r
return EFI_SUCCESS;\r
}\r
\r
+ IoMmuInit ();\r
+\r
Status = PeiServicesLocatePpi (\r
&gPeiUsbControllerPpiGuid,\r
0,\r
XhcDev->PpiDescriptor.Guid = &gPeiUsb2HostControllerPpiGuid;\r
XhcDev->PpiDescriptor.Ppi = &XhcDev->Usb2HostControllerPpi;\r
\r
+ XhcDev->EndOfPeiNotifyList.Flags = (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST);\r
+ XhcDev->EndOfPeiNotifyList.Guid = &gEfiEndOfPeiSignalPpiGuid;\r
+ XhcDev->EndOfPeiNotifyList.Notify = XhcEndOfPei;\r
+\r
PeiServicesInstallPpi (&XhcDev->PpiDescriptor);\r
+ PeiServicesNotifyPpi (&XhcDev->EndOfPeiNotifyList);\r
\r
Index++;\r
}\r