Just like EhciDxe, do not reset host controller when debug capability is enabled in XhciDxe driver.

Signed-off-by: Elvin Li <elvin.li@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14760 6f19259b-4bc3-4df7-8a09-765794883524

4 files changed, 51 insertions, 10 deletions

diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
index 3e578975ad..8debc4c18c 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
@@ -164,6 +164,11 @@ XhcReset (
   // Flow through, same behavior as Host Controller Reset
   //
   case EFI_USB_HC_RESET_HOST_CONTROLLER:
+    if (((XhcReadExtCapReg (Xhc, Xhc->DebugCapSupOffset) & 0xFF) == XHC_CAP_USB_DEBUG) &&
+        ((XhcReadExtCapReg (Xhc, Xhc->DebugCapSupOffset + XHC_DC_DCCTRL) & BIT0) != 0)) {
+      Status = EFI_SUCCESS;
+      goto ON_EXIT;
+    }
     //
     // Host Controller must be Halt when Reset it
     //
@@ -1755,7 +1760,8 @@ XhcCreateUsbHc (
 
   ExtCapReg            = (UINT16) (Xhc->HcCParams.Data.ExtCapReg);
   Xhc->ExtCapRegBase   = ExtCapReg << 2;
-  Xhc->UsbLegSupOffset = XhcGetLegSupCapAddr (Xhc);
+  Xhc->UsbLegSupOffset = XhcGetCapabilityAddr (Xhc, XHC_CAP_USB_LEGACY);
+  Xhc->DebugCapSupOffset = XhcGetCapabilityAddr (Xhc, XHC_CAP_USB_DEBUG);
 
   DEBUG ((EFI_D_INFO, "XhcCreateUsb3Hc: Capability length 0x%x\n", Xhc->CapLength));
   DEBUG ((EFI_D_INFO, "XhcCreateUsb3Hc: HcSParams1 0x%x\n", Xhc->HcSParams1));
@@ -1764,6 +1770,7 @@ XhcCreateUsbHc (
   DEBUG ((EFI_D_INFO, "XhcCreateUsb3Hc: DBOff 0x%x\n", Xhc->DBOff));
   DEBUG ((EFI_D_INFO, "XhcCreateUsb3Hc: RTSOff 0x%x\n", Xhc->RTSOff));
   DEBUG ((EFI_D_INFO, "XhcCreateUsb3Hc: UsbLegSupOffset 0x%x\n", Xhc->UsbLegSupOffset));
+  DEBUG ((EFI_D_INFO, "XhcCreateUsb3Hc: DebugCapSupOffset 0x%x\n", Xhc->DebugCapSupOffset));
 
   //
   // Create AsyncRequest Polling Timer
diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.h b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.h
index fab6a72963..1eb0d0e176 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.h
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.h
@@ -231,6 +231,7 @@ struct _USB_XHCI_INSTANCE {
   UINTN                     *ScratchEntryMap;

   UINT32                    ExtCapRegBase;

   UINT32                    UsbLegSupOffset;

+  UINT32                    DebugCapSupOffset;

   UINT64                    *DCBAA;

   VOID                      *DCBAAMap;

   UINT32                    MaxSlotsEn;

diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c
index 9d50ef8242..c863f22d25 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c
@@ -571,16 +571,18 @@ XhcClearBiosOwnership (
 }

 

 /**

-  Calculate the XHCI legacy support capability register offset.

+  Calculate the offset of the XHCI capability.

 

   @param  Xhc     The XHCI Instance.

+  @param  CapId   The XHCI Capability ID.

 

   @return The offset of XHCI legacy support capability register.

 

 **/

 UINT32

-XhcGetLegSupCapAddr (

-  IN USB_XHCI_INSTANCE    *Xhc

+XhcGetCapabilityAddr (

+  IN USB_XHCI_INSTANCE    *Xhc,

+  IN UINT8                CapId

   )

 {

   UINT32 ExtCapOffset;

@@ -594,7 +596,7 @@ XhcGetLegSupCapAddr (
     // Check if the extended capability register's capability id is USB Legacy Support.

     //

     Data = XhcReadExtCapReg (Xhc, ExtCapOffset);

-    if ((Data & 0xFF) == 0x1) {

+    if ((Data & 0xFF) == CapId) {

       return ExtCapOffset;

     }

     //

@@ -660,6 +662,8 @@ XhcResetHC (
 {

   EFI_STATUS              Status;

 

+  Status = EFI_SUCCESS;

+

   DEBUG ((EFI_D_INFO, "XhcResetHC!\n"));

   //

   // Host can only be reset when it is halt. If not so, halt it

@@ -672,8 +676,12 @@ XhcResetHC (
     }

   }

 

-  XhcSetOpRegBit (Xhc, XHC_USBCMD_OFFSET, XHC_USBCMD_RESET);

-  Status = XhcWaitOpRegBit (Xhc, XHC_USBCMD_OFFSET, XHC_USBCMD_RESET, FALSE, Timeout);

+  if (((XhcReadExtCapReg (Xhc, Xhc->DebugCapSupOffset) & 0xFF) != XHC_CAP_USB_DEBUG) ||

+      ((XhcReadExtCapReg (Xhc, Xhc->DebugCapSupOffset + XHC_DC_DCCTRL) & BIT0) == 0)) {

+    XhcSetOpRegBit (Xhc, XHC_USBCMD_OFFSET, XHC_USBCMD_RESET);

+    Status = XhcWaitOpRegBit (Xhc, XHC_USBCMD_OFFSET, XHC_USBCMD_RESET, FALSE, Timeout);

+  }

+

   return Status;

 }

 

diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h
index eea468bbd7..20a5510bfe 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h
@@ -29,6 +29,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define USB_HUB_CLASS_CODE          0x09

 #define USB_HUB_SUBCLASS_CODE       0x00

 

+#define XHC_CAP_USB_LEGACY          0x01

+#define XHC_CAP_USB_DEBUG           0x0A

+

 //============================================//

 //           XHCI register offset             //

 //============================================//

@@ -67,6 +70,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define XHC_ERSTBA_OFFSET                  0x30 // Event Ring Segment Table Base Address Register Offset

 #define XHC_ERDP_OFFSET                    0x38 // Event Ring Dequeue Pointer Register Offset

 

+//

+// Debug registers offset

+//

+#define XHC_DC_DCCTRL                      0x20

+

 #define USBLEGSP_BIOS_SEMAPHORE            BIT16 // HC BIOS Owned Semaphore

 #define USBLEGSP_OS_SEMAPHORE              BIT24 // HC OS Owned Semaphore

 

@@ -448,6 +456,21 @@ XhcClearRuntimeRegBit (
   );

 

 /**

+  Read XHCI extended capability register.

+

+  @param  Xhc          The XHCI Instance.

+  @param  Offset       The offset of the extended capability register.

+

+  @return The register content read

+

+**/

+UINT32

+XhcReadExtCapReg (

+  IN  USB_XHCI_INSTANCE   *Xhc,

+  IN  UINT32              Offset

+  );

+

+/**

   Whether the XHCI host controller is halted.

 

   @param  Xhc     The XHCI Instance.

@@ -524,16 +547,18 @@ XhcRunHC (
   );

 

 /**

-  Calculate the XHCI legacy support capability register offset.

+  Calculate the offset of the XHCI capability.

 

   @param  Xhc     The XHCI Instance.

+  @param  CapId   The XHCI Capability ID.

 

   @return The offset of XHCI legacy support capability register.

 

 **/

 UINT32

-XhcGetLegSupCapAddr (

-  IN USB_XHCI_INSTANCE    *Xhc

+XhcGetCapabilityAddr (

+  IN USB_XHCI_INSTANCE    *Xhc,

+  IN UINT8                CapId

   );

 

 #endif