MdeModulePkg/PciHostBridge: Add IOMMU support.

[mirror_edk2.git] / MdeModulePkg / Bus / Pci / EhciPei / EhcPeim.c

diff --git a/MdeModulePkg/Bus/Pci/EhciPei/EhcPeim.c b/MdeModulePkg/Bus/Pci/EhciPei/EhcPeim.c
index 6c179b093584f459273edff1e5171227427c1feb..31647ff0525cb546a6dc9a880edc031e70254e54 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciPei/EhcPeim.c
+++ b/MdeModulePkg/Bus/Pci/EhciPei/EhcPeim.c
@@ -2,7 +2,7 @@
 PEIM to produce gPeiUsb2HostControllerPpiGuid based on gPeiUsbControllerPpiGuid\r
 which is used to enable recovery function from USB Drivers.\r
 \r
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>\r
   \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
@@ -400,6 +400,34 @@ EhcRunHC (
   return Status;\r
 }\r
 \r
+/**\r
+  Power On All EHCI Ports.\r
+  \r
+  @param  Ehc             The EHCI device.\r
+\r
+**/\r
+VOID\r
+EhcPowerOnAllPorts (\r
+  IN PEI_USB2_HC_DEV          *Ehc\r
+  )\r
+{\r
+  UINT8     PortNumber;\r
+  UINT8     Index;\r
+  UINT32    RegVal;\r
+  \r
+  PortNumber = (UINT8)(Ehc->HcStructParams & HCSP_NPORTS);\r
+  for (Index = 0; Index < PortNumber; Index++) {\r
+    //\r
+    // Do not clear port status bits on initialization.  Otherwise devices will\r
+    // not enumerate properly at startup.\r
+    //\r
+    RegVal  = EhcReadOpReg(Ehc, EHC_PORT_STAT_OFFSET + 4 * Index);\r
+    RegVal &= ~PORTSC_CHANGE_MASK;\r
+    RegVal |= PORTSC_POWER;\r
+    EhcWriteOpReg (Ehc, EHC_PORT_STAT_OFFSET + 4 * Index, RegVal);\r
+  }\r
+}\r
+\r
 /**\r
   Initialize the HC hardware. \r
   EHCI spec lists the five things to do to initialize the hardware.\r
@@ -443,6 +471,9 @@ EhcInitHC (
   if (Ehc->Urb  == NULL) {\r
     return Status;\r
   }\r
+\r
+  EhcPowerOnAllPorts (Ehc);  \r
+  MicroSecondDelay (EHC_ROOT_PORT_RECOVERY_STALL);\r
   \r
   Status = EhcInitSched (Ehc);\r
 \r
@@ -509,6 +540,8 @@ EhcInitHC (
                                 the subsequent bulk transfer.\r
   @param  TimeOut               Indicates the maximum time, in millisecond, which the\r
                                 transfer is allowed to complete.\r
+                                If Timeout is 0, then the caller must wait for the function\r
+                                to be completed until EFI_SUCCESS or EFI_DEVICE_ERROR is returned.\r
   @param  Translator            A pointr to the transaction translator data.                                \r
   @param  TransferResult        A pointer to the detailed result information of the\r
                                 bulk transfer.\r
@@ -972,6 +1005,8 @@ ON_EXIT:
   @param  Data                   Data buffer to be transmitted or received from USB device.\r
   @param  DataLength             The size (in bytes) of the data buffer.\r
   @param  TimeOut                Indicates the maximum timeout, in millisecond.\r
+                                 If Timeout is 0, then the caller must wait for the function\r
+                                 to be completed until EFI_SUCCESS or EFI_DEVICE_ERROR is returned.\r
   @param  Translator             Transaction translator to be used by this device.\r
   @param  TransferResult         Return the result of this control transfer.\r
 \r