Sync USB modules with main trunk.

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

2 files changed, 68 insertions, 28 deletions

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
index 9fbaf6b417..0b5532ec56 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
@@ -881,40 +881,71 @@ UsbEnumeratePort (
   // connect/disconnect. Other three events are: ENABLE, SUSPEND, RESET.

   // ENABLE/RESET is used to reset port. SUSPEND isn't supported.

   //

-  Status = EFI_SUCCESS;

+  

+  if (USB_BIT_IS_SET (PortState.PortChangeStatus, USB_PORT_STAT_C_OVERCURRENT)) {     

 

-  if (USB_BIT_IS_SET (PortState.PortChangeStatus, USB_PORT_STAT_C_OVERCURRENT)) {

-    //

-    // If overcurrent condition is cleared, enable the port again

-    //

-    if (!USB_BIT_IS_SET (PortState.PortStatus, USB_PORT_STAT_OVERCURRENT)) {

-      HubApi->SetPortFeature (HubIf, Port, (EFI_USB_PORT_FEATURE) USB_HUB_PORT_POWER);

+    if (USB_BIT_IS_SET (PortState.PortStatus, USB_PORT_STAT_OVERCURRENT)) {

+      //

+      // Both OverCurrent and OverCurrentChange set, means over current occurs, 

+      // which probably is caused by short circuit. It has to wait system hardware

+      // to perform recovery.

+      //

+      USB_DEBUG (("UsbEnumeratePort: Critical Over Current\n", Port));

+      return EFI_DEVICE_ERROR;

+      

+    } else {

+      //

+      // Only OverCurrentChange set, means system has been recoveried from 

+      // over current. As a result, all ports are nearly power-off, so

+      // it's necessary to detach and enumerate all ports again. 

+      //

+      USB_DEBUG (("UsbEnumeratePort: 2.0 device Recovery Over Current\n", Port)); 

+      goto ON_ENUMERATE;

+      

     }

+  }

 

-  } else if (USB_BIT_IS_SET (PortState.PortChangeStatus, USB_PORT_STAT_C_CONNECTION)) {

+  if (USB_BIT_IS_SET (PortState.PortChangeStatus, USB_PORT_STAT_C_ENABLE)) {  

     //

-    // Device connected or disconnected. Either way, if there is

-    // already a device present in the bus, need to remove it.

+    // 1.1 roothub port reg doesn't reflect over-current state, while its counterpart

+    // on 2.0 roothub does. When over-current has influence on 1.1 device, the port 

+    // would be disabled, so it's also necessary to detach and enumerate again.

     //

-    Child = UsbFindChild (HubIf, Port);

-

-    if (Child != NULL) {

-      USB_DEBUG (("UsbEnumeratePort: device at port %d removed from system\n", Port));

-      UsbRemoveDevice (Child);

-    }

+    USB_DEBUG (("UsbEnumeratePort: 1.1 device Recovery Over Current\n", Port));

+    goto ON_ENUMERATE;

+  }

+  

+  if (USB_BIT_IS_SET (PortState.PortChangeStatus, USB_PORT_STAT_C_CONNECTION)) {

+    //

+    // Device connected or disconnected normally. 

+    //

+    goto ON_ENUMERATE;

+  }

 

-    if (USB_BIT_IS_SET (PortState.PortStatus, USB_PORT_STAT_CONNECTION)) {

-      //

-      // Now, new device connected, enumerate and configure the device

-      //

-      USB_DEBUG (("UsbEnumeratePort: new device connected at port %d\n", Port));

-      Status = UsbEnumerateNewDev (HubIf, Port);

+ON_ENUMERATE:

 

-    } else {

-      USB_DEBUG (("UsbEnumeratePort: device disconnected event on port %d\n", Port));

-    }

+  // 

+  // In case there is already a device on this port logically, it's safety to remove

+  // and enumerate again.

+  //

+  Child = UsbFindChild (HubIf, Port);

+  

+  if (Child != NULL) {

+    USB_DEBUG (("UsbEnumeratePort: device at port %d removed from system\n", Port));

+    UsbRemoveDevice (Child);

   }

-

+  

+  if (USB_BIT_IS_SET (PortState.PortStatus, USB_PORT_STAT_CONNECTION)) {

+    //

+    // Now, new device connected, enumerate and configure the device 

+    //

+    USB_DEBUG (("UsbEnumeratePort: new device connected at port %d\n", Port));

+    Status = UsbEnumerateNewDev (HubIf, Port);

+  

+  } else {

+    USB_DEBUG (("UsbEnumeratePort: device disconnected event on port %d\n", Port));

+  }

+  

   HubApi->ClearPortChange (HubIf, Port);

   return Status;

 }

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/usbbus.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/usbbus.c
index c5a0604fca..096b10a831 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/usbbus.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/usbbus.c
@@ -645,11 +645,16 @@ UsbIoGetEndpointDescriptor (
 

   UsbIf  = USB_INTERFACE_FROM_USBIO (This);

 

-  if ((Descriptor == NULL) || (Index >= UsbIf->IfSetting->Desc.NumEndpoints)) {

+  if ((Descriptor == NULL) || (Index > 15)) {

     gBS->RestoreTPL (OldTpl);

     return EFI_INVALID_PARAMETER;

   }

 

+  if (Index >= UsbIf->IfSetting->Desc.NumEndpoints) {

+    gBS->RestoreTPL (OldTpl);

+    return EFI_NOT_FOUND;

+  }

+

   CopyMem (

     Descriptor,

     &(UsbIf->IfSetting->Endpoints[Index]->Desc),

@@ -813,6 +818,11 @@ UsbIoPortReset (
   UsbIf  = USB_INTERFACE_FROM_USBIO (This);

   Dev    = UsbIf->Device;

 

+  if (UsbIf->IsHub == TRUE) {

+    Status = EFI_INVALID_PARAMETER;

+    goto ON_EXIT;

+  }

+

   HubIf  = Dev->ParentIf;

   Status = HubIf->HubApi->ResetPort (HubIf, Dev->ParentPort);

 

@@ -875,7 +885,6 @@ EFI_USB_IO_PROTOCOL mUsbIoProtocol = {
   UsbIoPortReset

 };

 

-//@MT: EFI_DRIVER_ENTRY_POINT (UsbBusDriverEntryPoint)

 

 EFI_STATUS

 EFIAPI