Merge tag 'usb-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB updates from Greg KH:
 "Here is the big USB patchset for 4.6-rc1.

  The normal mess is here, gadget and xhci fixes and updates, and lots
  of other driver updates and cleanups as well.  Full details are in the
  shortlog.

  All have been in linux-next for a while with no reported issues"

* tag 'usb-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (266 commits)
  USB: core: let USB device know device node
  usb: devio: Add ioctl to disallow detaching kernel USB drivers.
  usb: gadget: f_acm: Fix configfs attr name
  usb: udc: lpc32xx: remove USB PLL and USB OTG clock management
  usb: udc: lpc32xx: remove direct access to clock controller registers
  usb: udc: lpc32xx: switch to clock prepare/unprepare model
  usb: renesas_usbhs: gadget: fix giveback status code in usbhsg_pipe_disable()
  usb: gadget: renesas_usb3: Use ARCH_RENESAS
  usb: dwc2: Fix issues in dwc2_complete_non_isoc_xfer_ddma()
  usb: dwc2: Add support for Lantiq ARX and XRX SoCs
  usb: phy: generic: Handle late registration of gadget
  usb: gadget: bdc_udc: fix race condition in bdc_udc_exit()
  usb: musb: core: added missing const qualifier to musb_hdrc_platform_data::config
  usb: dwc2: Move host-specific core functions into hcd.c
  usb: dwc2: Move register save and restore functions
  usb: dwc2: Use kmem_cache_free()
  usb: dwc2: host: If using uframe scheduler, end splits better
  usb: dwc2: host: Totally redo the microframe scheduler
  usb: dwc2: host: Properly set even/odd frame
  usb: dwc2: host: Add dwc2_hcd_get_future_frame_number() call
  ...

6 files changed, 43 insertions, 13 deletions

diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c
index f14f4ab47ebb..9ce8c9f91674 100644
--- a/drivers/usb/chipidea/ci_hdrc_imx.c
+++ b/drivers/usb/chipidea/ci_hdrc_imx.c
@@ -28,6 +28,11 @@ struct ci_hdrc_imx_platform_flag {
         bool runtime_pm;
 };
 
+static const struct ci_hdrc_imx_platform_flag imx23_usb_data = {
+        .flags = CI_HDRC_TURN_VBUS_EARLY_ON |
+                CI_HDRC_DISABLE_STREAMING,
+};
+
 static const struct ci_hdrc_imx_platform_flag imx27_usb_data = {
                 CI_HDRC_DISABLE_STREAMING,
 };
@@ -66,6 +71,7 @@ static const struct ci_hdrc_imx_platform_flag imx7d_usb_data = {
 };
 
 static const struct of_device_id ci_hdrc_imx_dt_ids[] = {
+        { .compatible = "fsl,imx23-usb", .data = &imx23_usb_data},
         { .compatible = "fsl,imx28-usb", .data = &imx28_usb_data},
         { .compatible = "fsl,imx27-usb", .data = &imx27_usb_data},
         { .compatible = "fsl,imx6q-usb", .data = &imx6q_usb_data},
@@ -244,7 +250,6 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
         struct ci_hdrc_platform_data pdata = {
                 .name           = dev_name(&pdev->dev),
                 .capoffset      = DEF_CAPOFFSET,
-                .flags          = CI_HDRC_SET_NON_ZERO_TTHA,
         };
         int ret;
         const struct of_device_id *of_id;
@@ -302,9 +307,9 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
                                 &pdata);
         if (IS_ERR(data->ci_pdev)) {
                 ret = PTR_ERR(data->ci_pdev);
-                dev_err(&pdev->dev,
-                        "Can't register ci_hdrc platform device, err=%d\n",
-                        ret);
+                if (ret != -EPROBE_DEFER)
+                        dev_err(&pdev->dev,
+                                "ci_hdrc_add_device failed, err=%d\n", ret);
                 goto err_clk;
         }
 
diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index 7404064b9bbc..69426e644d17 100644
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -721,6 +721,9 @@ static int ci_get_platdata(struct device *dev,
                 return ret;
         }
 
+        if (of_find_property(dev->of_node, "non-zero-ttctrl-ttha", NULL))
+                platdata->flags |= CI_HDRC_SET_NON_ZERO_TTHA;
+
         ext_id = ERR_PTR(-ENODEV);
         ext_vbus = ERR_PTR(-ENODEV);
         if (of_property_read_bool(dev->of_node, "extcon")) {
diff --git a/drivers/usb/chipidea/debug.c b/drivers/usb/chipidea/debug.c
index df47110bad2d..6d23eede4d8c 100644
--- a/drivers/usb/chipidea/debug.c
+++ b/drivers/usb/chipidea/debug.c
@@ -175,7 +175,6 @@ static int ci_requests_show(struct seq_file *s, void *data)
 {
         struct ci_hdrc *ci = s->private;
         unsigned long flags;
-        struct list_head   *ptr = NULL;
         struct ci_hw_req *req = NULL;
         struct td_node *node, *tmpnode;
         unsigned i, j, qsize = sizeof(struct ci_hw_td)/sizeof(u32);
@@ -187,9 +186,7 @@ static int ci_requests_show(struct seq_file *s, void *data)
 
         spin_lock_irqsave(&ci->lock, flags);
         for (i = 0; i < ci->hw_ep_max; i++)
-                list_for_each(ptr, &ci->ci_hw_ep[i].qh.queue) {
-                        req = list_entry(ptr, struct ci_hw_req, queue);
-
+                list_for_each_entry(req, &ci->ci_hw_ep[i].qh.queue, queue) {
                         list_for_each_entry_safe(node, tmpnode, &req->tds, td) {
                                 seq_printf(s, "EP=%02i: TD=%08X %s\n",
                                            i % (ci->hw_ep_max / 2),
diff --git a/drivers/usb/chipidea/otg_fsm.c b/drivers/usb/chipidea/otg_fsm.c
index ba90dc66703d..de8e22ec3902 100644
--- a/drivers/usb/chipidea/otg_fsm.c
+++ b/drivers/usb/chipidea/otg_fsm.c
@@ -66,6 +66,11 @@ set_a_bus_req(struct device *dev, struct device_attribute *attr,
                         return count;
                 }
                 ci->fsm.a_bus_req = 1;
+                if (ci->fsm.otg->state == OTG_STATE_A_PERIPHERAL) {
+                        ci->gadget.host_request_flag = 1;
+                        mutex_unlock(&ci->fsm.lock);
+                        return count;
+                }
         }
 
         ci_otg_queue_work(ci);
@@ -144,8 +149,14 @@ set_b_bus_req(struct device *dev, struct device_attribute *attr,
         mutex_lock(&ci->fsm.lock);
         if (buf[0] == '0')
                 ci->fsm.b_bus_req = 0;
-        else if (buf[0] == '1')
+        else if (buf[0] == '1') {
                 ci->fsm.b_bus_req = 1;
+                if (ci->fsm.otg->state == OTG_STATE_B_PERIPHERAL) {
+                        ci->gadget.host_request_flag = 1;
+                        mutex_unlock(&ci->fsm.lock);
+                        return count;
+                }
+        }
 
         ci_otg_queue_work(ci);
         mutex_unlock(&ci->fsm.lock);
@@ -198,6 +209,7 @@ static unsigned otg_timer_ms[] = {
         TA_AIDL_BDIS,
         TB_ASE0_BRST,
         TA_BIDL_ADIS,
+        TB_AIDL_BDIS,
         TB_SE0_SRP,
         TB_SRP_FAIL,
         0,
@@ -309,6 +321,12 @@ static int a_bidl_adis_tmout(struct ci_hdrc *ci)
         return 0;
 }
 
+static int b_aidl_bdis_tmout(struct ci_hdrc *ci)
+{
+        ci->fsm.a_bus_suspend = 1;
+        return 0;
+}
+
 static int b_se0_srp_tmout(struct ci_hdrc *ci)
 {
         ci->fsm.b_se0_srp = 1;
@@ -353,6 +371,7 @@ static int (*otg_timer_handlers[])(struct ci_hdrc *) = {
         a_aidl_bdis_tmout,      /* A_AIDL_BDIS */
         b_ase0_brst_tmout,      /* B_ASE0_BRST */
         a_bidl_adis_tmout,      /* A_BIDL_ADIS */
+        b_aidl_bdis_tmout,      /* B_AIDL_BDIS */
         b_se0_srp_tmout,        /* B_SE0_SRP */
         b_srp_fail_tmout,       /* B_SRP_FAIL */
         NULL,                   /* A_WAIT_ENUM */
@@ -644,9 +663,9 @@ static void ci_otg_fsm_event(struct ci_hdrc *ci)
                 break;
         case OTG_STATE_B_PERIPHERAL:
                 if ((intr_sts & USBi_SLI) && port_conn && otg_bsess_vld) {
-                        fsm->a_bus_suspend = 1;
-                        ci_otg_queue_work(ci);
+                        ci_otg_add_timer(ci, B_AIDL_BDIS);
                 } else if (intr_sts & USBi_PCI) {
+                        ci_otg_del_timer(ci, B_AIDL_BDIS);
                         if (fsm->a_bus_suspend == 1)
                                 fsm->a_bus_suspend = 0;
                 }
@@ -786,6 +805,10 @@ int ci_hdrc_otg_fsm_init(struct ci_hdrc *ci)
         ci->fsm.id = hw_read_otgsc(ci, OTGSC_ID) ? 1 : 0;
         ci->fsm.otg->state = OTG_STATE_UNDEFINED;
         ci->fsm.ops = &ci_otg_ops;
+        ci->gadget.hnp_polling_support = 1;
+        ci->fsm.host_req_flag = devm_kzalloc(ci->dev, 1, GFP_KERNEL);
+        if (!ci->fsm.host_req_flag)
+                return -ENOMEM;
 
         mutex_init(&ci->fsm.lock);
 
diff --git a/drivers/usb/chipidea/otg_fsm.h b/drivers/usb/chipidea/otg_fsm.h
index 262d6ef8df7c..6366fe398ba6 100644
--- a/drivers/usb/chipidea/otg_fsm.h
+++ b/drivers/usb/chipidea/otg_fsm.h
@@ -62,6 +62,8 @@
 /* SSEND time before SRP */
 #define TB_SSEND_SRP         (1500)     /* minimum 1.5 sec, section:5.1.2 */
 
+#define TB_AIDL_BDIS         (20)       /* 4ms ~ 150ms, section 5.2.1 */
+
 #if IS_ENABLED(CONFIG_USB_OTG_FSM)
 
 int ci_hdrc_otg_fsm_init(struct ci_hdrc *ci);
diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
index 3eafa2c9a2ba..065f5d97aa67 100644
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@ -819,7 +819,6 @@ static int _ep_queue(struct usb_ep *ep, struct usb_request *req,
                                ci->ep0out : ci->ep0in;
                 if (!list_empty(&hwep->qh.queue)) {
                         _ep_nuke(hwep);
-                        retval = -EOVERFLOW;
                         dev_warn(hwep->ci->dev, "endpoint ctrl %X nuked\n",
                                  _usb_addr(hwep));
                 }
@@ -1068,7 +1067,8 @@ __acquires(ci->lock)
                 }
                 break;
         case USB_REQ_GET_STATUS:
-                if (type != (USB_DIR_IN|USB_RECIP_DEVICE)   &&
+                if ((type != (USB_DIR_IN|USB_RECIP_DEVICE) ||
+                        le16_to_cpu(req.wIndex) == OTG_STS_SELECTOR) &&
                     type != (USB_DIR_IN|USB_RECIP_ENDPOINT) &&
                     type != (USB_DIR_IN|USB_RECIP_INTERFACE))
                         goto delegate;