]> git.hungrycats.org Git - linux/commitdiff
dwc_otg: Don't issue traffic to LS devices in FS mode
authorP33M <P33M@github.com>
Fri, 27 Sep 2013 13:42:24 +0000 (14:42 +0100)
committerP33M <P33M@github.com>
Fri, 27 Sep 2013 13:42:24 +0000 (14:42 +0100)
Issuing low-speed packets when the root port is in full-speed mode
causes the root port to stop responding. Explicitly fail when
enqueuing URBs to a LS endpoint on a FS bus.

drivers/usb/host/dwc_otg/dwc_otg_hcd.c

index be1d25b4a326b9faa6d6fee8ea78830287ed7cbd..b3e19444b9aca7e090032e00b37f245b514acbdb 100644 (file)
@@ -501,6 +501,7 @@ int dwc_otg_hcd_urb_enqueue(dwc_otg_hcd_t * hcd,
        dwc_otg_transaction_type_e tr_type;
        dwc_otg_qtd_t *qtd;
        gintmsk_data_t intr_mask = {.d32 = 0 };
+       hprt0_data_t hprt0 = { .d32 = 0 };
 
 #ifdef DEBUG /* integrity checks (Broadcom) */
        if (NULL == hcd->core_if) {
@@ -515,6 +516,16 @@ int dwc_otg_hcd_urb_enqueue(dwc_otg_hcd_t * hcd,
                return -DWC_E_NO_DEVICE;
        }
 
+       /* Some core configurations cannot support LS traffic on a FS root port */
+       if ((hcd->fops->speed(hcd, dwc_otg_urb->priv) == USB_SPEED_LOW) &&
+               (hcd->core_if->hwcfg2.b.fs_phy_type == 1) &&
+               (hcd->core_if->hwcfg2.b.hs_phy_type == 1)) {
+                       hprt0.d32 = DWC_READ_REG32(hcd->core_if->host_if->hprt0);
+                       if (hprt0.b.prtspd == DWC_HPRT0_PRTSPD_FULL_SPEED) {
+                               return -DWC_E_NO_DEVICE;
+                       }
+       }
+
        qtd = dwc_otg_hcd_qtd_create(dwc_otg_urb, atomic_alloc);
        if (qtd == NULL) {
                DWC_ERROR("DWC OTG HCD URB Enqueue failed creating QTD\n");