From 17d41d2afa687866d960f66a8108aa0d29c1fb19 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 7 Aug 2020 13:09:11 +0200 Subject: [PATCH] 4.4-stable patches added patches: usb-serial-qcserial-add-em7305-qdl-product-id.patch --- queue-4.14/series | 1 + queue-4.19/series | 1 + queue-4.4/series | 1 + ...l-qcserial-add-em7305-qdl-product-id.patch | 44 +++++++++++++++++++ queue-4.9/series | 1 + queue-5.4/series | 1 + queue-5.7/series | 2 + queue-5.8/series | 2 + 8 files changed, 53 insertions(+) create mode 100644 queue-4.14/series create mode 100644 queue-4.19/series create mode 100644 queue-4.4/usb-serial-qcserial-add-em7305-qdl-product-id.patch create mode 100644 queue-5.4/series create mode 100644 queue-5.7/series create mode 100644 queue-5.8/series diff --git a/queue-4.14/series b/queue-4.14/series new file mode 100644 index 00000000000..4c924ad1cfd --- /dev/null +++ b/queue-4.14/series @@ -0,0 +1 @@ +usb-serial-qcserial-add-em7305-qdl-product-id.patch diff --git a/queue-4.19/series b/queue-4.19/series new file mode 100644 index 00000000000..4c924ad1cfd --- /dev/null +++ b/queue-4.19/series @@ -0,0 +1 @@ +usb-serial-qcserial-add-em7305-qdl-product-id.patch diff --git a/queue-4.4/series b/queue-4.4/series index 7191f317c17..26f047165a0 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -30,3 +30,4 @@ random-fix-circular-include-dependency-on-arm64-after-addition-of-percpu.h.patch random32-remove-net_rand_state-from-the-latent-entropy-gcc-plugin.patch random32-move-the-pseudo-random-32-bit-definitions-to-prandom.h.patch ext4-fix-direct-i-o-read-error-for-kernel-stable-rc4.4.patch +usb-serial-qcserial-add-em7305-qdl-product-id.patch diff --git a/queue-4.4/usb-serial-qcserial-add-em7305-qdl-product-id.patch b/queue-4.4/usb-serial-qcserial-add-em7305-qdl-product-id.patch new file mode 100644 index 00000000000..db5adbb1a65 --- /dev/null +++ b/queue-4.4/usb-serial-qcserial-add-em7305-qdl-product-id.patch @@ -0,0 +1,44 @@ +From d2a4309c1ab6df424b2239fe2920d6f26f808d17 Mon Sep 17 00:00:00 2001 +From: Erik Ekman +Date: Fri, 17 Jul 2020 20:51:18 +0200 +Subject: USB: serial: qcserial: add EM7305 QDL product ID + +From: Erik Ekman + +commit d2a4309c1ab6df424b2239fe2920d6f26f808d17 upstream. + +When running qmi-firmware-update on the Sierra Wireless EM7305 in a Toshiba +laptop, it changed product ID to 0x9062 when entering QDL mode: + +usb 2-4: new high-speed USB device number 78 using xhci_hcd +usb 2-4: New USB device found, idVendor=1199, idProduct=9062, bcdDevice= 0.00 +usb 2-4: New USB device strings: Mfr=1, Product=2, SerialNumber=0 +usb 2-4: Product: EM7305 +usb 2-4: Manufacturer: Sierra Wireless, Incorporated + +The upgrade could complete after running + # echo 1199 9062 > /sys/bus/usb-serial/drivers/qcserial/new_id + +qcserial 2-4:1.0: Qualcomm USB modem converter detected +usb 2-4: Qualcomm USB modem converter now attached to ttyUSB0 + +Signed-off-by: Erik Ekman +Link: https://lore.kernel.org/r/20200717185118.3640219-1-erik@kryo.se +Cc: stable@vger.kernel.org +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/qcserial.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/usb/serial/qcserial.c ++++ b/drivers/usb/serial/qcserial.c +@@ -159,6 +159,7 @@ static const struct usb_device_id id_tab + {DEVICE_SWI(0x1199, 0x9056)}, /* Sierra Wireless Modem */ + {DEVICE_SWI(0x1199, 0x9060)}, /* Sierra Wireless Modem */ + {DEVICE_SWI(0x1199, 0x9061)}, /* Sierra Wireless Modem */ ++ {DEVICE_SWI(0x1199, 0x9062)}, /* Sierra Wireless EM7305 QDL */ + {DEVICE_SWI(0x1199, 0x9063)}, /* Sierra Wireless EM7305 */ + {DEVICE_SWI(0x1199, 0x9070)}, /* Sierra Wireless MC74xx */ + {DEVICE_SWI(0x1199, 0x9071)}, /* Sierra Wireless MC74xx */ diff --git a/queue-4.9/series b/queue-4.9/series index b7e40b8b3a2..707f13f2066 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -48,3 +48,4 @@ random-fix-circular-include-dependency-on-arm64-after-addition-of-percpu.h.patch random32-remove-net_rand_state-from-the-latent-entropy-gcc-plugin.patch random32-move-the-pseudo-random-32-bit-definitions-to-prandom.h.patch ext4-fix-direct-i-o-read-error.patch +usb-serial-qcserial-add-em7305-qdl-product-id.patch diff --git a/queue-5.4/series b/queue-5.4/series new file mode 100644 index 00000000000..4c924ad1cfd --- /dev/null +++ b/queue-5.4/series @@ -0,0 +1 @@ +usb-serial-qcserial-add-em7305-qdl-product-id.patch diff --git a/queue-5.7/series b/queue-5.7/series new file mode 100644 index 00000000000..0b374630dff --- /dev/null +++ b/queue-5.7/series @@ -0,0 +1,2 @@ +scsi-ufs-fix-and-simplify-setup_xfer_req-variant-operation.patch +usb-serial-qcserial-add-em7305-qdl-product-id.patch diff --git a/queue-5.8/series b/queue-5.8/series new file mode 100644 index 00000000000..0b374630dff --- /dev/null +++ b/queue-5.8/series @@ -0,0 +1,2 @@ +scsi-ufs-fix-and-simplify-setup_xfer_req-variant-operation.patch +usb-serial-qcserial-add-em7305-qdl-product-id.patch -- 2.47.3