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

Pull USB 3.5-rc1 changes from Greg Kroah-Hartman:
 "Here is the big USB 3.5-rc1 pull request for the 3.5-rc1 merge window.

  It's touches a lot of different parts of the kernel, all USB drivers,
  due to some API cleanups (getting rid of the ancient err() macro) and
  some changes that are needed for USB 3.0 power management updates.

  There are also lots of new drivers, pimarily gadget, but others as
  well.  We deleted a staging driver, which was nice, and finally
  dropped the obsolete usbfs code, which will make Al happy to never
  have to touch that again.

  There were some build errors in the tree that linux-next found a few
  days ago, but those were fixed by the most recent changes (all were
  due to us not building with CONFIG_PM disabled.)

  Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"

* tag 'usb-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (477 commits)
  xhci: Fix DIV_ROUND_UP compile error.
  xhci: Fix compile with CONFIG_USB_SUSPEND=n
  USB: Fix core compile with CONFIG_USB_SUSPEND=n
  brcm80211: Fix compile error for .disable_hub_initiated_lpm.
  Revert "USB: EHCI: work around bug in the Philips ISP1562 controller"
  MAINTAINERS: Add myself as maintainer to the USB PHY Layer
  USB: EHCI: fix command register configuration lost problem
  USB: Remove races in devio.c
  USB: ehci-platform: remove update_device
  USB: Disable hub-initiated LPM for comms devices.
  xhci: Add Intel U1/U2 timeout policy.
  xhci: Add infrastructure for host-specific LPM policies.
  USB: Add macros for interrupt endpoint types.
  xhci: Reserve one command for USB3 LPM disable.
  xhci: Some Evaluate Context commands must succeed.
  USB: Disable USB 3.0 LPM in critical sections.
  USB: Add support to enable/disable USB3 link states.
  USB: Allow drivers to disable hub-initiated LPM.
  USB: Calculate USB 3.0 exit latencies for LPM.
  USB: Refactor code to set LPM support flag.
  ...

Conflicts:
	arch/arm/mach-exynos/mach-nuri.c
	arch/arm/mach-exynos/mach-universal_c210.c
	drivers/net/wireless/ath/ath6kl/usb.c

2 files changed, 61 insertions, 11 deletions

diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 5bf91dbad59..340d6ae646e 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -203,7 +203,7 @@ static int usbhid_restart_out_queue(struct usbhid_device *usbhid)
                 return 0;
 
         if ((kicked = (usbhid->outhead != usbhid->outtail))) {
-                dbg("Kicking head %d tail %d", usbhid->outhead, usbhid->outtail);
+                hid_dbg(hid, "Kicking head %d tail %d", usbhid->outhead, usbhid->outtail);
 
                 r = usb_autopm_get_interface_async(usbhid->intf);
                 if (r < 0)
@@ -230,7 +230,7 @@ static int usbhid_restart_ctrl_queue(struct usbhid_device *usbhid)
                 return 0;
 
         if ((kicked = (usbhid->ctrlhead != usbhid->ctrltail))) {
-                dbg("Kicking head %d tail %d", usbhid->ctrlhead, usbhid->ctrltail);
+                hid_dbg(hid, "Kicking head %d tail %d", usbhid->ctrlhead, usbhid->ctrltail);
 
                 r = usb_autopm_get_interface_async(usbhid->intf);
                 if (r < 0)
@@ -399,6 +399,16 @@ static int hid_submit_ctrl(struct hid_device *hid)
  * Output interrupt completion handler.
  */
 
+static int irq_out_pump_restart(struct hid_device *hid)
+{
+        struct usbhid_device *usbhid = hid->driver_data;
+
+        if (usbhid->outhead != usbhid->outtail)
+                return hid_submit_out(hid);
+        else
+                return -1;
+}
+
 static void hid_irq_out(struct urb *urb)
 {
         struct hid_device *hid = urb->context;
@@ -428,7 +438,7 @@ static void hid_irq_out(struct urb *urb)
         else
                 usbhid->outtail = (usbhid->outtail + 1) & (HID_OUTPUT_FIFO_SIZE - 1);
 
-        if (usbhid->outhead != usbhid->outtail && !hid_submit_out(hid)) {
+        if (!irq_out_pump_restart(hid)) {
                 /* Successfully submitted next urb in queue */
                 spin_unlock_irqrestore(&usbhid->lock, flags);
                 return;
@@ -443,6 +453,15 @@ static void hid_irq_out(struct urb *urb)
 /*
  * Control pipe completion handler.
  */
+static int ctrl_pump_restart(struct hid_device *hid)
+{
+        struct usbhid_device *usbhid = hid->driver_data;
+
+        if (usbhid->ctrlhead != usbhid->ctrltail)
+                return hid_submit_ctrl(hid);
+        else
+                return -1;
+}
 
 static void hid_ctrl(struct urb *urb)
 {
@@ -476,7 +495,7 @@ static void hid_ctrl(struct urb *urb)
         else
                 usbhid->ctrltail = (usbhid->ctrltail + 1) & (HID_CONTROL_FIFO_SIZE - 1);
 
-        if (usbhid->ctrlhead != usbhid->ctrltail && !hid_submit_ctrl(hid)) {
+        if (!ctrl_pump_restart(hid)) {
                 /* Successfully submitted next urb in queue */
                 spin_unlock(&usbhid->lock);
                 return;
@@ -535,11 +554,27 @@ static void __usbhid_submit_report(struct hid_device *hid, struct hid_report *re
                          * the queue is known to run
                          * but an earlier request may be stuck
                          * we may need to time out
-                         * no race because this is called under
+                         * no race because the URB is blocked under
                          * spinlock
                          */
-                        if (time_after(jiffies, usbhid->last_out + HZ * 5))
+                        if (time_after(jiffies, usbhid->last_out + HZ * 5)) {
+                                usb_block_urb(usbhid->urbout);
+                                /* drop lock to not deadlock if the callback is called */
+                                spin_unlock(&usbhid->lock);
                                 usb_unlink_urb(usbhid->urbout);
+                                spin_lock(&usbhid->lock);
+                                usb_unblock_urb(usbhid->urbout);
+                                /*
+                                 * if the unlinking has already completed
+                                 * the pump will have been stopped
+                                 * it must be restarted now
+                                 */
+                                if (!test_bit(HID_OUT_RUNNING, &usbhid->iofl))
+                                        if (!irq_out_pump_restart(hid))
+                                                set_bit(HID_OUT_RUNNING, &usbhid->iofl);
+
+
+                        }
                 }
                 return;
         }
@@ -583,11 +618,25 @@ static void __usbhid_submit_report(struct hid_device *hid, struct hid_report *re
                  * the queue is known to run
                  * but an earlier request may be stuck
                  * we may need to time out
-                 * no race because this is called under
+                 * no race because the URB is blocked under
                  * spinlock
                  */
-                if (time_after(jiffies, usbhid->last_ctrl + HZ * 5))
+                if (time_after(jiffies, usbhid->last_ctrl + HZ * 5)) {
+                        usb_block_urb(usbhid->urbctrl);
+                        /* drop lock to not deadlock if the callback is called */
+                        spin_unlock(&usbhid->lock);
                         usb_unlink_urb(usbhid->urbctrl);
+                        spin_lock(&usbhid->lock);
+                        usb_unblock_urb(usbhid->urbctrl);
+                        /*
+                         * if the unlinking has already completed
+                         * the pump will have been stopped
+                         * it must be restarted now
+                         */
+                        if (!test_bit(HID_CTRL_RUNNING, &usbhid->iofl))
+                                if (!ctrl_pump_restart(hid))
+                                        set_bit(HID_CTRL_RUNNING, &usbhid->iofl);
+                }
         }
 }
 
diff --git a/drivers/hid/usbhid/usbmouse.c b/drivers/hid/usbhid/usbmouse.c
index 0f6be45d43d..bf16d72dc37 100644
--- a/drivers/hid/usbhid/usbmouse.c
+++ b/drivers/hid/usbhid/usbmouse.c
@@ -92,9 +92,10 @@ static void usb_mouse_irq(struct urb *urb)
 resubmit:
         status = usb_submit_urb (urb, GFP_ATOMIC);
         if (status)
-                err ("can't resubmit intr, %s-%s/input0, status %d",
-                                mouse->usbdev->bus->bus_name,
-                                mouse->usbdev->devpath, status);
+                dev_err(&mouse->usbdev->dev,
+                        "can't resubmit intr, %s-%s/input0, status %d\n",
+                        mouse->usbdev->bus->bus_name,
+                        mouse->usbdev->devpath, status);
 }
 
 static int usb_mouse_open(struct input_dev *dev)