Enable compliance state early during USB host init

Currently USB host doesn't get to compliance mode if USB probe is connected
to USB port before the controller is starting up.

Move the code that enable compliance mode to right after the controller is
set to host mode and after we poll for the PR bit to go low

2 files changed, 69 insertions, 8 deletions

diff --git a/build/makefile.mk b/build/makefile.mk
index 0f4c4c0..20132a6 100644
--- a/build/makefile.mk
+++ b/build/makefile.mk
@@ -81,7 +81,8 @@ endif
 
 ifeq ($(BUILD_PROFILE),debug)
 ifeq ($(SOC),$(filter $(SOC), am65xx))
-#CFLAGS_LOCAL_COMMON += -DUSB3_DEBUG
+#CFLAGS_LOCAL_COMMON += -DUSB3_DEBUG                #this flag enable USB3.0 debug
+#CFLAGS_LOCAL_COMMON += -DPRINT_COMPLIANCE_STATUS   #this flag makes the code wait for USB port to get to compliance state
 endif
 endif
 
diff --git a/src/dwc/usb_xhci_hcd.c b/src/dwc/usb_xhci_hcd.c
index e210f35..c98c2f7 100644
--- a/src/dwc/usb_xhci_hcd.c
+++ b/src/dwc/usb_xhci_hcd.c
@@ -339,15 +339,42 @@ void enableComplianceMode(uint32_t instanceNumber)
     uint32_t regVal = 0;
     const USB_Config* usbConfig = &USB_config[instanceNumber];
     uint32_t baseAddr = 0;
+    uint32_t PP = 0, CCS=0, PED=0, PR=0, PLS=0;
 
     baseAddr = XhciRegBaseAddr(instanceNumber); 
 
     if ((instanceNumber == 0) && /* only port #0 supports SS */
        (usbConfig->usb30Enabled == TRUE) /* SOC support */)
     {
+
+        while (1)
+        {
+            regVal = HW_RD_REG32(baseAddr + DWC_USB_PORTSC2);
+            PR = HW_GET_FIELD(regVal,  DWC_USB_PORTSC2_PR);
+            if (PR == 0) break;
+        }
+
         /* attempt to turn on compliance mode */
         debug_printf("Enable compliance mode\n");
 
+        /* CTE can only be set to 1 if port is in disconnected state and with PLS = RX_detect*/
+        debug_printf("checking to see if we are in disconnected state\n");
+        regVal = HW_RD_REG32(baseAddr + DWC_USB_PORTSC2);
+
+        PP  = HW_GET_FIELD(regVal,  DWC_USB_PORTSC2_PP);
+        CCS = HW_GET_FIELD(regVal,  DWC_USB_PORTSC2_CCS);
+        PED = HW_GET_FIELD(regVal,  DWC_USB_PORTSC2_PED);
+        PR  = HW_GET_FIELD(regVal,  DWC_USB_PORTSC2_PR);
+        PLS = HW_GET_FIELD(regVal,  DWC_USB_PORTSC2_PLS);
+
+        debug_printf("PORTSC2 = 0x%x. PP=%d. CCS=%d. PED=%d. PR=%d. PLS=%d\n",
+                      regVal, PP,CCS, PED, PR, PLS);
+
+        if ((PP != 1)|| (CCS!=0) || (PED!=0) || (PR!=0) )
+        {
+            debug_printf("Port is not in disconnected state while trying to enable CTE\n");
+        }
+
         regVal = 0;
         HW_SET_FIELD(regVal, DWC_USB_PORTSC2_PP,  0x1);     /* PP = 1 */
         HW_WR_REG32(baseAddr + DWC_USB_PORTSC2, regVal);    /* write PP to PORTSC */
@@ -363,6 +390,40 @@ void enableComplianceMode(uint32_t instanceNumber)
 
         HW_SET_FIELD(regVal, DWC_USB_PORTSC2_LWS, 0x0);     /* LWS = 0 */
         HW_WR_REG32(baseAddr + DWC_USB_PORTSC2, regVal);    /* write it again */
+
+#if defined(PRINT_COMPLIANCE_STATUS)
+        uint32_t timeOut = 0;
+
+        /* if required, print to console if we get to compliance state or not
+         * for operational confirmation. But we don't want this to interfere
+         * with normal usual operation since this operation delays the code 
+         * execution a bit which might not be always desired. */
+        debug_printf("checking to see if we are in compliance state\n");
+
+        while(1)
+        {
+            regVal = HW_RD_REG32(baseAddr + DWC_USB_PORTSC2);
+
+            PLS = HW_GET_FIELD(regVal,  DWC_USB_PORTSC2_PLS);
+
+            if (PLS == 10)
+            {
+                debug_printf("PORTSC2 = 0x%x. PLS=%d. Port is in compliance state\n", regVal, PLS);
+                break;
+            }
+
+            usb_osalDelayMs(100);
+            timeOut++;
+
+            if (timeOut > 10)   /* wait for 1.1 second */
+            {
+                debug_printf("Time out while waiting for compliance state. PORTSC2 = 0x%x. PLS=%d\n",
+                             regVal, PLS);
+
+                break;
+            }
+        }
+#endif
     }
 }
 
@@ -440,7 +501,6 @@ void USB_Host_Init(uint32_t instanceNumber)
     /* wait for Controller Not Ready to go 0 */
     while(HW_RD_FIELD32(baseAddr + DWC_USB_USBSTS, DWC_USB_USBSTS_CNR));
     
-
     /*Setting the DWC3 controller for Host mode operation */
     regVal = HW_RD_REG32(baseAddr + DWC_USB_GCTL); 
     regVal  &= ~(3 << DWC_USB_GCTL_PRTCAPDIR_SHIFT); /* prtcapdir clr - tt - This line seems crucial **** */
@@ -448,6 +508,11 @@ void USB_Host_Init(uint32_t instanceNumber)
     regVal |= (DWC_USB_GCTL_PRTCAPDIR_HST << DWC_USB_GCTL_PRTCAPDIR_SHIFT);
     HW_WR_REG32(baseAddr + DWC_USB_GCTL, regVal );
 
+#ifdef SOC_AM65XX
+    /* xHCI v1.1 disable Compliance mode by default */
+    enableComplianceMode(instanceNumber);
+#endif
+
     /* USB3.0 */
     /*regVal = HW_RD_REG32(baseAddr + DWC_USB_GUSB3PIPECTL); */
     /*HW_WR_FIELD32(baseAddr + DWC_USB_GUSB3PIPECTL, DWC_USB_GUSB3PIPECTL_LFPSFILT, 1); */
@@ -517,7 +582,7 @@ void USB_Host_Init(uint32_t instanceNumber)
     HW_WR_FIELD32(baseAddr + DWC_USB_IMAN(1), DWC_USB_IMAN_IE, DWC_USB_IMAN_IE_EN);
  
     HW_WR_FIELD32(baseAddr + DWC_USB_USBCMD, DWC_USB_USBCMD_INTE, 0x01);
-  
+
     HW_WR_FIELD32(baseAddr + DWC_USB_USBCMD, DWC_USB_USBCMD_R_S, 0x01);
 
 #if DOING_SERDES_AFTER_CORE_INIT
@@ -535,11 +600,6 @@ void USB_Host_Init(uint32_t instanceNumber)
 #endif
 #endif
 
-#ifdef SOC_AM65XX
-    /* xHCI v1.1 disable Compliance mode by default */
-    enableComplianceMode(instanceNumber);
-#endif
-
 #ifdef USB3_DEBUG
     usb30Debug();
 #endif