Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'usb-4.20-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB fixes and ids from Greg KH:
"Here are some late xhci fixes for 4.20-rc8 as well as a few new device
ids for the option usb-serial driver.
The xhci fixes resolve some many-reported issues and all of these have
been in linux-next for a while with no reported problems"
* tag 'usb-4.20-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
USB: xhci: fix 'broken_suspend' placement in struct xchi_hcd
xhci: Don't prevent USB2 bus suspend in state check intended for USB3 only
USB: serial: option: add Telit LN940 series
USB: serial: option: add Fibocom NL668 series
USB: serial: option: add Simcom SIM7500/SIM7600 (MBIM mode)
USB: serial: option: add GosunCn ZTE WeLink ME3630
USB: serial: option: add HP lt4132
+19
-4
+2
-1
drivers/usb/host/xhci-hub.c
+2
-1
drivers/usb/host/xhci-hub.c
···
1507
1507
portsc_buf[port_index] = 0;
1508
1508
1509
1509
/* Bail out if a USB3 port has a new device in link training */
1510
-
if ((t1 & PORT_PLS_MASK) == XDEV_POLLING) {
1510
+
if ((hcd->speed >= HCD_USB3) &&
1511
+
(t1 & PORT_PLS_MASK) == XDEV_POLLING) {
1511
1512
bus_state->bus_suspended = 0;
1512
1513
spin_unlock_irqrestore(&xhci->lock, flags);
1513
1514
xhci_dbg(xhci, "Bus suspend bailout, port in polling\n");
+2
-2
drivers/usb/host/xhci.h
+2
-2
drivers/usb/host/xhci.h
···
1863
1863
unsigned sw_lpm_support:1;
1864
1864
/* support xHCI 1.0 spec USB2 hardware LPM */
1865
1865
unsigned hw_lpm_support:1;
1866
+
/* Broken Suspend flag for SNPS Suspend resume issue */
1867
+
unsigned broken_suspend:1;
1866
1868
/* cached usb2 extened protocol capabilites */
1867
1869
u32 *ext_caps;
1868
1870
unsigned int num_ext_caps;
···
1882
1880
void *dbc;
1883
1881
/* platform-specific data -- must come last */
1884
1882
unsigned long priv[0] __aligned(sizeof(s64));
1885
-
/* Broken Suspend flag for SNPS Suspend resume issue */
1886
-
u8 broken_suspend;
1887
1883
};
1888
1884
1889
1885
/* Platform specific overrides to generic XHCI hc_driver ops */
+15
-1
drivers/usb/serial/option.c
+15
-1
drivers/usb/serial/option.c
···
1164
1164
{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920A4_1213, 0xff) },
1165
1165
{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920A4_1214),
1166
1166
.driver_info = NCTRL(0) | RSVD(1) | RSVD(2) | RSVD(3) },
1167
+
{ USB_DEVICE(TELIT_VENDOR_ID, 0x1900), /* Telit LN940 (QMI) */
1168
+
.driver_info = NCTRL(0) | RSVD(1) },
1169
+
{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1901, 0xff), /* Telit LN940 (MBIM) */
1170
+
.driver_info = NCTRL(0) },
1167
1171
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF622, 0xff, 0xff, 0xff) }, /* ZTE WCDMA products */
1168
1172
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0002, 0xff, 0xff, 0xff),
1169
1173
.driver_info = RSVD(1) },
···
1332
1328
.driver_info = RSVD(4) },
1333
1329
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0414, 0xff, 0xff, 0xff) },
1334
1330
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0417, 0xff, 0xff, 0xff) },
1331
+
{ USB_DEVICE_INTERFACE_CLASS(ZTE_VENDOR_ID, 0x0602, 0xff) }, /* GosunCn ZTE WeLink ME3630 (MBIM mode) */
1335
1332
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1008, 0xff, 0xff, 0xff),
1336
1333
.driver_info = RSVD(4) },
1337
1334
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1010, 0xff, 0xff, 0xff),
···
1536
1531
.driver_info = RSVD(2) },
1537
1532
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1428, 0xff, 0xff, 0xff), /* Telewell TW-LTE 4G v2 */
1538
1533
.driver_info = RSVD(2) },
1534
+
{ USB_DEVICE_INTERFACE_CLASS(ZTE_VENDOR_ID, 0x1476, 0xff) }, /* GosunCn ZTE WeLink ME3630 (ECM/NCM mode) */
1539
1535
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1533, 0xff, 0xff, 0xff) },
1540
1536
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1534, 0xff, 0xff, 0xff) },
1541
1537
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1535, 0xff, 0xff, 0xff) },
···
1764
1758
{ USB_DEVICE_AND_INTERFACE_INFO(ALINK_VENDOR_ID, ALINK_PRODUCT_3GU, 0xff, 0xff, 0xff) },
1765
1759
{ USB_DEVICE(ALINK_VENDOR_ID, SIMCOM_PRODUCT_SIM7100E),
1766
1760
.driver_info = RSVD(5) | RSVD(6) },
1761
+
{ USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9003, 0xff) }, /* Simcom SIM7500/SIM7600 MBIM mode */
1767
1762
{ USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S_X200),
1768
1763
.driver_info = NCTRL(0) | NCTRL(1) | RSVD(4) },
1769
1764
{ USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220_X500D),
···
1947
1940
{ USB_DEVICE_AND_INTERFACE_INFO(WETELECOM_VENDOR_ID, WETELECOM_PRODUCT_WMD200, 0xff, 0xff, 0xff) },
1948
1941
{ USB_DEVICE_AND_INTERFACE_INFO(WETELECOM_VENDOR_ID, WETELECOM_PRODUCT_6802, 0xff, 0xff, 0xff) },
1949
1942
{ USB_DEVICE_AND_INTERFACE_INFO(WETELECOM_VENDOR_ID, WETELECOM_PRODUCT_WMD300, 0xff, 0xff, 0xff) },
1950
-
{ USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0x421d, 0xff, 0xff, 0xff) }, /* HP lt2523 (Novatel E371) */
1943
+
{ USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0x421d, 0xff, 0xff, 0xff) }, /* HP lt2523 (Novatel E371) */
1944
+
{ USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0xa31d, 0xff, 0x06, 0x10) }, /* HP lt4132 (Huawei ME906s-158) */
1945
+
{ USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0xa31d, 0xff, 0x06, 0x12) },
1946
+
{ USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0xa31d, 0xff, 0x06, 0x13) },
1947
+
{ USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0xa31d, 0xff, 0x06, 0x14) },
1948
+
{ USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0xa31d, 0xff, 0x06, 0x1b) },
1949
+
{ USB_DEVICE(0x1508, 0x1001), /* Fibocom NL668 */
1950
+
.driver_info = RSVD(4) | RSVD(5) | RSVD(6) },
1951
1951
{ } /* Terminating entry */
1952
1952
};
1953
1953
MODULE_DEVICE_TABLE(usb, option_ids);