From: Greg Kroah-Hartman Date: Sun, 2 Oct 2022 09:45:35 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v5.19.13~47 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5537888c73e2e7f935865a53e4b159fd0daa2c57;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: net-usb-qmi_wwan-add-new-usb-id-for-dell-branded-em7455.patch uas-add-no-uas-quirk-for-hiksemi-usb_disk.patch uas-ignore-uas-for-thinkplus-chips.patch usb-storage-add-hiksemi-usb3-fw-to-ignore_uas.patch --- diff --git a/queue-4.9/net-usb-qmi_wwan-add-new-usb-id-for-dell-branded-em7455.patch b/queue-4.9/net-usb-qmi_wwan-add-new-usb-id-for-dell-branded-em7455.patch new file mode 100644 index 00000000000..426fc7e48fe --- /dev/null +++ b/queue-4.9/net-usb-qmi_wwan-add-new-usb-id-for-dell-branded-em7455.patch @@ -0,0 +1,34 @@ +From 797666cd5af041ffb66642fff62f7389f08566a2 Mon Sep 17 00:00:00 2001 +From: Frank Wunderlich +Date: Mon, 26 Sep 2022 17:07:40 +0200 +Subject: net: usb: qmi_wwan: Add new usb-id for Dell branded EM7455 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Frank Wunderlich + +commit 797666cd5af041ffb66642fff62f7389f08566a2 upstream. + +Add support for Dell 5811e (EM7455) with USB-id 0x413c:0x81c2. + +Signed-off-by: Frank Wunderlich +Cc: stable@vger.kernel.org +Acked-by: Bjørn Mork +Link: https://lore.kernel.org/r/20220926150740.6684-3-linux@fw-web.de +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/usb/qmi_wwan.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/net/usb/qmi_wwan.c ++++ b/drivers/net/usb/qmi_wwan.c +@@ -966,6 +966,7 @@ static const struct usb_device_id produc + {QMI_FIXED_INTF(0x413c, 0x81b3, 8)}, /* Dell Wireless 5809e Gobi(TM) 4G LTE Mobile Broadband Card (rev3) */ + {QMI_FIXED_INTF(0x413c, 0x81b6, 8)}, /* Dell Wireless 5811e */ + {QMI_FIXED_INTF(0x413c, 0x81b6, 10)}, /* Dell Wireless 5811e */ ++ {QMI_FIXED_INTF(0x413c, 0x81c2, 8)}, /* Dell Wireless 5811e */ + {QMI_FIXED_INTF(0x413c, 0x81cc, 8)}, /* Dell Wireless 5816e */ + {QMI_FIXED_INTF(0x413c, 0x81d7, 0)}, /* Dell Wireless 5821e */ + {QMI_FIXED_INTF(0x413c, 0x81d7, 1)}, /* Dell Wireless 5821e preproduction config */ diff --git a/queue-4.9/series b/queue-4.9/series new file mode 100644 index 00000000000..343fb39cd02 --- /dev/null +++ b/queue-4.9/series @@ -0,0 +1,4 @@ +uas-add-no-uas-quirk-for-hiksemi-usb_disk.patch +usb-storage-add-hiksemi-usb3-fw-to-ignore_uas.patch +uas-ignore-uas-for-thinkplus-chips.patch +net-usb-qmi_wwan-add-new-usb-id-for-dell-branded-em7455.patch diff --git a/queue-4.9/uas-add-no-uas-quirk-for-hiksemi-usb_disk.patch b/queue-4.9/uas-add-no-uas-quirk-for-hiksemi-usb_disk.patch new file mode 100644 index 00000000000..f47e25bafec --- /dev/null +++ b/queue-4.9/uas-add-no-uas-quirk-for-hiksemi-usb_disk.patch @@ -0,0 +1,50 @@ +From a625a4b8806cc1e928b7dd2cca1fee709c9de56e Mon Sep 17 00:00:00 2001 +From: Hongling Zeng +Date: Fri, 23 Sep 2022 10:46:13 +0800 +Subject: uas: add no-uas quirk for Hiksemi usb_disk + +From: Hongling Zeng + +commit a625a4b8806cc1e928b7dd2cca1fee709c9de56e upstream. + +The UAS mode of Hiksemi is reported to fail to work on several platforms +with the following error message, then after re-connecting the device will +be offlined and not working at all. + +[ 592.518442][ 2] sd 8:0:0:0: [sda] tag#17 uas_eh_abort_handler 0 uas-tag 18 + inflight: CMD +[ 592.527575][ 2] sd 8:0:0:0: [sda] tag#17 CDB: Write(10) 2a 00 03 6f 88 00 00 + 04 00 00 +[ 592.536330][ 2] sd 8:0:0:0: [sda] tag#0 uas_eh_abort_handler 0 uas-tag 1 + inflight: CMD +[ 592.545266][ 2] sd 8:0:0:0: [sda] tag#0 CDB: Write(10) 2a 00 07 44 1a 88 00 + 00 08 00 + +These disks have a broken uas implementation, the tag field of the status +iu-s is not set properly,so we need to fall-back to usb-storage. + +Acked-by: Alan Stern +Cc: stable +Signed-off-by: Hongling Zeng +Link: https://lore.kernel.org/r/1663901173-21020-1-git-send-email-zenghongling@kylinos.cn +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/storage/unusual_uas.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/usb/storage/unusual_uas.h ++++ b/drivers/usb/storage/unusual_uas.h +@@ -62,6 +62,13 @@ UNUSUAL_DEV(0x059f, 0x1061, 0x0000, 0x99 + USB_SC_DEVICE, USB_PR_DEVICE, NULL, + US_FL_IGNORE_UAS), + ++/* Reported-by: Hongling Zeng */ ++UNUSUAL_DEV(0x090c, 0x2000, 0x0000, 0x9999, ++ "Hiksemi", ++ "External HDD", ++ USB_SC_DEVICE, USB_PR_DEVICE, NULL, ++ US_FL_IGNORE_UAS), ++ + /* + * Apricorn USB3 dongle sometimes returns "USBSUSBSUSBS" in response to SCSI + * commands in UAS mode. Observed with the 1.28 firmware; are there others? diff --git a/queue-4.9/uas-ignore-uas-for-thinkplus-chips.patch b/queue-4.9/uas-ignore-uas-for-thinkplus-chips.patch new file mode 100644 index 00000000000..b8fc096c404 --- /dev/null +++ b/queue-4.9/uas-ignore-uas-for-thinkplus-chips.patch @@ -0,0 +1,60 @@ +From 0fb9703a3eade0bb84c635705d9c795345e55053 Mon Sep 17 00:00:00 2001 +From: Hongling Zeng +Date: Fri, 23 Sep 2022 10:46:35 +0800 +Subject: uas: ignore UAS for Thinkplus chips + +From: Hongling Zeng + +commit 0fb9703a3eade0bb84c635705d9c795345e55053 upstream. + +The UAS mode of Thinkplus(0x17ef, 0x3899) is reported to influence +performance and trigger kernel panic on several platforms with the +following error message: + +[ 39.702439] xhci_hcd 0000:0c:00.3: ERROR Transfer event for disabled + endpoint or incorrect stream ring +[ 39.702442] xhci_hcd 0000:0c:00.3: @000000026c61f810 00000000 00000000 + 1b000000 05038000 + +[ 720.545894][13] Workqueue: usb_hub_wq hub_event +[ 720.550971][13] ffff88026c143c38 0000000000016300 ffff8802755bb900 ffff880 + 26cb80000 +[ 720.559673][13] ffff88026c144000 ffff88026ca88100 0000000000000000 ffff880 + 26cb80000 +[ 720.568374][13] ffff88026cb80000 ffff88026c143c50 ffffffff8186ae25 ffff880 + 26ca880f8 +[ 720.577076][13] Call Trace: +[ 720.580201][13] [] schedule+0x35/0x80 +[ 720.586137][13] [] schedule_preempt_disabled+0xe/0x10 +[ 720.593623][13] [] __mutex_lock_slowpath+0x164/0x1e0 +[ 720.601012][13] [] mutex_lock+0x2f/0x40 +[ 720.607141][13] [] usb_disconnect+0x59/0x290 + +Falling back to USB mass storage can solve this problem, so ignore UAS +function of this chip. + +Acked-by: Alan Stern +Cc: stable +Signed-off-by: Hongling Zeng +Link: https://lore.kernel.org/r/1663902249837086.19.seg@mailgw +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/storage/unusual_uas.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/usb/storage/unusual_uas.h ++++ b/drivers/usb/storage/unusual_uas.h +@@ -198,6 +198,13 @@ UNUSUAL_DEV(0x154b, 0xf00d, 0x0000, 0x99 + USB_SC_DEVICE, USB_PR_DEVICE, NULL, + US_FL_NO_ATA_1X), + ++/* Reported-by: Hongling Zeng */ ++UNUSUAL_DEV(0x17ef, 0x3899, 0x0000, 0x9999, ++ "Thinkplus", ++ "External HDD", ++ USB_SC_DEVICE, USB_PR_DEVICE, NULL, ++ US_FL_IGNORE_UAS), ++ + /* Reported-by: Hans de Goede */ + UNUSUAL_DEV(0x2109, 0x0711, 0x0000, 0x9999, + "VIA", diff --git a/queue-4.9/usb-storage-add-hiksemi-usb3-fw-to-ignore_uas.patch b/queue-4.9/usb-storage-add-hiksemi-usb3-fw-to-ignore_uas.patch new file mode 100644 index 00000000000..1bc9a375248 --- /dev/null +++ b/queue-4.9/usb-storage-add-hiksemi-usb3-fw-to-ignore_uas.patch @@ -0,0 +1,50 @@ +From e00b488e813f0f1ad9f778e771b7cd2fe2877023 Mon Sep 17 00:00:00 2001 +From: Hongling Zeng +Date: Fri, 23 Sep 2022 10:46:25 +0800 +Subject: usb-storage: Add Hiksemi USB3-FW to IGNORE_UAS + +From: Hongling Zeng + +commit e00b488e813f0f1ad9f778e771b7cd2fe2877023 upstream. + +The UAS mode of Hiksemi USB_HDD is reported to fail to work on several +platforms with the following error message, then after re-connecting the +device will be offlined and not working at all. + +[ 592.518442][ 2] sd 8:0:0:0: [sda] tag#17 uas_eh_abort_handler 0 uas-tag 18 + inflight: CMD +[ 592.527575][ 2] sd 8:0:0:0: [sda] tag#17 CDB: Write(10) 2a 00 03 6f 88 00 00 + 04 00 00 +[ 592.536330][ 2] sd 8:0:0:0: [sda] tag#0 uas_eh_abort_handler 0 uas-tag 1 + inflight: CMD +[ 592.545266][ 2] sd 8:0:0:0: [sda] tag#0 CDB: Write(10) 2a 00 07 44 1a 88 00 + 00 08 00 + +These disks have a broken uas implementation, the tag field of the status +iu-s is not set properly,so we need to fall-back to usb-storage. + +Acked-by: Alan Stern +Cc: stable +Signed-off-by: Hongling Zeng +Link: https://lore.kernel.org/r/1663901185-21067-1-git-send-email-zenghongling@kylinos.cn +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/storage/unusual_uas.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/usb/storage/unusual_uas.h ++++ b/drivers/usb/storage/unusual_uas.h +@@ -149,6 +149,13 @@ UNUSUAL_DEV(0x0bc2, 0xab2a, 0x0000, 0x99 + USB_SC_DEVICE, USB_PR_DEVICE, NULL, + US_FL_NO_ATA_1X), + ++/* Reported-by: Hongling Zeng */ ++UNUSUAL_DEV(0x0bda, 0x9210, 0x0000, 0x9999, ++ "Hiksemi", ++ "External HDD", ++ USB_SC_DEVICE, USB_PR_DEVICE, NULL, ++ US_FL_IGNORE_UAS), ++ + /* Reported-by: Benjamin Tissoires */ + UNUSUAL_DEV(0x13fd, 0x3940, 0x0000, 0x9999, + "Initio Corporation",