| From foo@baz Wed Sep 26 11:28:02 CEST 2018 |
| From: Bjørn Mork <bjorn@mork.no> |
| Date: Mon, 17 Sep 2018 22:00:24 +0200 |
| Subject: qmi_wwan: set DTR for modems in forced USB2 mode |
| |
| From: Bjørn Mork <bjorn@mork.no> |
| |
| [ Upstream commit 922005c7f50e7f4b2a6dbc182e9c575b4f92396b ] |
| |
| Recent firmware revisions have added the ability to force |
| these modems to USB2 mode, hiding their SuperSpeed |
| capabilities from the host. The driver has been using the |
| SuperSpeed capability, as shown by the bcdUSB field of the |
| device descriptor, to detect the need to enable the DTR |
| quirk. This method fails when the modems are forced to |
| USB2 mode by the modem firmware. |
| |
| Fix by unconditionally enabling the DTR quirk for the |
| affected device IDs. |
| |
| Reported-by: Fred Veldini <fred.veldini@gmail.com> |
| Reported-by: Deshu Wen <dwen@sierrawireless.com> |
| Signed-off-by: Bjørn Mork <bjorn@mork.no> |
| Reported-by: Fred Veldini <fred.veldini@gmail.com> |
| Reported-by: Deshu Wen <dwen@sierrawireless.com> |
| Signed-off-by: Bjørn Mork <bjorn@mork.no> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/usb/qmi_wwan.c | 14 +++++++------- |
| 1 file changed, 7 insertions(+), 7 deletions(-) |
| |
| --- a/drivers/net/usb/qmi_wwan.c |
| +++ b/drivers/net/usb/qmi_wwan.c |
| @@ -1205,13 +1205,13 @@ static const struct usb_device_id produc |
| {QMI_FIXED_INTF(0x1199, 0x9061, 8)}, /* Sierra Wireless Modem */ |
| {QMI_FIXED_INTF(0x1199, 0x9063, 8)}, /* Sierra Wireless EM7305 */ |
| {QMI_FIXED_INTF(0x1199, 0x9063, 10)}, /* Sierra Wireless EM7305 */ |
| - {QMI_FIXED_INTF(0x1199, 0x9071, 8)}, /* Sierra Wireless MC74xx */ |
| - {QMI_FIXED_INTF(0x1199, 0x9071, 10)}, /* Sierra Wireless MC74xx */ |
| - {QMI_FIXED_INTF(0x1199, 0x9079, 8)}, /* Sierra Wireless EM74xx */ |
| - {QMI_FIXED_INTF(0x1199, 0x9079, 10)}, /* Sierra Wireless EM74xx */ |
| - {QMI_FIXED_INTF(0x1199, 0x907b, 8)}, /* Sierra Wireless EM74xx */ |
| - {QMI_FIXED_INTF(0x1199, 0x907b, 10)}, /* Sierra Wireless EM74xx */ |
| - {QMI_FIXED_INTF(0x1199, 0x9091, 8)}, /* Sierra Wireless EM7565 */ |
| + {QMI_QUIRK_SET_DTR(0x1199, 0x9071, 8)}, /* Sierra Wireless MC74xx */ |
| + {QMI_QUIRK_SET_DTR(0x1199, 0x9071, 10)},/* Sierra Wireless MC74xx */ |
| + {QMI_QUIRK_SET_DTR(0x1199, 0x9079, 8)}, /* Sierra Wireless EM74xx */ |
| + {QMI_QUIRK_SET_DTR(0x1199, 0x9079, 10)},/* Sierra Wireless EM74xx */ |
| + {QMI_QUIRK_SET_DTR(0x1199, 0x907b, 8)}, /* Sierra Wireless EM74xx */ |
| + {QMI_QUIRK_SET_DTR(0x1199, 0x907b, 10)},/* Sierra Wireless EM74xx */ |
| + {QMI_QUIRK_SET_DTR(0x1199, 0x9091, 8)}, /* Sierra Wireless EM7565 */ |
| {QMI_FIXED_INTF(0x1bbb, 0x011e, 4)}, /* Telekom Speedstick LTE II (Alcatel One Touch L100V LTE) */ |
| {QMI_FIXED_INTF(0x1bbb, 0x0203, 2)}, /* Alcatel L800MA */ |
| {QMI_FIXED_INTF(0x2357, 0x0201, 4)}, /* TP-LINK HSUPA Modem MA180 */ |
