History

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

Pull USB fixes from Greg KH: "Here are some USB fixes and new device ids for 3.12-rc6 The largest change here is a bunch of new device ids for the option USB serial driver for new Huawei devices. Other than that, just some small bug fixes for issues that people have reported (run-time and build-time), nothing major" * tag 'usb-3.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: usb: usb_phy_gen: refine conditional declaration of usb_nop_xceiv_register usb: misc: usb3503: Fix compile error due to incorrect regmap depedency usb/chipidea: fix oops on memory allocation failure usb-storage: add quirk for mandatory READ_CAPACITY_16 usb: serial: option: blacklist Olivetti Olicard200 USB: quirks: add touchscreen that is dazzeled by remote wakeup Revert "usb: musb: gadget: fix otg active status flag" USB: quirks.c: add one device that cannot deal with suspension USB: serial: option: add support for Inovia SEW858 device USB: serial: ti_usb_3410_5052: add Abbott strip port ID to combined table as well. USB: support new huawei devices in option.c usb: musb: start musb on the udc side, too xhci: Fix spurious wakeups after S5 on Haswell xhci: fix write to USB3_PSSEN and XUSB2PRM pci config registers xhci: quirk for extra long delay for S4 xhci: Don't enable/disable RWE on bus suspend/resume.

Linus Torvalds committed 13 years ago

Commit 02a32502 parents 7b4a515 944687818 files · +343 −82Browse files

Unified · Split

18 files
  1. drivers/usb/chipidea/host.c +4 −2
  2. drivers/usb/core/quirks.c +6 −0
  3. drivers/usb/host/pci-quirks.c +2 −2
  4. drivers/usb/host/xhci-hub.c +0 −26
  5. drivers/usb/host/xhci-pci.c +25 −0
  6. drivers/usb/host/xhci.c +13 −1
  7. drivers/usb/host/xhci.h +2 −0
  8. drivers/usb/misc/Kconfig +1 −1
  9. drivers/usb/musb/musb_core.c +46 −0
  10. drivers/usb/musb/musb_core.h +1 −0
  11. drivers/usb/musb/musb_gadget.c +3 −0
  12. drivers/usb/musb/musb_virthub.c +0 −46
  13. drivers/usb/serial/option.c +224 −1
  14. drivers/usb/serial/ti_usb_3410_5052.c +1 −0
  15. drivers/usb/storage/scsiglue.c +4 −1
  16. drivers/usb/storage/unusual_devs.h +7 −0
  17. include/linux/usb/usb_phy_gen_xceiv.h +1 −1
  18. include/linux/usb_usual.h +3 −1
drivers/usb/chipidea/host.c+4−2
@@ -100,8 +100,10 @@ static void host_stop(struct ci_hdrc *ci) · 99 unmodified lines
100100 {
101101 struct usb_hcd *hcd = ci->hcd;
102102
103− usb_remove_hcd(hcd);
104− usb_put_hcd(hcd);
103+ if (hcd) {
104+ usb_remove_hcd(hcd);
105+ usb_put_hcd(hcd);
106+ }
105107 if (ci->platdata->reg_vbus)
106108 regulator_disable(ci->platdata->reg_vbus);
107109 }
drivers/usb/core/quirks.c+6−0
@@ -97,6 +97,9 @@ static const struct usb_device_id usb_quirk_list[] = { · 96 unmodified lines
9797 /* Alcor Micro Corp. Hub */
9898 { USB_DEVICE(0x058f, 0x9254), .driver_info = USB_QUIRK_RESET_RESUME },
9999
100+ /* MicroTouch Systems touchscreen */
101+ { USB_DEVICE(0x0596, 0x051e), .driver_info = USB_QUIRK_RESET_RESUME },
102+
100103 /* appletouch */
101104 { USB_DEVICE(0x05ac, 0x021a), .driver_info = USB_QUIRK_RESET_RESUME },
102105
@@ -130,6 +133,9 @@ static const struct usb_device_id usb_quirk_list[] = { · 27 unmodified lines
130133 /* Broadcom BCM92035DGROM BT dongle */
131134 { USB_DEVICE(0x0a5c, 0x2021), .driver_info = USB_QUIRK_RESET_RESUME },
132135
136+ /* MAYA44USB sound device */
137+ { USB_DEVICE(0x0a92, 0x0091), .driver_info = USB_QUIRK_RESET_RESUME },
138+
133139 /* Action Semiconductor flash disk */
134140 { USB_DEVICE(0x10d6, 0x2200), .driver_info =
135141 USB_QUIRK_STRING_FETCH_255 },
drivers/usb/host/pci-quirks.c+2−2
@@ -799,7 +799,7 @@ void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev) · 798 unmodified lines
799799 * switchable ports.
800800 */
801801 pci_write_config_dword(xhci_pdev, USB_INTEL_USB3_PSSEN,
802− cpu_to_le32(ports_available));
802+ ports_available);
803803
804804 pci_read_config_dword(xhci_pdev, USB_INTEL_USB3_PSSEN,
805805 &ports_available);
@@ -821,7 +821,7 @@ void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev) · 15 unmodified lines
821821 * host.
822822 */
823823 pci_write_config_dword(xhci_pdev, USB_INTEL_XUSB2PR,
824− cpu_to_le32(ports_available));
824+ ports_available);
825825
826826 pci_read_config_dword(xhci_pdev, USB_INTEL_XUSB2PR,
827827 &ports_available);
drivers/usb/host/xhci-hub.c+0−26
@@ -1157,18 +1157,6 @@ int xhci_bus_suspend(struct usb_hcd *hcd) · 1156 unmodified lines
11571157 t1 = xhci_port_state_to_neutral(t1);
11581158 if (t1 != t2)
11591159 xhci_writel(xhci, t2, port_array[port_index]);
1160−
1161− if (hcd->speed != HCD_USB3) {
1162− /* enable remote wake up for USB 2.0 */
1163− __le32 __iomem *addr;
1164− u32 tmp;
1165−
1166− /* Get the port power control register address. */
1167− addr = port_array[port_index] + PORTPMSC;
1168− tmp = xhci_readl(xhci, addr);
1169− tmp |= PORT_RWE;
1170− xhci_writel(xhci, tmp, addr);
1171− }
11721160 }
11731161 hcd->state = HC_STATE_SUSPENDED;
11741162 bus_state->next_statechange = jiffies + msecs_to_jiffies(10);
@@ -1247,20 +1235,6 @@ int xhci_bus_resume(struct usb_hcd *hcd) · 72 unmodified lines
12471235 xhci_ring_device(xhci, slot_id);
12481236 } else
12491237 xhci_writel(xhci, temp, port_array[port_index]);
1250−
1251− if (hcd->speed != HCD_USB3) {
1252− /* disable remote wake up for USB 2.0 */
1253− __le32 __iomem *addr;
1254− u32 tmp;
1255−
1256− /* Add one to the port status register address to get
1257− * the port power control register address.
1258− */
1259− addr = port_array[port_index] + PORTPMSC;
1260− tmp = xhci_readl(xhci, addr);
1261− tmp &= ~PORT_RWE;
1262− xhci_writel(xhci, tmp, addr);
1263− }
12641238 }
12651239
12661240 (void) xhci_readl(xhci, &xhci->op_regs->command);
drivers/usb/host/xhci-pci.c+25−0
@@ -35,6 +35,9 @@ · 34 unmodified lines
3535 #define PCI_VENDOR_ID_ETRON 0x1b6f
3636 #define PCI_DEVICE_ID_ASROCK_P67 0x7023
3737
38+#define PCI_DEVICE_ID_INTEL_LYNXPOINT_XHCI 0x8c31
39+#define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI 0x9c31
40+
3841 static const char hcd_name[] = "xhci_hcd";
3942
4043 /* called after powerup, by probe or system-pm "wakeup" */
@@ -69,6 +72,14 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) · 28 unmodified lines
6972 "QUIRK: Fresco Logic xHC needs configure"
7073 " endpoint cmd after reset endpoint");
7174 }
75+ if (pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_PDK &&
76+ pdev->revision == 0x4) {
77+ xhci->quirks |= XHCI_SLOW_SUSPEND;
78+ xhci_dbg_trace(xhci, trace_xhci_dbg_quirks,
79+ "QUIRK: Fresco Logic xHC revision %u"
80+ "must be suspended extra slowly",
81+ pdev->revision);
82+ }
7283 /* Fresco Logic confirms: all revisions of this chip do not
7384 * support MSI, even though some of them claim to in their PCI
7485 * capabilities.
@@ -110,6 +121,15 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) · 35 unmodified lines
110121 xhci->quirks |= XHCI_SPURIOUS_REBOOT;
111122 xhci->quirks |= XHCI_AVOID_BEI;
112123 }
124+ if (pdev->vendor == PCI_VENDOR_ID_INTEL &&
125+ (pdev->device == PCI_DEVICE_ID_INTEL_LYNXPOINT_XHCI ||
126+ pdev->device == PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI)) {
127+ /* Workaround for occasional spurious wakeups from S5 (or
128+ * any other sleep) on Haswell machines with LPT and LPT-LP
129+ * with the new Intel BIOS
130+ */
131+ xhci->quirks |= XHCI_SPURIOUS_WAKEUP;
132+ }
113133 if (pdev->vendor == PCI_VENDOR_ID_ETRON &&
114134 pdev->device == PCI_DEVICE_ID_ASROCK_P67) {
115135 xhci->quirks |= XHCI_RESET_ON_RESUME;
@@ -217,6 +237,11 @@ static void xhci_pci_remove(struct pci_dev *dev) · 101 unmodified lines
217237 usb_put_hcd(xhci->shared_hcd);
218238 }
219239 usb_hcd_pci_remove(dev);
240+
241+ /* Workaround for spurious wakeups at shutdown with HSW */
242+ if (xhci->quirks & XHCI_SPURIOUS_WAKEUP)
243+ pci_set_power_state(dev, PCI_D3hot);
244+
220245 kfree(xhci);
221246 }
222247
drivers/usb/host/xhci.c+13−1
@@ -730,6 +730,9 @@ void xhci_shutdown(struct usb_hcd *hcd) · 729 unmodified lines
730730
731731 spin_lock_irq(&xhci->lock);
732732 xhci_halt(xhci);
733+ /* Workaround for spurious wakeups at shutdown with HSW */
734+ if (xhci->quirks & XHCI_SPURIOUS_WAKEUP)
735+ xhci_reset(xhci);
733736 spin_unlock_irq(&xhci->lock);
734737
735738 xhci_cleanup_msix(xhci);
@@ -737,6 +740,10 @@ void xhci_shutdown(struct usb_hcd *hcd) · 1 unmodified line
737740 xhci_dbg_trace(xhci, trace_xhci_dbg_init,
738741 "xhci_shutdown completed - status = %x",
739742 xhci_readl(xhci, &xhci->op_regs->status));
743+
744+ /* Yet another workaround for spurious wakeups at shutdown with HSW */
745+ if (xhci->quirks & XHCI_SPURIOUS_WAKEUP)
746+ pci_set_power_state(to_pci_dev(hcd->self.controller), PCI_D3hot);
740747 }
741748
742749 #ifdef CONFIG_PM
@@ -839,6 +846,7 @@ static void xhci_clear_command_ring(struct xhci_hcd *xhci) · 96 unmodified lines
839846 int xhci_suspend(struct xhci_hcd *xhci)
840847 {
841848 int rc = 0;
849+ unsigned int delay = XHCI_MAX_HALT_USEC;
842850 struct usb_hcd *hcd = xhci_to_hcd(xhci);
843851 u32 command;
844852
@@ -861,8 +869,12 @@ int xhci_suspend(struct xhci_hcd *xhci) · 16 unmodified lines
861869 command = xhci_readl(xhci, &xhci->op_regs->command);
862870 command &= ~CMD_RUN;
863871 xhci_writel(xhci, command, &xhci->op_regs->command);
872+
873+ /* Some chips from Fresco Logic need an extraordinary delay */
874+ delay *= (xhci->quirks & XHCI_SLOW_SUSPEND) ? 10 : 1;
875+
864876 if (xhci_handshake(xhci, &xhci->op_regs->status,
865− STS_HALT, STS_HALT, XHCI_MAX_HALT_USEC)) {
877+ STS_HALT, STS_HALT, delay)) {
866878 xhci_warn(xhci, "WARN: xHC CMD_RUN timeout\n");
867879 spin_unlock_irq(&xhci->lock);
868880 return -ETIMEDOUT;
drivers/usb/host/xhci.h+2−0
@@ -1548,6 +1548,8 @@ struct xhci_hcd { · 1547 unmodified lines
15481548 #define XHCI_COMP_MODE_QUIRK (1 << 14)
15491549 #define XHCI_AVOID_BEI (1 << 15)
15501550 #define XHCI_PLAT (1 << 16)
1551+#define XHCI_SLOW_SUSPEND (1 << 17)
1552+#define XHCI_SPURIOUS_WAKEUP (1 << 18)
15511553 unsigned int num_active_eps;
15521554 unsigned int limit_active_eps;
15531555 /* There are two roothubs to keep track of bus suspend info for */
drivers/usb/misc/Kconfig+1−1
@@ -246,6 +246,6 @@ config USB_EZUSB_FX2 · 245 unmodified lines
246246 config USB_HSIC_USB3503
247247 tristate "USB3503 HSIC to USB20 Driver"
248248 depends on I2C
249− select REGMAP
249+ select REGMAP_I2C
250250 help
251251 This option enables support for SMSC USB3503 HSIC to USB 2.0 Driver.
drivers/usb/musb/musb_core.c+46−0
@@ -921,6 +921,52 @@ static void musb_generic_disable(struct musb *musb) · 920 unmodified lines
921921
922922 }
923923
924+/*
925+ * Program the HDRC to start (enable interrupts, dma, etc.).
926+ */
927+void musb_start(struct musb *musb)
928+{
929+ void __iomem *regs = musb->mregs;
930+ u8 devctl = musb_readb(regs, MUSB_DEVCTL);
931+
932+ dev_dbg(musb->controller, "<== devctl %02x\n", devctl);
933+
934+ /* Set INT enable registers, enable interrupts */
935+ musb->intrtxe = musb->epmask;
936+ musb_writew(regs, MUSB_INTRTXE, musb->intrtxe);
937+ musb->intrrxe = musb->epmask & 0xfffe;
938+ musb_writew(regs, MUSB_INTRRXE, musb->intrrxe);
939+ musb_writeb(regs, MUSB_INTRUSBE, 0xf7);
940+
941+ musb_writeb(regs, MUSB_TESTMODE, 0);
942+
943+ /* put into basic highspeed mode and start session */
944+ musb_writeb(regs, MUSB_POWER, MUSB_POWER_ISOUPDATE
945+ | MUSB_POWER_HSENAB
946+ /* ENSUSPEND wedges tusb */
947+ /* | MUSB_POWER_ENSUSPEND */
948+ );
949+
950+ musb->is_active = 0;
951+ devctl = musb_readb(regs, MUSB_DEVCTL);
952+ devctl &= ~MUSB_DEVCTL_SESSION;
953+
954+ /* session started after:
955+ * (a) ID-grounded irq, host mode;
956+ * (b) vbus present/connect IRQ, peripheral mode;
957+ * (c) peripheral initiates, using SRP
958+ */
959+ if (musb->port_mode != MUSB_PORT_MODE_HOST &&
960+ (devctl & MUSB_DEVCTL_VBUS) == MUSB_DEVCTL_VBUS) {
961+ musb->is_active = 1;
962+ } else {
963+ devctl |= MUSB_DEVCTL_SESSION;
964+ }
965+
966+ musb_platform_enable(musb);
967+ musb_writeb(regs, MUSB_DEVCTL, devctl);
968+}
969+
924970 /*
925971 * Make the HDRC stop (disable interrupts, etc.);
926972 * reversible by musb_start
drivers/usb/musb/musb_core.h+1−0
@@ -503,6 +503,7 @@ static inline void musb_configure_ep0(struct musb *musb) · 502 unmodified lines
503503 extern const char musb_driver_name[];
504504
505505 extern void musb_stop(struct musb *musb);
506+extern void musb_start(struct musb *musb);
506507
507508 extern void musb_write_fifo(struct musb_hw_ep *ep, u16 len, const u8 *src);
508509 extern void musb_read_fifo(struct musb_hw_ep *ep, u16 len, u8 *dst);
drivers/usb/musb/musb_gadget.c+3−0
@@ -1853,11 +1853,14 @@ static int musb_gadget_start(struct usb_gadget *g, · 1852 unmodified lines
18531853 musb->gadget_driver = driver;
18541854
18551855 spin_lock_irqsave(&musb->lock, flags);
1856+ musb->is_active = 1;
18561857
18571858 otg_set_peripheral(otg, &musb->g);
18581859 musb->xceiv->state = OTG_STATE_B_IDLE;
18591860 spin_unlock_irqrestore(&musb->lock, flags);
18601861
1862+ musb_start(musb);
1863+
18611864 /* REVISIT: funcall to other code, which also
18621865 * handles power budgeting ... this way also
18631866 * ensures HdrcStart is indirectly called.
drivers/usb/musb/musb_virthub.c+0−46
@@ -44,52 +44,6 @@ · 43 unmodified lines
4444
4545 #include "musb_core.h"
4646
47−/*
48−* Program the HDRC to start (enable interrupts, dma, etc.).
49−*/
50−static void musb_start(struct musb *musb)
51−{
52− void __iomem *regs = musb->mregs;
53− u8 devctl = musb_readb(regs, MUSB_DEVCTL);
54−
55− dev_dbg(musb->controller, "<== devctl %02x\n", devctl);
56−
57− /* Set INT enable registers, enable interrupts */
58− musb->intrtxe = musb->epmask;
59− musb_writew(regs, MUSB_INTRTXE, musb->intrtxe);
60− musb->intrrxe = musb->epmask & 0xfffe;
61− musb_writew(regs, MUSB_INTRRXE, musb->intrrxe);
62− musb_writeb(regs, MUSB_INTRUSBE, 0xf7);
63−
64− musb_writeb(regs, MUSB_TESTMODE, 0);
65−
66− /* put into basic highspeed mode and start session */
67− musb_writeb(regs, MUSB_POWER, MUSB_POWER_ISOUPDATE
68− | MUSB_POWER_HSENAB
69− /* ENSUSPEND wedges tusb */
70− /* | MUSB_POWER_ENSUSPEND */
71− );
72−
73− musb->is_active = 0;
74− devctl = musb_readb(regs, MUSB_DEVCTL);
75− devctl &= ~MUSB_DEVCTL_SESSION;
76−
77− /* session started after:
78− * (a) ID-grounded irq, host mode;
79− * (b) vbus present/connect IRQ, peripheral mode;
80− * (c) peripheral initiates, using SRP
81− */
82− if (musb->port_mode != MUSB_PORT_MODE_HOST &&
83− (devctl & MUSB_DEVCTL_VBUS) == MUSB_DEVCTL_VBUS) {
84− musb->is_active = 1;
85− } else {
86− devctl |= MUSB_DEVCTL_SESSION;
87− }
88−
89− musb_platform_enable(musb);
90− musb_writeb(regs, MUSB_DEVCTL, devctl);
91−}
92−
9347 static void musb_port_suspend(struct musb *musb, bool do_suspend)
9448 {
9549 struct usb_otg *otg = musb->xceiv->otg;
drivers/usb/serial/option.c+224−1
@@ -451,6 +451,10 @@ static void option_instat_callback(struct urb *urb); · 450 unmodified lines
451451 #define CHANGHONG_VENDOR_ID 0x2077
452452 #define CHANGHONG_PRODUCT_CH690 0x7001
453453
454+/* Inovia */
455+#define INOVIA_VENDOR_ID 0x20a6
456+#define INOVIA_SEW858 0x1105
457+
454458 /* some devices interfaces need special handling due to a number of reasons */
455459 enum option_blacklist_reason {
456460 OPTION_BLACKLIST_NONE = 0,
@@ -689,6 +693,222 @@ static const struct usb_device_id option_ids[] = { · 232 unmodified lines
689693 { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x7A) },
690694 { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x7B) },
691695 { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x7C) },
696+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x01) },
697+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x02) },
698+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x03) },
699+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x04) },
700+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x05) },
701+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x06) },
702+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x0A) },
703+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x0B) },
704+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x0D) },
705+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x0E) },
706+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x0F) },
707+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x10) },
708+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x12) },
709+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x13) },
710+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x14) },
711+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x15) },
712+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x17) },
713+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x18) },
714+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x19) },
715+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x1A) },
716+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x1B) },
717+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x1C) },
718+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x31) },
719+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x32) },
720+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x33) },
721+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x34) },
722+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x35) },
723+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x36) },
724+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x3A) },
725+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x3B) },
726+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x3D) },
727+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x3E) },
728+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x3F) },
729+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x48) },
730+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x49) },
731+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x4A) },
732+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x4B) },
733+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x4C) },
734+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x61) },
735+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x62) },
736+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x63) },
737+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x64) },
738+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x65) },
739+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x66) },
740+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x6A) },
741+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x6B) },
742+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x6D) },
743+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x6E) },
744+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x6F) },
745+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x78) },
746+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x79) },
747+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x7A) },
748+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x7B) },
749+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x7C) },
750+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x01) },
751+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x02) },
752+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x03) },
753+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x04) },
754+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x05) },
755+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x06) },
756+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x0A) },
757+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x0B) },
758+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x0D) },
759+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x0E) },
760+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x0F) },
761+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x10) },
762+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x12) },
763+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x13) },
764+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x14) },
765+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x15) },
766+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x17) },
767+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x18) },
768+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x19) },
769+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x1A) },
770+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x1B) },
771+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x1C) },
772+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x31) },
773+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x32) },
774+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x33) },
775+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x34) },
776+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x35) },
777+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x36) },
778+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x3A) },
779+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x3B) },
780+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x3D) },
781+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x3E) },
782+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x3F) },
783+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x48) },
784+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x49) },
785+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x4A) },
786+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x4B) },
787+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x4C) },
788+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x61) },
789+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x62) },
790+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x63) },
791+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x64) },
792+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x65) },
793+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x66) },
794+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x6A) },
795+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x6B) },
796+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x6D) },
797+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x6E) },
798+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x6F) },
799+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x78) },
800+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x79) },
801+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x7A) },
802+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x7B) },
803+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x7C) },
804+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x01) },
805+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x02) },
806+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x03) },
807+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x04) },
808+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x05) },
809+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x06) },
810+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x0A) },
811+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x0B) },
812+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x0D) },
813+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x0E) },
814+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x0F) },
815+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x10) },
816+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x12) },
817+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x13) },
818+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x14) },
819+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x15) },
820+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x17) },
821+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x18) },
822+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x19) },
823+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x1A) },
824+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x1B) },
825+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x1C) },
826+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x31) },
827+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x32) },
828+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x33) },
829+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x34) },
830+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x35) },
831+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x36) },
832+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x3A) },
833+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x3B) },
834+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x3D) },
835+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x3E) },
836+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x3F) },
837+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x48) },
838+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x49) },
839+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x4A) },
840+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x4B) },
841+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x4C) },
842+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x61) },
843+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x62) },
844+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x63) },
845+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x64) },
846+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x65) },
847+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x66) },
848+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x6A) },
849+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x6B) },
850+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x6D) },
851+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x6E) },
852+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x6F) },
853+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x78) },
854+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x79) },
855+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x7A) },
856+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x7B) },
857+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x7C) },
858+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x01) },
859+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x02) },
860+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x03) },
861+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x04) },
862+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x05) },
863+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x06) },
864+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x0A) },
865+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x0B) },
866+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x0D) },
867+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x0E) },
868+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x0F) },
869+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x10) },
870+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x12) },
871+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x13) },
872+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x14) },
873+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x15) },
874+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x17) },
875+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x18) },
876+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x19) },
877+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x1A) },
878+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x1B) },
879+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x1C) },
880+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x31) },
881+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x32) },
882+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x33) },
883+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x34) },
884+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x35) },
885+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x36) },
886+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x3A) },
887+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x3B) },
888+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x3D) },
889+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x3E) },
890+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x3F) },
891+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x48) },
892+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x49) },
893+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x4A) },
894+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x4B) },
895+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x4C) },
896+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x61) },
897+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x62) },
898+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x63) },
899+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x64) },
900+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x65) },
901+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x66) },
902+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x6A) },
903+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x6B) },
904+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x6D) },
905+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x6E) },
906+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x6F) },
907+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x78) },
908+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x79) },
909+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x7A) },
910+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x7B) },
911+ { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x7C) },
692912
693913
694914 { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) },
@@ -1257,7 +1477,9 @@ static const struct usb_device_id option_ids[] = { · 562 unmodified lines
12571477
12581478 { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100) },
12591479 { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD145) },
1260− { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD200) },
1480+ { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD200),
1481+ .driver_info = (kernel_ulong_t)&net_intf6_blacklist
1482+ },
12611483 { USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650 CDMA 450 1xEVDO modem */
12621484 { USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_GT_B3730, USB_CLASS_CDC_DATA, 0x00, 0x00) }, /* Samsung GT-B3730 LTE USB modem.*/
12631485 { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CEM600) },
@@ -1345,6 +1567,7 @@ static const struct usb_device_id option_ids[] = { · 81 unmodified lines
13451567 { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x00, 0x00) },
13461568 { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */
13471569 { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/C1 */
1570+ { USB_DEVICE(INOVIA_VENDOR_ID, INOVIA_SEW858) },
13481571 { } /* Terminating entry */
13491572 };
13501573 MODULE_DEVICE_TABLE(usb, option_ids);
drivers/usb/serial/ti_usb_3410_5052.c+1−0
@@ -190,6 +190,7 @@ static struct usb_device_id ti_id_table_combined[] = { · 189 unmodified lines
190190 { USB_DEVICE(IBM_VENDOR_ID, IBM_454B_PRODUCT_ID) },
191191 { USB_DEVICE(IBM_VENDOR_ID, IBM_454C_PRODUCT_ID) },
192192 { USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_PRODUCT_ID) },
193+ { USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_STRIP_PORT_ID) },
193194 { USB_DEVICE(TI_VENDOR_ID, FRI2_PRODUCT_ID) },
194195 { } /* terminator */
195196 };
drivers/usb/storage/scsiglue.c+4−1
@@ -211,8 +211,11 @@ static int slave_configure(struct scsi_device *sdev) · 210 unmodified lines
211211 /*
212212 * Many devices do not respond properly to READ_CAPACITY_16.
213213 * Tell the SCSI layer to try READ_CAPACITY_10 first.
214+ * However some USB 3.0 drive enclosures return capacity
215+ * modulo 2TB. Those must use READ_CAPACITY_16
214216 */
215− sdev->try_rc_10_first = 1;
217+ if (!(us->fflags & US_FL_NEEDS_CAP16))
218+ sdev->try_rc_10_first = 1;
216219
217220 /* assume SPC3 or latter devices support sense size > 18 */
218221 if (sdev->scsi_level > SCSI_SPC_2)
drivers/usb/storage/unusual_devs.h+7−0
@@ -1925,6 +1925,13 @@ UNUSUAL_DEV( 0x1652, 0x6600, 0x0201, 0x0201, · 1924 unmodified lines
19251925 USB_SC_DEVICE, USB_PR_DEVICE, NULL,
19261926 US_FL_IGNORE_RESIDUE ),
19271927
1928+/* Reported by Oliver Neukum <oneukum@suse.com> */
1929+UNUSUAL_DEV( 0x174c, 0x55aa, 0x0100, 0x0100,
1930+ "ASMedia",
1931+ "AS2105",
1932+ USB_SC_DEVICE, USB_PR_DEVICE, NULL,
1933+ US_FL_NEEDS_CAP16),
1934+
19281935 /* Reported by Jesse Feddema <jdfeddema@gmail.com> */
19291936 UNUSUAL_DEV( 0x177f, 0x0400, 0x0000, 0x0000,
19301937 "Yarvik",
include/linux/usb/usb_phy_gen_xceiv.h+1−1
@@ -12,7 +12,7 @@ struct usb_phy_gen_xceiv_platform_data { · 11 unmodified lines
1212 unsigned int needs_reset:1;
1313 };
1414
15−#if IS_ENABLED(CONFIG_NOP_USB_XCEIV)
15+#if defined(CONFIG_NOP_USB_XCEIV) || (defined(CONFIG_NOP_USB_XCEIV_MODULE) && defined(MODULE))
1616 /* sometimes transceivers are accessed only through e.g. ULPI */
1717 extern void usb_nop_xceiv_register(void);
1818 extern void usb_nop_xceiv_unregister(void);
include/linux/usb_usual.h+3−1
@@ -66,7 +66,9 @@ · 65 unmodified lines
6666 US_FLAG(INITIAL_READ10, 0x00100000) \
6767 /* Initial READ(10) (and others) must be retried */ \
6868 US_FLAG(WRITE_CACHE, 0x00200000) \
69− /* Write Cache status is not available */
69+ /* Write Cache status is not available */ \
70+ US_FLAG(NEEDS_CAP16, 0x00400000)
71+ /* cannot handle READ_CAPACITY_10 */
7072
7173 #define US_FLAG(name, value) US_FL_##name = value ,
7274 enum { US_DO_ALL_FLAGS };

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t