Update UHCI and ECHI drivers to both Stop and Reset the host controller at ExitBootSe...

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

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
index 238766c56cba84a2b8310c1268276144b8c808ea..87e4aa079ba89af0d69466d9721d3ca0f259887a 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
@@ -1476,11 +1476,9 @@ EhcExitBootService (
   Ehc = (USB2_HC_DEV *) Context;\r
 \r
   //\r
-  // Stop the Host Controller\r
+  // Reset the Host Controller\r
   //\r
-  EhcHaltHC (Ehc, EHC_GENERIC_TIMEOUT);\r
-\r
-  return;\r
+  EhcResetHC (Ehc, EHC_RESET_TIMEOUT);\r
 }\r
 \r
 \r

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c
index 92567f93e48d565bd626fbfa84b1bfd68fa8af40..beea8f32d651ec9b411fd8065d4d7fcb19325837 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c
@@ -1588,7 +1588,11 @@ UhcExitBootService (
   //\r
   UhciStopHc (Uhc, UHC_GENERIC_TIMEOUT);\r
 \r
-  return;\r
+  //\r
+  // Reset the Host Controller\r
+  //\r
+  UhciSetRegBit (Uhc->PciIo, USBCMD_OFFSET, USBCMD_HCRESET);\r
+  gBS->Stall (UHC_ROOT_PORT_RECOVERY_STALL);\r
 }\r
 \r
 /**\r