4.9-stable patches

added patches:
	qmi_wwan-apply-set_dtr-quirk-to-the-simcom-shared-device-id.patch

diff --git a/queue-4.9/qmi_wwan-apply-set_dtr-quirk-to-the-simcom-shared-device-id.patch b/queue-4.9/qmi_wwan-apply-set_dtr-quirk-to-the-simcom-shared-device-id.patch
new file mode 100644 (file)
index 0000000..3f4b7de
--- /dev/null
+++ b/queue-4.9/qmi_wwan-apply-set_dtr-quirk-to-the-simcom-shared-device-id.patch
@@ -0,0 +1,48 @@
+From 102cd909635612c0be784a519651954a7924c786 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= <bjorn@mork.no>
+Date: Fri, 25 May 2018 15:00:20 +0200
+Subject: qmi_wwan: apply SET_DTR quirk to the SIMCOM shared device ID
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Bjørn Mork <bjorn@mork.no>
+
+commit 102cd909635612c0be784a519651954a7924c786 upstream.
+
+SIMCOM are reusing a single device ID for many (all of their?)
+different modems, based on different chipsets and firmwares. Newer
+Qualcomm chipset generations require setting DTR to wake the QMI
+function.  The SIM7600E modem is using such a chipset, making it
+fail to work with this driver despite the device ID match.
+
+Fix by unconditionally enabling the SET_DTR quirk for all SIMCOM
+modems using this specific device ID.  This is similar to what
+we already have done for another case of device IDs recycled over
+multiple chipset generations: 14cf4a771b30 ("drivers: net: usb:
+qmi_wwan: add QMI_QUIRK_SET_DTR for Telit PID 0x1201")
+
+Initial testing on an older SIM7100 modem shows no immediate side
+effects.
+
+Reported-by: Sebastian Sjoholm <sebastian.sjoholm@gmail.com>
+Cc: Reinhard Speyerer <rspmn@arcor.de>
+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 |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/usb/qmi_wwan.c
++++ b/drivers/net/usb/qmi_wwan.c
+@@ -951,7 +951,7 @@ static const struct usb_device_id produc
+       {QMI_FIXED_INTF(0x03f0, 0x4e1d, 8)},    /* HP lt4111 LTE/EV-DO/HSPA+ Gobi 4G Module */
+       {QMI_FIXED_INTF(0x03f0, 0x9d1d, 1)},    /* HP lt4120 Snapdragon X5 LTE */
+       {QMI_FIXED_INTF(0x22de, 0x9061, 3)},    /* WeTelecom WPD-600N */
+-      {QMI_FIXED_INTF(0x1e0e, 0x9001, 5)},    /* SIMCom 7230E */
++      {QMI_QUIRK_SET_DTR(0x1e0e, 0x9001, 5)}, /* SIMCom 7100E, 7230E, 7600E ++ */
+       {QMI_QUIRK_SET_DTR(0x2c7c, 0x0125, 4)}, /* Quectel EC25, EC20 R2.0  Mini PCIe */
+       {QMI_QUIRK_SET_DTR(0x2c7c, 0x0121, 4)}, /* Quectel EC21 Mini PCIe */
+       {QMI_QUIRK_SET_DTR(0x2c7c, 0x0191, 4)}, /* Quectel EG91 */

diff --git a/queue-4.9/series b/queue-4.9/series
index 86ffe1a8063afd91fc24ae5e472446e2979839d2..04502869bb7b69594a422c4fdbb0a5c5f2e4136d 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -38,3 +38,4 @@ usb-serial-pl2303-add-ids-for-hewlett-packard-hp-pos-pole-displays.patch
 usb-serial-option-add-fibocom-nl678-series.patch
 usb-r8a66597-fix-a-possible-concurrency-use-after-free-bug-in-r8a66597_endpoint_disable.patch
 staging-wilc1000-fix-missing-read_write-setting-when-reading-data.patch
+qmi_wwan-apply-set_dtr-quirk-to-the-simcom-shared-device-id.patch