Update USB init code to do a softreset.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10208 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Omap35xxPkg/Include/Omap3530/Omap3530Usb.h b/Omap35xxPkg/Include/Omap3530/Omap3530Usb.h
index 5ffaa9d8e4d51eadc15fc8fe42dd49ced9e6d6ec..73f7f7640f0e071633b60dbff621b92bd3c1c28f 100644 (file)
--- a/Omap35xxPkg/Include/Omap3530/Omap3530Usb.h
+++ b/Omap35xxPkg/Include/Omap3530/Omap3530Usb.h
@@ -26,6 +26,7 @@
 #define UHH_SYSCONFIG_CLOCKACTIVITY_ON      (1UL <<  8)
 #define UHH_SYSCONFIG_SIDLEMODE_NO_STANDBY  (1UL <<  3)
 #define UHH_SYSCONFIG_ENAWAKEUP_ENABLE      (1UL <<  2)
 #define UHH_SYSCONFIG_CLOCKACTIVITY_ON      (1UL <<  8)
 #define UHH_SYSCONFIG_SIDLEMODE_NO_STANDBY  (1UL <<  3)
 #define UHH_SYSCONFIG_ENAWAKEUP_ENABLE      (1UL <<  2)

+#define UHH_SYSCONFIG_SOFTRESET             (1UL <<  1)

 #define UHH_SYSCONFIG_AUTOIDLE_ALWAYS_RUN   (0UL <<  0)
 
 #define UHH_HOSTCONFIG_P3_CONNECT_STATUS_DISCONNECT (0UL << 10)
 #define UHH_SYSCONFIG_AUTOIDLE_ALWAYS_RUN   (0UL <<  0)
 
 #define UHH_HOSTCONFIG_P3_CONNECT_STATUS_DISCONNECT (0UL << 10)

diff --git a/Omap35xxPkg/PciEmulation/PciEmulation.c b/Omap35xxPkg/PciEmulation/PciEmulation.c
index bdba40353f52c59336aa430b00bf33f4a56ae2e4..3e49f8a1bc93042f14415ca3f8863b2d14980950 100644 (file)
--- a/Omap35xxPkg/PciEmulation/PciEmulation.c
+++ b/Omap35xxPkg/PciEmulation/PciEmulation.c
@@ -62,6 +62,12 @@ ConfigureUSBHost (
   EFI_STATUS Status;
   UINT8      Data = 0;
 
   EFI_STATUS Status;
   UINT8      Data = 0;
 

+  // Do a softreset 
+  MmioOr32 (UHH_SYSCONFIG, UHH_SYSCONFIG_SOFTRESET);
+  // When the bit clears reset is complete
+  while ((MmioRead32 (UHH_SYSCONFIG) & UHH_SYSCONFIG_SOFTRESET) == UHH_SYSCONFIG_SOFTRESET);
+
+

   // Take USB host out of force-standby mode
   MmioWrite32 (UHH_SYSCONFIG, UHH_SYSCONFIG_MIDLEMODE_NO_STANDBY
                              | UHH_SYSCONFIG_CLOCKACTIVITY_ON
   // Take USB host out of force-standby mode
   MmioWrite32 (UHH_SYSCONFIG, UHH_SYSCONFIG_MIDLEMODE_NO_STANDBY
                              | UHH_SYSCONFIG_CLOCKACTIVITY_ON