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

Pull USB patches from Greg Kroah-Hartman:
 "Here's the big USB patch set for the 3.6-rc1 merge window.

  Lots of little changes in here, primarily for gadget controllers and
  drivers.  There's some scsi changes that I think also went in through
  the scsi tree, but they merge just fine.  All of these patches have
  been in the linux-next tree for a while now.

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

Fix up trivial conflicts in include/scsi/scsi_device.h (same libata
conflict that Jeff had already encountered)

* tag 'usb-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (207 commits)
  usb: Add USB_QUIRK_RESET_RESUME for all Logitech UVC webcams
  usb: Add quirk detection based on interface information
  usb: s3c-hsotg: Add header file protection macros in s3c-hsotg.h
  USB: ehci-s5p: Add vbus setup function to the s5p ehci glue layer
  USB: add USB_VENDOR_AND_INTERFACE_INFO() macro
  USB: notify phy when root hub port connect change
  USB: remove 8 bytes of padding from usb_host_interface on 64 bit builds
  USB: option: add ZTE MF821D
  USB: sierra: QMI mode MC7710 moved to qcserial
  USB: qcserial: adding Sierra Wireless devices
  USB: qcserial: support generic Qualcomm serial ports
  USB: qcserial: make probe more flexible
  USB: qcserial: centralize probe exit path
  USB: qcserial: consolidate usb_set_interface calls
  USB: ehci-s5p: Add support for device tree
  USB: ohci-exynos: Add support for device tree
  USB: ehci-omap: fix compile failure(v1)
  usb: host: tegra: pass correct pointer in ehci_setup()
  USB: ehci-fsl: Update ifdef check to work on 64-bit ppc
  USB: serial: keyspan: Removed unrequired parentheses.
  ...

1 files changed, 88 insertions, 63 deletions

diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index 32d3adc315f5..f15501f4c585 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -15,17 +15,22 @@
 #include <linux/usb/quirks.h>
 #include "usb.h"
 
-/* List of quirky USB devices.  Please keep this list ordered by:
+/* Lists of quirky USB devices, split in device quirks and interface quirks.
+ * Device quirks are applied at the very beginning of the enumeration process,
+ * right after reading the device descriptor. They can thus only match on device
+ * information.
+ *
+ * Interface quirks are applied after reading all the configuration descriptors.
+ * They can match on both device and interface information.
+ *
+ * Note that the DELAY_INIT and HONOR_BNUMINTERFACES quirks do not make sense as
+ * interface quirks, as they only influence the enumeration process which is run
+ * before processing the interface quirks.
+ *
+ * Please keep the lists ordered by:
  *      1) Vendor ID
  *      2) Product ID
  *      3) Class ID
- *
- * as we want specific devices to be overridden first, and only after that, any
- * class specific quirks.
- *
- * Right now the logic aborts if it finds a valid device in the table, we might
- * want to change that in the future if it turns out that a whole class of
- * devices is broken...
  */
 static const struct usb_device_id usb_quirk_list[] = {
         /* CBM - Flash disk */
@@ -38,53 +43,23 @@ static const struct usb_device_id usb_quirk_list[] = {
         /* Creative SB Audigy 2 NX */
         { USB_DEVICE(0x041e, 0x3020), .driver_info = USB_QUIRK_RESET_RESUME },
 
-        /* Logitech Webcam C200 */
-        { USB_DEVICE(0x046d, 0x0802), .driver_info = USB_QUIRK_RESET_RESUME },
-
-        /* Logitech Webcam C250 */
-        { USB_DEVICE(0x046d, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME },
-
-        /* Logitech Webcam C300 */
-        { USB_DEVICE(0x046d, 0x0805), .driver_info = USB_QUIRK_RESET_RESUME },
-
-        /* Logitech Webcam B/C500 */
-        { USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME },
-
-        /* Logitech Webcam C600 */
-        { USB_DEVICE(0x046d, 0x0808), .driver_info = USB_QUIRK_RESET_RESUME },
-
-        /* Logitech Webcam Pro 9000 */
-        { USB_DEVICE(0x046d, 0x0809), .driver_info = USB_QUIRK_RESET_RESUME },
+        /* Logitech Quickcam Fusion */
+        { USB_DEVICE(0x046d, 0x08c1), .driver_info = USB_QUIRK_RESET_RESUME },
 
-        /* Logitech Webcam C905 */
-        { USB_DEVICE(0x046d, 0x080a), .driver_info = USB_QUIRK_RESET_RESUME },
+        /* Logitech Quickcam Orbit MP */
+        { USB_DEVICE(0x046d, 0x08c2), .driver_info = USB_QUIRK_RESET_RESUME },
 
-        /* Logitech Webcam C210 */
-        { USB_DEVICE(0x046d, 0x0819), .driver_info = USB_QUIRK_RESET_RESUME },
+        /* Logitech Quickcam Pro for Notebook */
+        { USB_DEVICE(0x046d, 0x08c3), .driver_info = USB_QUIRK_RESET_RESUME },
 
-        /* Logitech Webcam C260 */
-        { USB_DEVICE(0x046d, 0x081a), .driver_info = USB_QUIRK_RESET_RESUME },
+        /* Logitech Quickcam Pro 5000 */
+        { USB_DEVICE(0x046d, 0x08c5), .driver_info = USB_QUIRK_RESET_RESUME },
 
-        /* Logitech Webcam C310 */
-        { USB_DEVICE(0x046d, 0x081b), .driver_info = USB_QUIRK_RESET_RESUME },
+        /* Logitech Quickcam OEM Dell Notebook */
+        { USB_DEVICE(0x046d, 0x08c6), .driver_info = USB_QUIRK_RESET_RESUME },
 
-        /* Logitech Webcam C910 */
-        { USB_DEVICE(0x046d, 0x0821), .driver_info = USB_QUIRK_RESET_RESUME },
-
-        /* Logitech Webcam C160 */
-        { USB_DEVICE(0x046d, 0x0824), .driver_info = USB_QUIRK_RESET_RESUME },
-
-        /* Logitech Webcam C270 */
-        { USB_DEVICE(0x046d, 0x0825), .driver_info = USB_QUIRK_RESET_RESUME },
-
-        /* Logitech Quickcam Pro 9000 */
-        { USB_DEVICE(0x046d, 0x0990), .driver_info = USB_QUIRK_RESET_RESUME },
-
-        /* Logitech Quickcam E3500 */
-        { USB_DEVICE(0x046d, 0x09a4), .driver_info = USB_QUIRK_RESET_RESUME },
-
-        /* Logitech Quickcam Vision Pro */
-        { USB_DEVICE(0x046d, 0x09a6), .driver_info = USB_QUIRK_RESET_RESUME },
+        /* Logitech Quickcam OEM Cisco VT Camera II */
+        { USB_DEVICE(0x046d, 0x08c7), .driver_info = USB_QUIRK_RESET_RESUME },
 
         /* Logitech Harmony 700-series */
         { USB_DEVICE(0x046d, 0xc122), .driver_info = USB_QUIRK_DELAY_INIT },
@@ -156,16 +131,57 @@ static const struct usb_device_id usb_quirk_list[] = {
         { }  /* terminating entry must be last */
 };
 
-static const struct usb_device_id *find_id(struct usb_device *udev)
+static const struct usb_device_id usb_interface_quirk_list[] = {
+        /* Logitech UVC Cameras */
+        { USB_VENDOR_AND_INTERFACE_INFO(0x046d, USB_CLASS_VIDEO, 1, 0),
+          .driver_info = USB_QUIRK_RESET_RESUME },
+
+        { }  /* terminating entry must be last */
+};
+
+static bool usb_match_any_interface(struct usb_device *udev,
+                                    const struct usb_device_id *id)
 {
-        const struct usb_device_id *id = usb_quirk_list;
+        unsigned int i;
 
-        for (; id->idVendor || id->bDeviceClass || id->bInterfaceClass ||
-                        id->driver_info; id++) {
-                if (usb_match_device(udev, id))
-                        return id;
+        for (i = 0; i < udev->descriptor.bNumConfigurations; ++i) {
+                struct usb_host_config *cfg = &udev->config[i];
+                unsigned int j;
+
+                for (j = 0; j < cfg->desc.bNumInterfaces; ++j) {
+                        struct usb_interface_cache *cache;
+                        struct usb_host_interface *intf;
+
+                        cache = cfg->intf_cache[j];
+                        if (cache->num_altsetting == 0)
+                                continue;
+
+                        intf = &cache->altsetting[0];
+                        if (usb_match_one_id_intf(udev, intf, id))
+                                return true;
+                }
+        }
+
+        return false;
+}
+
+static u32 __usb_detect_quirks(struct usb_device *udev,
+                               const struct usb_device_id *id)
+{
+        u32 quirks = 0;
+
+        for (; id->match_flags; id++) {
+                if (!usb_match_device(udev, id))
+                        continue;
+
+                if ((id->match_flags & USB_DEVICE_ID_MATCH_INT_INFO) &&
+                    !usb_match_any_interface(udev, id))
+                        continue;
+
+                quirks |= (u32)(id->driver_info);
         }
-        return NULL;
+
+        return quirks;
 }
 
 /*
@@ -173,14 +189,10 @@ static const struct usb_device_id *find_id(struct usb_device *udev)
  */
 void usb_detect_quirks(struct usb_device *udev)
 {
-        const struct usb_device_id *id = usb_quirk_list;
-
-        id = find_id(udev);
-        if (id)
-                udev->quirks = (u32)(id->driver_info);
+        udev->quirks = __usb_detect_quirks(udev, usb_quirk_list);
         if (udev->quirks)
                 dev_dbg(&udev->dev, "USB quirks for this device: %x\n",
-                                udev->quirks);
+                        udev->quirks);
 
         /* For the present, all devices default to USB-PERSIST enabled */
 #if 0           /* was: #ifdef CONFIG_PM */
@@ -197,3 +209,16 @@ void usb_detect_quirks(struct usb_device *udev)
                 udev->persist_enabled = 1;
 #endif  /* CONFIG_PM */
 }
+
+void usb_detect_interface_quirks(struct usb_device *udev)
+{
+        u32 quirks;
+
+        quirks = __usb_detect_quirks(udev, usb_interface_quirk_list);
+        if (quirks == 0)
+                return;
+
+        dev_dbg(&udev->dev, "USB interface quirks for this device: %x\n",
+                quirks);
+        udev->quirks |= quirks;
+}