Merge tag 'fixes-for-v4.5-rc6' of http://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus

Felipe writes:

usb: fixes for v4.5-rc6

The most important fixes here are:

a) yet another fix to dwc3's EP transfer resource
assignment logic. This time around we will be
pre-allocating transfer resources to avoid any
future issues;

b) two DMA fixes for the old MUSB driver.

c) dwc2's data toggle fix for FS

Other than these, we have a few other minor fixes
elsewhere.

14 files changed, 108 insertions, 68 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index cc2f753cb357..65f34bb04d7a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3444,7 +3444,6 @@ F:	drivers/usb/dwc2/
 DESIGNWARE USB3 DRD IP DRIVER
 M:      Felipe Balbi <balbi@kernel.org>
 L:      linux-usb@vger.kernel.org
-L:      linux-omap@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
 S:      Maintained
 F:      drivers/usb/dwc3/
@@ -7354,7 +7353,7 @@ F:	drivers/tty/isicom.c
 F:      include/linux/isicom.h
 
 MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER
-M:      Felipe Balbi <balbi@kernel.org>
+M:      Bin Liu <b-liu@ti.com>
 L:      linux-usb@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
 S:      Maintained
@@ -7923,11 +7922,9 @@ F:	drivers/media/platform/omap3isp/
 F:      drivers/staging/media/omap4iss/
 
 OMAP USB SUPPORT
-M:      Felipe Balbi <balbi@kernel.org>
 L:      linux-usb@vger.kernel.org
 L:      linux-omap@vger.kernel.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
-S:      Maintained
+S:      Orphan
 F:      drivers/usb/*/*omap*
 F:      arch/arm/*omap*/usb*
 
diff --git a/drivers/usb/dwc2/Kconfig b/drivers/usb/dwc2/Kconfig
index fd95ba6ec317..f0decc0d69b5 100644
--- a/drivers/usb/dwc2/Kconfig
+++ b/drivers/usb/dwc2/Kconfig
@@ -1,5 +1,6 @@
 config USB_DWC2
         tristate "DesignWare USB2 DRD Core Support"
+        depends on HAS_DMA
         depends on USB || USB_GADGET
         help
           Say Y here if your system has a Dual Role Hi-Speed USB
diff --git a/drivers/usb/dwc2/core.c b/drivers/usb/dwc2/core.c
index e991d55914db..46c4ba75dc2a 100644
--- a/drivers/usb/dwc2/core.c
+++ b/drivers/usb/dwc2/core.c
@@ -619,6 +619,12 @@ void dwc2_force_dr_mode(struct dwc2_hsotg *hsotg)
                          __func__, hsotg->dr_mode);
                 break;
         }
+
+        /*
+         * NOTE: This is required for some rockchip soc based
+         * platforms.
+         */
+        msleep(50);
 }
 
 /*
diff --git a/drivers/usb/dwc2/hcd_ddma.c b/drivers/usb/dwc2/hcd_ddma.c
index 36606fc33c0d..a41274aa52ad 100644
--- a/drivers/usb/dwc2/hcd_ddma.c
+++ b/drivers/usb/dwc2/hcd_ddma.c
@@ -1174,14 +1174,11 @@ static int dwc2_process_non_isoc_desc(struct dwc2_hsotg *hsotg,
         failed = dwc2_update_non_isoc_urb_state_ddma(hsotg, chan, qtd, dma_desc,
                                                      halt_status, n_bytes,
                                                      xfer_done);
-        if (*xfer_done && urb->status != -EINPROGRESS)
-                failed = 1;
-
-        if (failed) {
+        if (failed || (*xfer_done && urb->status != -EINPROGRESS)) {
                 dwc2_host_complete(hsotg, qtd, urb->status);
                 dwc2_hcd_qtd_unlink_and_free(hsotg, qtd, qh);
-                dev_vdbg(hsotg->dev, "failed=%1x xfer_done=%1x status=%08x\n",
-                         failed, *xfer_done, urb->status);
+                dev_vdbg(hsotg->dev, "failed=%1x xfer_done=%1x\n",
+                         failed, *xfer_done);
                 return failed;
         }
 
@@ -1236,21 +1233,23 @@ static void dwc2_complete_non_isoc_xfer_ddma(struct dwc2_hsotg *hsotg,
 
         list_for_each_safe(qtd_item, qtd_tmp, &qh->qtd_list) {
                 int i;
+                int qtd_desc_count;
 
                 qtd = list_entry(qtd_item, struct dwc2_qtd, qtd_list_entry);
                 xfer_done = 0;
+                qtd_desc_count = qtd->n_desc;
 
-                for (i = 0; i < qtd->n_desc; i++) {
+                for (i = 0; i < qtd_desc_count; i++) {
                         if (dwc2_process_non_isoc_desc(hsotg, chan, chnum, qtd,
                                                        desc_num, halt_status,
-                                                       &xfer_done)) {
-                                qtd = NULL;
-                                break;
-                        }
+                                                       &xfer_done))
+                                goto stop_scan;
+
                         desc_num++;
                 }
         }
 
+stop_scan:
         if (qh->ep_type != USB_ENDPOINT_XFER_CONTROL) {
                 /*
                  * Resetting the data toggle for bulk and interrupt endpoints
@@ -1258,7 +1257,7 @@ static void dwc2_complete_non_isoc_xfer_ddma(struct dwc2_hsotg *hsotg,
                  */
                 if (halt_status == DWC2_HC_XFER_STALL)
                         qh->data_toggle = DWC2_HC_PID_DATA0;
-                else if (qtd)
+                else
                         dwc2_hcd_save_data_toggle(hsotg, chan, chnum, qtd);
         }
 
diff --git a/drivers/usb/dwc2/hcd_intr.c b/drivers/usb/dwc2/hcd_intr.c
index f8253803a050..cadba8b13c48 100644
--- a/drivers/usb/dwc2/hcd_intr.c
+++ b/drivers/usb/dwc2/hcd_intr.c
@@ -525,11 +525,19 @@ void dwc2_hcd_save_data_toggle(struct dwc2_hsotg *hsotg,
         u32 pid = (hctsiz & TSIZ_SC_MC_PID_MASK) >> TSIZ_SC_MC_PID_SHIFT;
 
         if (chan->ep_type != USB_ENDPOINT_XFER_CONTROL) {
+                if (WARN(!chan || !chan->qh,
+                         "chan->qh must be specified for non-control eps\n"))
+                        return;
+
                 if (pid == TSIZ_SC_MC_PID_DATA0)
                         chan->qh->data_toggle = DWC2_HC_PID_DATA0;
                 else
                         chan->qh->data_toggle = DWC2_HC_PID_DATA1;
         } else {
+                if (WARN(!qtd,
+                         "qtd must be specified for control eps\n"))
+                        return;
+
                 if (pid == TSIZ_SC_MC_PID_DATA0)
                         qtd->data_toggle = DWC2_HC_PID_DATA0;
                 else
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index 29130682e547..e4f8b90d9627 100644
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -856,7 +856,6 @@ struct dwc3 {
         unsigned                pullups_connected:1;
         unsigned                resize_fifos:1;
         unsigned                setup_packet_pending:1;
-        unsigned                start_config_issued:1;
         unsigned                three_stage_setup:1;
         unsigned                usb3_lpm_capable:1;
 
diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c
index 3a9354abcb68..8d6b75c2f53b 100644
--- a/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@ -555,7 +555,6 @@ static int dwc3_ep0_set_config(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl)
         int ret;
         u32 reg;
 
-        dwc->start_config_issued = false;
         cfg = le16_to_cpu(ctrl->wValue);
 
         switch (state) {
@@ -737,10 +736,6 @@ static int dwc3_ep0_std_request(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl)
                 dwc3_trace(trace_dwc3_ep0, "USB_REQ_SET_ISOCH_DELAY");
                 ret = dwc3_ep0_set_isoch_delay(dwc, ctrl);
                 break;
-        case USB_REQ_SET_INTERFACE:
-                dwc3_trace(trace_dwc3_ep0, "USB_REQ_SET_INTERFACE");
-                dwc->start_config_issued = false;
-                /* Fall through */
         default:
                 dwc3_trace(trace_dwc3_ep0, "Forwarding to gadget driver");
                 ret = dwc3_ep0_delegate_req(dwc, ctrl);
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 7d1dd82a95ac..2363bad45af8 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -385,24 +385,66 @@ static void dwc3_free_trb_pool(struct dwc3_ep *dep)
         dep->trb_pool_dma = 0;
 }
 
+static int dwc3_gadget_set_xfer_resource(struct dwc3 *dwc, struct dwc3_ep *dep);
+
+/**
+ * dwc3_gadget_start_config - Configure EP resources
+ * @dwc: pointer to our controller context structure
+ * @dep: endpoint that is being enabled
+ *
+ * The assignment of transfer resources cannot perfectly follow the
+ * data book due to the fact that the controller driver does not have
+ * all knowledge of the configuration in advance. It is given this
+ * information piecemeal by the composite gadget framework after every
+ * SET_CONFIGURATION and SET_INTERFACE. Trying to follow the databook
+ * programming model in this scenario can cause errors. For two
+ * reasons:
+ *
+ * 1) The databook says to do DEPSTARTCFG for every SET_CONFIGURATION
+ * and SET_INTERFACE (8.1.5). This is incorrect in the scenario of
+ * multiple interfaces.
+ *
+ * 2) The databook does not mention doing more DEPXFERCFG for new
+ * endpoint on alt setting (8.1.6).
+ *
+ * The following simplified method is used instead:
+ *
+ * All hardware endpoints can be assigned a transfer resource and this
+ * setting will stay persistent until either a core reset or
+ * hibernation. So whenever we do a DEPSTARTCFG(0) we can go ahead and
+ * do DEPXFERCFG for every hardware endpoint as well. We are
+ * guaranteed that there are as many transfer resources as endpoints.
+ *
+ * This function is called for each endpoint when it is being enabled
+ * but is triggered only when called for EP0-out, which always happens
+ * first, and which should only happen in one of the above conditions.
+ */
 static int dwc3_gadget_start_config(struct dwc3 *dwc, struct dwc3_ep *dep)
 {
         struct dwc3_gadget_ep_cmd_params params;
         u32                     cmd;
+        int                     i;
+        int                     ret;
+
+        if (dep->number)
+                return 0;
 
         memset(&params, 0x00, sizeof(params));
+        cmd = DWC3_DEPCMD_DEPSTARTCFG;
 
-        if (dep->number != 1) {
-                cmd = DWC3_DEPCMD_DEPSTARTCFG;
-                /* XferRscIdx == 0 for ep0 and 2 for the remaining */
-                if (dep->number > 1) {
-                        if (dwc->start_config_issued)
-                                return 0;
-                        dwc->start_config_issued = true;
-                        cmd |= DWC3_DEPCMD_PARAM(2);
-                }
+        ret = dwc3_send_gadget_ep_cmd(dwc, 0, cmd, &params);
+        if (ret)
+                return ret;
 
-                return dwc3_send_gadget_ep_cmd(dwc, 0, cmd, &params);
+        for (i = 0; i < DWC3_ENDPOINTS_NUM; i++) {
+                struct dwc3_ep *dep = dwc->eps[i];
+
+                if (!dep)
+                        continue;
+
+                ret = dwc3_gadget_set_xfer_resource(dwc, dep);
+                if (ret)
+                        return ret;
         }
 
         return 0;
@@ -516,10 +558,6 @@ static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep,
                 struct dwc3_trb *trb_st_hw;
                 struct dwc3_trb *trb_link;
 
-                ret = dwc3_gadget_set_xfer_resource(dwc, dep);
-                if (ret)
-                        return ret;
-
                 dep->endpoint.desc = desc;
                 dep->comp_desc = comp_desc;
                 dep->type = usb_endpoint_type(desc);
@@ -1636,8 +1674,6 @@ static int dwc3_gadget_start(struct usb_gadget *g,
         }
         dwc3_writel(dwc->regs, DWC3_DCFG, reg);
 
-        dwc->start_config_issued = false;
-
         /* Start with SuperSpeed Default */
         dwc3_gadget_ep0_desc.wMaxPacketSize = cpu_to_le16(512);
 
@@ -2237,7 +2273,6 @@ static void dwc3_gadget_disconnect_interrupt(struct dwc3 *dwc)
         dwc3_writel(dwc->regs, DWC3_DCTL, reg);
 
         dwc3_disconnect_gadget(dwc);
-        dwc->start_config_issued = false;
 
         dwc->gadget.speed = USB_SPEED_UNKNOWN;
         dwc->setup_packet_pending = false;
@@ -2288,7 +2323,6 @@ static void dwc3_gadget_reset_interrupt(struct dwc3 *dwc)
 
         dwc3_stop_active_transfers(dwc);
         dwc3_clear_stall_all_ep(dwc);
-        dwc->start_config_issued = false;
 
         /* Reset device address to zero */
         reg = dwc3_readl(dwc->regs, DWC3_DCFG);
diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c
index 7e179f81d05c..87fb0fd6aaab 100644
--- a/drivers/usb/gadget/legacy/inode.c
+++ b/drivers/usb/gadget/legacy/inode.c
@@ -130,7 +130,8 @@ struct dev_data {
                                         setup_can_stall : 1,
                                         setup_out_ready : 1,
                                         setup_out_error : 1,
-                                        setup_abort : 1;
+                                        setup_abort : 1,
+                                        gadget_registered : 1;
         unsigned                        setup_wLength;
 
         /* the rest is basically write-once */
@@ -1179,7 +1180,8 @@ dev_release (struct inode *inode, struct file *fd)
 
         /* closing ep0 === shutdown all */
 
-        usb_gadget_unregister_driver (&gadgetfs_driver);
+        if (dev->gadget_registered)
+                usb_gadget_unregister_driver (&gadgetfs_driver);
 
         /* at this point "good" hardware has disconnected the
          * device from USB; the host won't see it any more.
@@ -1847,6 +1849,7 @@ dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
                  * kick in after the ep0 descriptor is closed.
                  */
                 value = len;
+                dev->gadget_registered = true;
         }
         return value;
 
diff --git a/drivers/usb/gadget/udc/fsl_qe_udc.c b/drivers/usb/gadget/udc/fsl_qe_udc.c
index 53c0692f1b09..93d28cb00b76 100644
--- a/drivers/usb/gadget/udc/fsl_qe_udc.c
+++ b/drivers/usb/gadget/udc/fsl_qe_udc.c
@@ -2340,7 +2340,7 @@ static struct qe_udc *qe_udc_config(struct platform_device *ofdev)
 {
         struct qe_udc *udc;
         struct device_node *np = ofdev->dev.of_node;
-        unsigned int tmp_addr = 0;
+        unsigned long tmp_addr = 0;
         struct usb_device_para __iomem *usbpram;
         unsigned int i;
         u64 size;
diff --git a/drivers/usb/gadget/udc/net2280.h b/drivers/usb/gadget/udc/net2280.h
index 4dff60d34f73..0d32052bf16f 100644
--- a/drivers/usb/gadget/udc/net2280.h
+++ b/drivers/usb/gadget/udc/net2280.h
@@ -369,9 +369,20 @@ static inline void set_max_speed(struct net2280_ep *ep, u32 max)
         static const u32 ep_enhanced[9] = { 0x10, 0x60, 0x30, 0x80,
                                           0x50, 0x20, 0x70, 0x40, 0x90 };
 
-        if (ep->dev->enhanced_mode)
+        if (ep->dev->enhanced_mode) {
                 reg = ep_enhanced[ep->num];
-        else{
+                switch (ep->dev->gadget.speed) {
+                case USB_SPEED_SUPER:
+                        reg += 2;
+                        break;
+                case USB_SPEED_FULL:
+                        reg += 1;
+                        break;
+                case USB_SPEED_HIGH:
+                default:
+                        break;
+                }
+        } else {
                 reg = (ep->num + 1) * 0x10;
                 if (ep->dev->gadget.speed != USB_SPEED_HIGH)
                         reg += 1;
diff --git a/drivers/usb/gadget/udc/udc-core.c b/drivers/usb/gadget/udc/udc-core.c
index fd73a3ea07c2..b86a6f03592e 100644
--- a/drivers/usb/gadget/udc/udc-core.c
+++ b/drivers/usb/gadget/udc/udc-core.c
@@ -413,9 +413,10 @@ int usb_add_gadget_udc_release(struct device *parent, struct usb_gadget *gadget,
                 if (!driver->udc_name || strcmp(driver->udc_name,
                                                 dev_name(&udc->dev)) == 0) {
                         ret = udc_bind_to_driver(udc, driver);
+                        if (ret != -EPROBE_DEFER)
+                                list_del(&driver->pending);
                         if (ret)
                                 goto err4;
-                        list_del(&driver->pending);
                         break;
                 }
         }
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index 795a45b1b25b..58487a473521 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -662,7 +662,7 @@ static int musb_tx_dma_set_mode_mentor(struct dma_controller *dma,
                 csr &= ~(MUSB_TXCSR_AUTOSET | MUSB_TXCSR_DMAMODE);
                 csr |= MUSB_TXCSR_DMAENAB; /* against programmer's guide */
         }
-        channel->desired_mode = mode;
+        channel->desired_mode = *mode;
         musb_writew(epio, MUSB_TXCSR, csr);
 
         return 0;
@@ -2003,10 +2003,8 @@ void musb_host_rx(struct musb *musb, u8 epnum)
                                 qh->offset,
                                 urb->transfer_buffer_length);
 
-                        done = musb_rx_dma_in_inventra_cppi41(c, hw_ep, qh,
-                                                              urb, xfer_len,
-                                                              iso_err);
-                        if (done)
+                        if (musb_rx_dma_in_inventra_cppi41(c, hw_ep, qh, urb,
+                                                           xfer_len, iso_err))
                                 goto finish;
                         else
                                 dev_err(musb->controller, "error: rx_dma failed\n");
diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
index 970a30e155cb..72b387d592c2 100644
--- a/drivers/usb/phy/phy-msm-usb.c
+++ b/drivers/usb/phy/phy-msm-usb.c
@@ -757,14 +757,8 @@ static int msm_otg_set_host(struct usb_otg *otg, struct usb_bus *host)
         otg->host = host;
         dev_dbg(otg->usb_phy->dev, "host driver registered w/ tranceiver\n");
 
-        /*
-         * Kick the state machine work, if peripheral is not supported
-         * or peripheral is already registered with us.
-         */
-        if (motg->pdata->mode == USB_DR_MODE_HOST || otg->gadget) {
-                pm_runtime_get_sync(otg->usb_phy->dev);
-                schedule_work(&motg->sm_work);
-        }
+        pm_runtime_get_sync(otg->usb_phy->dev);
+        schedule_work(&motg->sm_work);
 
         return 0;
 }
@@ -827,14 +821,8 @@ static int msm_otg_set_peripheral(struct usb_otg *otg,
         dev_dbg(otg->usb_phy->dev,
                 "peripheral driver registered w/ tranceiver\n");
 
-        /*
-         * Kick the state machine work, if host is not supported
-         * or host is already registered with us.
-         */
-        if (motg->pdata->mode == USB_DR_MODE_PERIPHERAL || otg->host) {
-                pm_runtime_get_sync(otg->usb_phy->dev);
-                schedule_work(&motg->sm_work);
-        }
+        pm_runtime_get_sync(otg->usb_phy->dev);
+        schedule_work(&motg->sm_work);
 
         return 0;
 }