projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| a81a45e9 | 1 | From foo@baz Wed Sep 26 11:27:32 CEST 2018 |
| 341110f9 | 2 | From: Bjørn Mork <bjorn@mork.no> |
| a81a45e9 GKH |
3 | Date: Mon, 17 Sep 2018 22:00:24 +0200 |
| 4 | Subject: qmi_wwan: set DTR for modems in forced USB2 mode | |
| 5 | ||
| 341110f9 | 6 | From: Bjørn Mork <bjorn@mork.no> |
| a81a45e9 GKH |
7 | |
| 8 | [ Upstream commit 922005c7f50e7f4b2a6dbc182e9c575b4f92396b ] | |
| 9 | ||
| 10 | Recent firmware revisions have added the ability to force | |
| 11 | these modems to USB2 mode, hiding their SuperSpeed | |
| 12 | capabilities from the host. The driver has been using the | |
| 13 | SuperSpeed capability, as shown by the bcdUSB field of the | |
| 14 | device descriptor, to detect the need to enable the DTR | |
| 15 | quirk. This method fails when the modems are forced to | |
| 16 | USB2 mode by the modem firmware. | |
| 17 | ||
| 18 | Fix by unconditionally enabling the DTR quirk for the | |
| 19 | affected device IDs. | |
| 20 | ||
| 21 | Reported-by: Fred Veldini <fred.veldini@gmail.com> | |
| 22 | Reported-by: Deshu Wen <dwen@sierrawireless.com> | |
| 23 | Signed-off-by: Bjørn Mork <bjorn@mork.no> | |
| 24 | Reported-by: Fred Veldini <fred.veldini@gmail.com> | |
| 25 | Reported-by: Deshu Wen <dwen@sierrawireless.com> | |
| 26 | Signed-off-by: Bjørn Mork <bjorn@mork.no> | |
| 27 | Signed-off-by: David S. Miller <davem@davemloft.net> | |
| 28 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 29 | --- | |
| 30 | drivers/net/usb/qmi_wwan.c | 14 +++++++------- | |
| 31 | 1 file changed, 7 insertions(+), 7 deletions(-) | |
| 32 | ||
| 33 | --- a/drivers/net/usb/qmi_wwan.c | |
| 34 | +++ b/drivers/net/usb/qmi_wwan.c | |
| 35 | @@ -1206,13 +1206,13 @@ static const struct usb_device_id produc | |
| 36 | {QMI_FIXED_INTF(0x1199, 0x9061, 8)}, /* Sierra Wireless Modem */ | |
| 37 | {QMI_FIXED_INTF(0x1199, 0x9063, 8)}, /* Sierra Wireless EM7305 */ | |
| 38 | {QMI_FIXED_INTF(0x1199, 0x9063, 10)}, /* Sierra Wireless EM7305 */ | |
| 39 | - {QMI_FIXED_INTF(0x1199, 0x9071, 8)}, /* Sierra Wireless MC74xx */ | |
| 40 | - {QMI_FIXED_INTF(0x1199, 0x9071, 10)}, /* Sierra Wireless MC74xx */ | |
| 41 | - {QMI_FIXED_INTF(0x1199, 0x9079, 8)}, /* Sierra Wireless EM74xx */ | |
| 42 | - {QMI_FIXED_INTF(0x1199, 0x9079, 10)}, /* Sierra Wireless EM74xx */ | |
| 43 | - {QMI_FIXED_INTF(0x1199, 0x907b, 8)}, /* Sierra Wireless EM74xx */ | |
| 44 | - {QMI_FIXED_INTF(0x1199, 0x907b, 10)}, /* Sierra Wireless EM74xx */ | |
| 45 | - {QMI_FIXED_INTF(0x1199, 0x9091, 8)}, /* Sierra Wireless EM7565 */ | |
| 46 | + {QMI_QUIRK_SET_DTR(0x1199, 0x9071, 8)}, /* Sierra Wireless MC74xx */ | |
| 47 | + {QMI_QUIRK_SET_DTR(0x1199, 0x9071, 10)},/* Sierra Wireless MC74xx */ | |
| 48 | + {QMI_QUIRK_SET_DTR(0x1199, 0x9079, 8)}, /* Sierra Wireless EM74xx */ | |
| 49 | + {QMI_QUIRK_SET_DTR(0x1199, 0x9079, 10)},/* Sierra Wireless EM74xx */ | |
| 50 | + {QMI_QUIRK_SET_DTR(0x1199, 0x907b, 8)}, /* Sierra Wireless EM74xx */ | |
| 51 | + {QMI_QUIRK_SET_DTR(0x1199, 0x907b, 10)},/* Sierra Wireless EM74xx */ | |
| 52 | + {QMI_QUIRK_SET_DTR(0x1199, 0x9091, 8)}, /* Sierra Wireless EM7565 */ | |
| 53 | {QMI_FIXED_INTF(0x1bbb, 0x011e, 4)}, /* Telekom Speedstick LTE II (Alcatel One Touch L100V LTE) */ | |
| 54 | {QMI_FIXED_INTF(0x1bbb, 0x0203, 2)}, /* Alcatel L800MA */ | |
| 55 | {QMI_FIXED_INTF(0x2357, 0x0201, 4)}, /* TP-LINK HSUPA Modem MA180 */ |