From: Sasha Levin Date: Mon, 21 Feb 2022 04:50:52 +0000 (-0500) Subject: Fixes for 4.9 X-Git-Tag: v4.9.303~26^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd107792e65971b1634820b5cbeb024242c29581;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.9 Signed-off-by: Sasha Levin --- diff --git a/queue-4.9/ata-libata-core-disable-trim-on-m88v29.patch b/queue-4.9/ata-libata-core-disable-trim-on-m88v29.patch new file mode 100644 index 00000000000..cd59046d258 --- /dev/null +++ b/queue-4.9/ata-libata-core-disable-trim-on-m88v29.patch @@ -0,0 +1,43 @@ +From 7524fe7a02579e5a0b8c7d475ebdbe99f0db29b2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 4 Feb 2022 13:57:50 +0100 +Subject: ata: libata-core: Disable TRIM on M88V29 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Zoltán Böszörményi + +[ Upstream commit c8ea23d5fa59f28302d4e3370c75d9c308e64410 ] + +This device is a CF card, or possibly an SSD in CF form factor. +It supports NCQ and high speed DMA. + +While it also advertises TRIM support, I/O errors are reported +when the discard mount option fstrim is used. TRIM also fails +when disabling NCQ and not just as an NCQ command. + +TRIM must be disabled for this device. + +Signed-off-by: Zoltán Böszörményi +Signed-off-by: Damien Le Moal +Signed-off-by: Sasha Levin +--- + drivers/ata/libata-core.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c +index a92cbe1aa72a2..35db918a1de56 100644 +--- a/drivers/ata/libata-core.c ++++ b/drivers/ata/libata-core.c +@@ -4486,6 +4486,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { + + /* devices that don't properly handle TRIM commands */ + { "SuperSSpeed S238*", NULL, ATA_HORKAGE_NOTRIM, }, ++ { "M88V29*", NULL, ATA_HORKAGE_NOTRIM, }, + + /* + * As defined, the DRAT (Deterministic Read After Trim) and RZAT +-- +2.34.1 + diff --git a/queue-4.9/ata-libata-core-disable-trim-on-m88v29.patch-3307 b/queue-4.9/ata-libata-core-disable-trim-on-m88v29.patch-3307 new file mode 100644 index 00000000000..cd59046d258 --- /dev/null +++ b/queue-4.9/ata-libata-core-disable-trim-on-m88v29.patch-3307 @@ -0,0 +1,43 @@ +From 7524fe7a02579e5a0b8c7d475ebdbe99f0db29b2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 4 Feb 2022 13:57:50 +0100 +Subject: ata: libata-core: Disable TRIM on M88V29 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Zoltán Böszörményi + +[ Upstream commit c8ea23d5fa59f28302d4e3370c75d9c308e64410 ] + +This device is a CF card, or possibly an SSD in CF form factor. +It supports NCQ and high speed DMA. + +While it also advertises TRIM support, I/O errors are reported +when the discard mount option fstrim is used. TRIM also fails +when disabling NCQ and not just as an NCQ command. + +TRIM must be disabled for this device. + +Signed-off-by: Zoltán Böszörményi +Signed-off-by: Damien Le Moal +Signed-off-by: Sasha Levin +--- + drivers/ata/libata-core.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c +index a92cbe1aa72a2..35db918a1de56 100644 +--- a/drivers/ata/libata-core.c ++++ b/drivers/ata/libata-core.c +@@ -4486,6 +4486,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { + + /* devices that don't properly handle TRIM commands */ + { "SuperSSpeed S238*", NULL, ATA_HORKAGE_NOTRIM, }, ++ { "M88V29*", NULL, ATA_HORKAGE_NOTRIM, }, + + /* + * As defined, the DRAT (Deterministic Read After Trim) and RZAT +-- +2.34.1 + diff --git a/queue-4.9/net-usb-qmi_wwan-add-support-for-dell-dw5829e.patch b/queue-4.9/net-usb-qmi_wwan-add-support-for-dell-dw5829e.patch new file mode 100644 index 00000000000..7d4f3387472 --- /dev/null +++ b/queue-4.9/net-usb-qmi_wwan-add-support-for-dell-dw5829e.patch @@ -0,0 +1,70 @@ +From 4b5a13c7c300502dc61385a0a6858c1d747884ec Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 9 Feb 2022 10:47:17 +0800 +Subject: net: usb: qmi_wwan: Add support for Dell DW5829e +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Slark Xiao + +[ Upstream commit 8ecbb179286cbc91810c16caeb3396e06305cd0c ] + +Dell DW5829e same as DW5821e except the CAT level. +DW5821e supports CAT16 but DW5829e supports CAT9. +Also, DW5829e includes normal and eSIM type. +Please see below test evidence: + +T: Bus=04 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#= 5 Spd=5000 MxCh= 0 +D: Ver= 3.10 Cls=ef(misc ) Sub=02 Prot=01 MxPS= 9 #Cfgs= 1 +P: Vendor=413c ProdID=81e6 Rev=03.18 +S: Manufacturer=Dell Inc. +S: Product=DW5829e Snapdragon X20 LTE +S: SerialNumber=0123456789ABCDEF +C: #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=896mA +I: If#=0x0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan +I: If#=0x1 Alt= 0 #EPs= 1 Cls=03(HID ) Sub=00 Prot=00 Driver=usbhid +I: If#=0x2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +I: If#=0x3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +I: If#=0x4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +I: If#=0x5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option + +T: Bus=04 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#= 7 Spd=5000 MxCh= 0 +D: Ver= 3.10 Cls=ef(misc ) Sub=02 Prot=01 MxPS= 9 #Cfgs= 1 +P: Vendor=413c ProdID=81e4 Rev=03.18 +S: Manufacturer=Dell Inc. +S: Product=DW5829e-eSIM Snapdragon X20 LTE +S: SerialNumber=0123456789ABCDEF +C: #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=896mA +I: If#=0x0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan +I: If#=0x1 Alt= 0 #EPs= 1 Cls=03(HID ) Sub=00 Prot=00 Driver=usbhid +I: If#=0x2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +I: If#=0x3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +I: If#=0x4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +I: If#=0x5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option + +Signed-off-by: Slark Xiao +Acked-by: Bjørn Mork +Link: https://lore.kernel.org/r/20220209024717.8564-1-slark_xiao@163.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/usb/qmi_wwan.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c +index a8c960152a357..003c53a5bb336 100644 +--- a/drivers/net/usb/qmi_wwan.c ++++ b/drivers/net/usb/qmi_wwan.c +@@ -964,6 +964,8 @@ static const struct usb_device_id products[] = { + {QMI_FIXED_INTF(0x413c, 0x81d7, 0)}, /* Dell Wireless 5821e */ + {QMI_FIXED_INTF(0x413c, 0x81d7, 1)}, /* Dell Wireless 5821e preproduction config */ + {QMI_FIXED_INTF(0x413c, 0x81e0, 0)}, /* Dell Wireless 5821e with eSIM support*/ ++ {QMI_FIXED_INTF(0x413c, 0x81e4, 0)}, /* Dell Wireless 5829e with eSIM support*/ ++ {QMI_FIXED_INTF(0x413c, 0x81e6, 0)}, /* Dell Wireless 5829e */ + {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 */ +-- +2.34.1 + diff --git a/queue-4.9/net-usb-qmi_wwan-add-support-for-dell-dw5829e.patch-878 b/queue-4.9/net-usb-qmi_wwan-add-support-for-dell-dw5829e.patch-878 new file mode 100644 index 00000000000..7d4f3387472 --- /dev/null +++ b/queue-4.9/net-usb-qmi_wwan-add-support-for-dell-dw5829e.patch-878 @@ -0,0 +1,70 @@ +From 4b5a13c7c300502dc61385a0a6858c1d747884ec Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 9 Feb 2022 10:47:17 +0800 +Subject: net: usb: qmi_wwan: Add support for Dell DW5829e +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Slark Xiao + +[ Upstream commit 8ecbb179286cbc91810c16caeb3396e06305cd0c ] + +Dell DW5829e same as DW5821e except the CAT level. +DW5821e supports CAT16 but DW5829e supports CAT9. +Also, DW5829e includes normal and eSIM type. +Please see below test evidence: + +T: Bus=04 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#= 5 Spd=5000 MxCh= 0 +D: Ver= 3.10 Cls=ef(misc ) Sub=02 Prot=01 MxPS= 9 #Cfgs= 1 +P: Vendor=413c ProdID=81e6 Rev=03.18 +S: Manufacturer=Dell Inc. +S: Product=DW5829e Snapdragon X20 LTE +S: SerialNumber=0123456789ABCDEF +C: #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=896mA +I: If#=0x0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan +I: If#=0x1 Alt= 0 #EPs= 1 Cls=03(HID ) Sub=00 Prot=00 Driver=usbhid +I: If#=0x2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +I: If#=0x3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +I: If#=0x4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +I: If#=0x5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option + +T: Bus=04 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#= 7 Spd=5000 MxCh= 0 +D: Ver= 3.10 Cls=ef(misc ) Sub=02 Prot=01 MxPS= 9 #Cfgs= 1 +P: Vendor=413c ProdID=81e4 Rev=03.18 +S: Manufacturer=Dell Inc. +S: Product=DW5829e-eSIM Snapdragon X20 LTE +S: SerialNumber=0123456789ABCDEF +C: #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=896mA +I: If#=0x0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan +I: If#=0x1 Alt= 0 #EPs= 1 Cls=03(HID ) Sub=00 Prot=00 Driver=usbhid +I: If#=0x2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +I: If#=0x3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +I: If#=0x4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +I: If#=0x5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option + +Signed-off-by: Slark Xiao +Acked-by: Bjørn Mork +Link: https://lore.kernel.org/r/20220209024717.8564-1-slark_xiao@163.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/usb/qmi_wwan.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c +index a8c960152a357..003c53a5bb336 100644 +--- a/drivers/net/usb/qmi_wwan.c ++++ b/drivers/net/usb/qmi_wwan.c +@@ -964,6 +964,8 @@ static const struct usb_device_id products[] = { + {QMI_FIXED_INTF(0x413c, 0x81d7, 0)}, /* Dell Wireless 5821e */ + {QMI_FIXED_INTF(0x413c, 0x81d7, 1)}, /* Dell Wireless 5821e preproduction config */ + {QMI_FIXED_INTF(0x413c, 0x81e0, 0)}, /* Dell Wireless 5821e with eSIM support*/ ++ {QMI_FIXED_INTF(0x413c, 0x81e4, 0)}, /* Dell Wireless 5829e with eSIM support*/ ++ {QMI_FIXED_INTF(0x413c, 0x81e6, 0)}, /* Dell Wireless 5829e */ + {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 */ +-- +2.34.1 + diff --git a/queue-4.9/series b/queue-4.9/series index 5d554f250ce..e3108f46053 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -26,3 +26,9 @@ asoc-ops-fix-stereo-change-notifications-in-snd_soc_put_volsw_range.patch nfs-lookup_directory-is-also-ok-with-symlinks.patch kvm-x86-pmu-use-amd64_raw_event_mask-for-perf_type_r.patch nfs-do-not-report-writeback-errors-in-nfs_getattr.patch +ata-libata-core-disable-trim-on-m88v29.patch +tracing-fix-tp_printk-option-related-with-tp_printk_.patch +net-usb-qmi_wwan-add-support-for-dell-dw5829e.patch +ata-libata-core-disable-trim-on-m88v29.patch-3307 +tracing-fix-tp_printk-option-related-with-tp_printk_.patch-14804 +net-usb-qmi_wwan-add-support-for-dell-dw5829e.patch-878 diff --git a/queue-4.9/tracing-fix-tp_printk-option-related-with-tp_printk_.patch b/queue-4.9/tracing-fix-tp_printk-option-related-with-tp_printk_.patch new file mode 100644 index 00000000000..6a073985eea --- /dev/null +++ b/queue-4.9/tracing-fix-tp_printk-option-related-with-tp_printk_.patch @@ -0,0 +1,49 @@ +From 839dbba17adc0258ab025722d0cfdf94e83893c8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 9 Feb 2022 04:54:22 +0900 +Subject: tracing: Fix tp_printk option related with tp_printk_stop_on_boot + +From: JaeSang Yoo + +[ Upstream commit 3203ce39ac0b2a57a84382ec184c7d4a0bede175 ] + +The kernel parameter "tp_printk_stop_on_boot" starts with "tp_printk" which is +the same as another kernel parameter "tp_printk". If "tp_printk" setup is +called before the "tp_printk_stop_on_boot", it will override the latter +and keep it from being set. + +This is similar to other kernel parameter issues, such as: + Commit 745a600cf1a6 ("um: console: Ignore console= option") +or init/do_mounts.c:45 (setup function of "ro" kernel param) + +Fix it by checking for a "_" right after the "tp_printk" and if that +exists do not process the parameter. + +Link: https://lkml.kernel.org/r/20220208195421.969326-1-jsyoo5b@gmail.com + +Signed-off-by: JaeSang Yoo +[ Fixed up change log and added space after if condition ] +Signed-off-by: Steven Rostedt (Google) +Signed-off-by: Sasha Levin +--- + kernel/trace/trace.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c +index 01c646a1d9e76..12bee7043be6f 100644 +--- a/kernel/trace/trace.c ++++ b/kernel/trace/trace.c +@@ -228,6 +228,10 @@ __setup("trace_clock=", set_trace_boot_clock); + + static int __init set_tracepoint_printk(char *str) + { ++ /* Ignore the "tp_printk_stop_on_boot" param */ ++ if (*str == '_') ++ return 0; ++ + if ((strcmp(str, "=0") != 0 && strcmp(str, "=off") != 0)) + tracepoint_printk = 1; + return 1; +-- +2.34.1 + diff --git a/queue-4.9/tracing-fix-tp_printk-option-related-with-tp_printk_.patch-14804 b/queue-4.9/tracing-fix-tp_printk-option-related-with-tp_printk_.patch-14804 new file mode 100644 index 00000000000..6a073985eea --- /dev/null +++ b/queue-4.9/tracing-fix-tp_printk-option-related-with-tp_printk_.patch-14804 @@ -0,0 +1,49 @@ +From 839dbba17adc0258ab025722d0cfdf94e83893c8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 9 Feb 2022 04:54:22 +0900 +Subject: tracing: Fix tp_printk option related with tp_printk_stop_on_boot + +From: JaeSang Yoo + +[ Upstream commit 3203ce39ac0b2a57a84382ec184c7d4a0bede175 ] + +The kernel parameter "tp_printk_stop_on_boot" starts with "tp_printk" which is +the same as another kernel parameter "tp_printk". If "tp_printk" setup is +called before the "tp_printk_stop_on_boot", it will override the latter +and keep it from being set. + +This is similar to other kernel parameter issues, such as: + Commit 745a600cf1a6 ("um: console: Ignore console= option") +or init/do_mounts.c:45 (setup function of "ro" kernel param) + +Fix it by checking for a "_" right after the "tp_printk" and if that +exists do not process the parameter. + +Link: https://lkml.kernel.org/r/20220208195421.969326-1-jsyoo5b@gmail.com + +Signed-off-by: JaeSang Yoo +[ Fixed up change log and added space after if condition ] +Signed-off-by: Steven Rostedt (Google) +Signed-off-by: Sasha Levin +--- + kernel/trace/trace.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c +index 01c646a1d9e76..12bee7043be6f 100644 +--- a/kernel/trace/trace.c ++++ b/kernel/trace/trace.c +@@ -228,6 +228,10 @@ __setup("trace_clock=", set_trace_boot_clock); + + static int __init set_tracepoint_printk(char *str) + { ++ /* Ignore the "tp_printk_stop_on_boot" param */ ++ if (*str == '_') ++ return 0; ++ + if ((strcmp(str, "=0") != 0 && strcmp(str, "=off") != 0)) + tracepoint_printk = 1; + return 1; +-- +2.34.1 +