Fixes for 4.9

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.9/drivers-net-usb-qmi_wwan-add-qmi_quirk_set_dtr-for-t.patch b/queue-4.9/drivers-net-usb-qmi_wwan-add-qmi_quirk_set_dtr-for-t.patch
new file mode 100644 (file)
index 0000000..c1a12db
--- /dev/null
+++ b/queue-4.9/drivers-net-usb-qmi_wwan-add-qmi_quirk_set_dtr-for-t.patch
@@ -0,0 +1,40 @@
+From 708979ca86d23b98444d7da20e0be447d879c061 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Mon, 10 Apr 2017 17:34:23 +0200
+Subject: drivers: net: usb: qmi_wwan: add QMI_QUIRK_SET_DTR for Telit PID
+ 0x1201
+
+From: Daniele Palmas <dnlplm@gmail.com>
+
+[ Upstream commit 14cf4a771b3098e431d2677e3533bdd962e478d8 ]
+
+Telit LE920A4 uses the same pid 0x1201 of LE920, but modem
+implementation is different, since it requires DTR to be set for
+answering to qmi messages.
+
+This patch replaces QMI_FIXED_INTF with QMI_QUIRK_SET_DTR: tests on
+LE920 have been performed in order to verify backward compatibility.
+
+Signed-off-by: Daniele Palmas <dnlplm@gmail.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/net/usb/qmi_wwan.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
+index 97a83d351a100..6104500314d18 100644
+--- a/drivers/net/usb/qmi_wwan.c
++++ b/drivers/net/usb/qmi_wwan.c
+@@ -927,7 +927,7 @@ static const struct usb_device_id products[] = {
+       {QMI_FIXED_INTF(0x1bc7, 0x1100, 3)},    /* Telit ME910 */
+       {QMI_FIXED_INTF(0x1bc7, 0x1101, 3)},    /* Telit ME910 dual modem */
+       {QMI_FIXED_INTF(0x1bc7, 0x1200, 5)},    /* Telit LE920 */
+-      {QMI_FIXED_INTF(0x1bc7, 0x1201, 2)},    /* Telit LE920 */
++      {QMI_QUIRK_SET_DTR(0x1bc7, 0x1201, 2)}, /* Telit LE920, LE920A4 */
+       {QMI_FIXED_INTF(0x1c9e, 0x9b01, 3)},    /* XS Stick W100-2 from 4G Systems */
+       {QMI_FIXED_INTF(0x0b3c, 0xc000, 4)},    /* Olivetti Olicard 100 */
+       {QMI_FIXED_INTF(0x0b3c, 0xc001, 4)},    /* Olivetti Olicard 120 */
+-- 
+2.25.1
+

diff --git a/queue-4.9/qmi_wwan-new-telewell-and-sierra-device-ids.patch b/queue-4.9/qmi_wwan-new-telewell-and-sierra-device-ids.patch
new file mode 100644 (file)
index 0000000..ce6758b
--- /dev/null
+++ b/queue-4.9/qmi_wwan-new-telewell-and-sierra-device-ids.patch
@@ -0,0 +1,50 @@
+From 6fd53e89dc7ccc10f0fadfa2208038488fc78992 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Tue, 13 Jun 2017 19:10:18 +0200
+Subject: qmi_wwan: new Telewell and Sierra device IDs
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Bjørn Mork <bjorn@mork.no>
+
+[ Upstream commit 60cfe1eaccb8af598ebe1bdc44e157ea30fcdd81 ]
+
+A new Sierra Wireless EM7305 device ID used in a Toshiba laptop,
+and two Longcheer device IDs entries used by Telewell TW-3G HSPA+
+branded modems.
+
+Reported-by: Petr Kloc <petr_kloc@yahoo.com>
+Reported-by: Teemu Likonen <tlikonen@iki.fi>
+Signed-off-by: Bjørn Mork <bjorn@mork.no>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/net/usb/qmi_wwan.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
+index 6104500314d18..d812335600212 100644
+--- a/drivers/net/usb/qmi_wwan.c
++++ b/drivers/net/usb/qmi_wwan.c
+@@ -910,6 +910,8 @@ static const struct usb_device_id products[] = {
+       {QMI_FIXED_INTF(0x1199, 0x9056, 8)},    /* Sierra Wireless Modem */
+       {QMI_FIXED_INTF(0x1199, 0x9057, 8)},
+       {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 */
+@@ -928,6 +930,8 @@ static const struct usb_device_id products[] = {
+       {QMI_FIXED_INTF(0x1bc7, 0x1101, 3)},    /* Telit ME910 dual modem */
+       {QMI_FIXED_INTF(0x1bc7, 0x1200, 5)},    /* Telit LE920 */
+       {QMI_QUIRK_SET_DTR(0x1bc7, 0x1201, 2)}, /* Telit LE920, LE920A4 */
++      {QMI_FIXED_INTF(0x1c9e, 0x9801, 3)},    /* Telewell TW-3G HSPA+ */
++      {QMI_FIXED_INTF(0x1c9e, 0x9803, 4)},    /* Telewell TW-3G HSPA+ */
+       {QMI_FIXED_INTF(0x1c9e, 0x9b01, 3)},    /* XS Stick W100-2 from 4G Systems */
+       {QMI_FIXED_INTF(0x0b3c, 0xc000, 4)},    /* Olivetti Olicard 100 */
+       {QMI_FIXED_INTF(0x0b3c, 0xc001, 4)},    /* Olivetti Olicard 120 */
+-- 
+2.25.1
+

diff --git a/queue-4.9/series b/queue-4.9/series
index 08079bd8b3d74b8b9b369d53e774f1ad4054a587..ec244a39254952e34ac50bfeecf597b7111ab349 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -35,3 +35,6 @@ uaccess-add-non-pagefault-user-space-read-functions.patch
 uaccess-add-non-pagefault-user-space-write-function.patch
 btrfs-fix-potential-deadlock-in-the-search-ioctl.patch
 net-usb-qmi_wwan-add-telit-0x1050-composition.patch
+drivers-net-usb-qmi_wwan-add-qmi_quirk_set_dtr-for-t.patch
+qmi_wwan-new-telewell-and-sierra-device-ids.patch
+usb-qmi_wwan-add-d-link-dwm-222-a2-device-id.patch

diff --git a/queue-4.9/usb-qmi_wwan-add-d-link-dwm-222-a2-device-id.patch b/queue-4.9/usb-qmi_wwan-add-d-link-dwm-222-a2-device-id.patch
new file mode 100644 (file)
index 0000000..459efe4
--- /dev/null
+++ b/queue-4.9/usb-qmi_wwan-add-d-link-dwm-222-a2-device-id.patch
@@ -0,0 +1,31 @@
+From e93f63e1954f86baeeafacac987cc6a6e5f06f52 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Wed, 17 Jul 2019 11:14:33 +0200
+Subject: usb: qmi_wwan: add D-Link DWM-222 A2 device ID
+
+From: Rogan Dawes <rogan@dawes.za.net>
+
+[ Upstream commit 7d6053097311643545a8118100175a39bd6fa637 ]
+
+Signed-off-by: Rogan Dawes <rogan@dawes.za.net>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/net/usb/qmi_wwan.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
+index d812335600212..74c925cd19a93 100644
+--- a/drivers/net/usb/qmi_wwan.c
++++ b/drivers/net/usb/qmi_wwan.c
+@@ -890,6 +890,7 @@ static const struct usb_device_id products[] = {
+       {QMI_FIXED_INTF(0x19d2, 0x2002, 4)},    /* ZTE (Vodafone) K3765-Z */
+       {QMI_FIXED_INTF(0x2001, 0x7e19, 4)},    /* D-Link DWM-221 B1 */
+       {QMI_FIXED_INTF(0x2001, 0x7e35, 4)},    /* D-Link DWM-222 */
++      {QMI_FIXED_INTF(0x2001, 0x7e3d, 4)},    /* D-Link DWM-222 A2 */
+       {QMI_FIXED_INTF(0x2020, 0x2031, 4)},    /* Olicard 600 */
+       {QMI_FIXED_INTF(0x2020, 0x2033, 4)},    /* BroadMobi BM806U */
+       {QMI_FIXED_INTF(0x2020, 0x2060, 4)},    /* BroadMobi BM818 */
+-- 
+2.25.1
+