Changeset 58459 in vbox for trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c

Timestamp:

Oct 28, 2015 8:17:18 PM (9 years ago)

Author:

vboxsync

Message:

EFI/Firmware: 'svn merge ^{/vendor/edk2/UDK2010.SR1} /vendor/edk2/current .', reverting and removing files+dirs listed in ReadMe.vbox, resolving conflicts with help from ../UDK2014.SP1/. This is a raw untested merge.

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• . (modified) (1 prop)
• MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c (modified) (12 diffs)

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c

@@ -3 +3 @@
   The UHCI driver model and HC protocol routines.
 
-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
@@ -54 +54 @@
   }
 
-  Uhc     = UHC_FROM_USB2_HC_PROTO (This);
+  Uhc = UHC_FROM_USB2_HC_PROTO (This);
+
+  if (Uhc->DevicePath != NULL) {
+    //
+    // Report Status Code to indicate reset happens
+    //
+    REPORT_STATUS_CODE_WITH_DEVICE_PATH (
+      EFI_PROGRESS_CODE,
+      (EFI_IO_BUS_USB | EFI_IOB_PC_RESET),
+      Uhc->DevicePath
+      );
+  }
 
   OldTpl  = gBS->RaiseTPL (UHCI_TPL);
@@ -1419 +1430 @@
 
   @param  PciIo                  The PCIIO to use.
+  @param  DevicePath             The device path of host controller.
   @param  OriginalPciAttributes  The original PCI attributes.
 
@@ -1426 +1438 @@
 USB_HC_DEV *
 UhciAllocateDev (
-  IN EFI_PCI_IO_PROTOCOL    *PciIo,
-  IN UINT64                 OriginalPciAttributes
+  IN EFI_PCI_IO_PROTOCOL       *PciIo,
+  IN EFI_DEVICE_PATH_PROTOCOL  *DevicePath,
+  IN UINT64                    OriginalPciAttributes
   )
 {
@@ -1461 +1474 @@
 
   Uhc->PciIo                 = PciIo;
+  Uhc->DevicePath            = DevicePath;
   Uhc->OriginalPciAttributes = OriginalPciAttributes;
   Uhc->MemPool               = UsbHcInitMemPool (PciIo, TRUE, 0);
@@ -1537 +1551 @@
 {
   USB_HC_DEV          *Uhc;
+  EFI_STATUS          Status;
 
   //
@@ -1542 +1557 @@
   //
   Uhc = UHC_FROM_USB2_HC_PROTO (This);
+
+
+  Status = gBS->UninstallProtocolInterface (
+                  Controller,
+                  &gEfiUsb2HcProtocolGuid,
+                  &Uhc->Usb2Hc
+                  );
+  if (EFI_ERROR (Status)) {
+    return ;
+  }
+
   UhciStopHc (Uhc, UHC_GENERIC_TIMEOUT);
-
-  gBS->UninstallProtocolInterface (
-        Controller,
-        &gEfiUsb2HcProtocolGuid,
-        &Uhc->Usb2Hc
-        );
-
   UhciFreeAllAsyncReq (Uhc);
   UhciDestoryFrameList (Uhc);
@@ -1570 +1589 @@
 
   @param  Event                   Pointer to this event
-  @param  Context                 Event hanlder private data
+  @param  Context                 Event handler private data
 
 **/
@@ -1623 +1642 @@
   UINT64              OriginalPciAttributes;
   BOOLEAN             PciAttributesSaved;
+  EFI_DEVICE_PATH_PROTOCOL  *HcDevicePath;
 
   //
@@ -1641 +1661 @@
   }
 
+  //
+  // Open Device Path Protocol for on USB host controller
+  //
+  HcDevicePath = NULL;
+  Status = gBS->OpenProtocol (
+                  Controller,
+                  &gEfiDevicePathProtocolGuid,
+                  (VOID **) &HcDevicePath,
+                  This->DriverBindingHandle,
+                  Controller,
+                  EFI_OPEN_PROTOCOL_GET_PROTOCOL
+                  );
+
   PciAttributesSaved = FALSE;
   //
@@ -1672 +1705 @@
                     );
   if (!EFI_ERROR (Status)) {
-    Supports &= EFI_PCI_DEVICE_ENABLE;
+    Supports &= (UINT64)EFI_PCI_DEVICE_ENABLE;
     Status = PciIo->Attributes (
                       PciIo,
@@ -1685 +1718 @@
   }
 
-  Uhc = UhciAllocateDev (PciIo, OriginalPciAttributes);
+  Uhc = UhciAllocateDev (PciIo, HcDevicePath, OriginalPciAttributes);
 
   if (Uhc == NULL) {