usb: dwc_otg: prevent re-submit urb when disconnect detected

[firefly-linux-kernel-4.4.55.git] / drivers / usb / dwc_otg_310 / dwc_otg_hcd.c

diff --git a/drivers/usb/dwc_otg_310/dwc_otg_hcd.c b/drivers/usb/dwc_otg_310/dwc_otg_hcd.c
index 451424e842042205760df4ac55e104bd079d774f..09881639192bd3c0206fe494a346d1a199fbd14c 100755 (executable)
--- a/drivers/usb/dwc_otg_310/dwc_otg_hcd.c
+++ b/drivers/usb/dwc_otg_310/dwc_otg_hcd.c
@@ -174,6 +174,8 @@ static void kill_urbs_in_qh_list(dwc_otg_hcd_t *hcd, dwc_list_link_t *qh_list)
                qh = DWC_LIST_ENTRY(qh_item, dwc_otg_qh_t, qh_list_entry);
                DWC_CIRCLEQ_FOREACH_SAFE(qtd, qtd_tmp,
                                         &qh->qtd_list, qtd_list_entry) {
+                       if (DWC_CIRCLEQ_EMPTY(&qh->qtd_list))
+                               return;
                        qtd = DWC_CIRCLEQ_FIRST(&qh->qtd_list);
                        if (qtd->urb != NULL) {
                                hcd->fops->complete(hcd, qtd->urb->priv,
@@ -288,10 +290,12 @@ static int32_t dwc_otg_hcd_disconnect_cb(void *p)
        hprt0.d32 = DWC_READ_REG32(dwc_otg_hcd->core_if->host_if->hprt0);
        /* In some case, we don't disconnect a usb device, but
         * disconnect intr was triggered, so check hprt0 here. */
-       if ((!hprt0.b.prtenchng)
+       if (((!hprt0.b.prtenchng)
            && (!hprt0.b.prtconndet)
-           && hprt0.b.prtconnsts) {
-               DWC_PRINTF("%s: hprt0 = 0x%08x\n", __func__, hprt0.d32);
+           && hprt0.b.prtconnsts)
+           || !hprt0.b.prtenchng) {
+               DWC_PRINTF("%s: Invalid disconnect interrupt "
+                          "hprt0 = 0x%08x\n", __func__, hprt0.d32);
                return 1;
        }
        /*
@@ -476,6 +480,15 @@ void dwc_otg_hcd_stop(dwc_otg_hcd_t *hcd)
        pldata = hcd->core_if->otg_dev->pldata;
        DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD STOP\n");
 
+       /* Turn off all host-specific interrupts. */
+       dwc_otg_disable_host_interrupts(hcd->core_if);
+
+       /*
+        * Set status flags for the hub driver.
+        */
+       hcd->flags.b.port_connect_status_change = 1;
+       hcd->flags.b.port_connect_status = 0;
+
        /*
         * The root hub should be disconnected before this function is called.
         * The disconnect will clear the QTD lists (via ..._hcd_urb_dequeue)
@@ -485,15 +498,6 @@ void dwc_otg_hcd_stop(dwc_otg_hcd_t *hcd)
        kill_all_urbs(hcd);
        DWC_SPINUNLOCK_IRQRESTORE(hcd->lock, flags);
 
-       /*
-        * Set status flags for the hub driver.
-        */
-       hcd->flags.b.port_connect_status_change = 1;
-       hcd->flags.b.port_connect_status = 0;
-
-       /* Turn off all host-specific interrupts. */
-       dwc_otg_disable_host_interrupts(hcd->core_if);
-
        /* Turn off the vbus power */
        DWC_PRINTF("PortPower off\n");
        hprt0.b.prtpwr = 0;
@@ -561,7 +565,7 @@ int dwc_otg_hcd_urb_dequeue(dwc_otg_hcd_t *hcd,
        dwc_otg_qtd_t *urb_qtd;
 
        urb_qtd = dwc_otg_urb->qtd;
-       if (((uint32_t) urb_qtd & 0xf0000000) == 0) {
+       if (!urb_qtd) {
                DWC_PRINTF("%s error: urb_qtd is %p dwc_otg_urb %p!!!\n",
                           __func__, urb_qtd, dwc_otg_urb);
                return 0;
@@ -966,9 +970,9 @@ static void dwc_otg_hcd_reinit(dwc_otg_hcd_t *hcd)
        dwc_hc_t *channel;
        dwc_hc_t *channel_tmp;
        dwc_irqflags_t flags;
+       dwc_spinlock_t *temp_lock;
 
        hcd->flags.d32 = 0;
-
        hcd->non_periodic_qh_ptr = &hcd->non_periodic_sched_active;
        hcd->non_periodic_channels = 0;
        hcd->periodic_channels = 0;
@@ -995,7 +999,15 @@ static void dwc_otg_hcd_reinit(dwc_otg_hcd_t *hcd)
        dwc_otg_core_host_init(hcd->core_if);
 
        /* Set core_if's lock pointer to the hcd->lock */
-       hcd->core_if->lock = hcd->lock;
+       /* Should get this lock before modify it */
+       if (hcd->core_if->lock) {
+               DWC_SPINLOCK_IRQSAVE(hcd->core_if->lock, &flags);
+               temp_lock = hcd->core_if->lock;
+               hcd->core_if->lock = hcd->lock;
+               DWC_SPINUNLOCK_IRQRESTORE(temp_lock, flags);
+       } else {
+               hcd->core_if->lock = hcd->lock;
+       }
 }
 
 /**
@@ -1339,7 +1351,8 @@ static int queue_transaction(dwc_otg_hcd_t *hcd,
                             dwc_hc_t *hc, uint16_t fifo_dwords_avail)
 {
        int retval;
-
+       if (!hc || !(hc->qh))
+               return -ENODEV;
        if (hcd->core_if->dma_enable) {
                if (hcd->core_if->dma_desc_enable) {
                        if (!hc->xfer_started