From: Sasha Levin Date: Mon, 21 Feb 2022 04:50:51 +0000 (-0500) Subject: Fixes for 4.14 X-Git-Tag: v4.9.303~26^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=125ab7ac7e1419f89dba299f67d68bd7711587a6;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.14 Signed-off-by: Sasha Levin --- diff --git a/queue-4.14/arm-omap2-hwmod-add-of_node_put-before-break.patch b/queue-4.14/arm-omap2-hwmod-add-of_node_put-before-break.patch new file mode 100644 index 00000000000..98c8df1de64 --- /dev/null +++ b/queue-4.14/arm-omap2-hwmod-add-of_node_put-before-break.patch @@ -0,0 +1,42 @@ +From 220405b95e1e2495053516183f13411b6b35a4f7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 14 Oct 2021 04:57:19 -0400 +Subject: ARM: OMAP2+: hwmod: Add of_node_put() before break + +From: Wan Jiabing + +[ Upstream commit 80c469a0a03763f814715f3d12b6f3964c7423e8 ] + +Fix following coccicheck warning: +./arch/arm/mach-omap2/omap_hwmod.c:753:1-23: WARNING: Function +for_each_matching_node should have of_node_put() before break + +Early exits from for_each_matching_node should decrement the +node reference counter. + +Signed-off-by: Wan Jiabing +Signed-off-by: Tony Lindgren +Signed-off-by: Sasha Levin +--- + arch/arm/mach-omap2/omap_hwmod.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c +index 9274a484c6a39..f6afd866e4cf9 100644 +--- a/arch/arm/mach-omap2/omap_hwmod.c ++++ b/arch/arm/mach-omap2/omap_hwmod.c +@@ -768,8 +768,10 @@ static int _init_clkctrl_providers(void) + + for_each_matching_node(np, ti_clkctrl_match_table) { + ret = _setup_clkctrl_provider(np); +- if (ret) ++ if (ret) { ++ of_node_put(np); + break; ++ } + } + + return ret; +-- +2.34.1 + diff --git a/queue-4.14/arm-omap2-hwmod-add-of_node_put-before-break.patch-25662 b/queue-4.14/arm-omap2-hwmod-add-of_node_put-before-break.patch-25662 new file mode 100644 index 00000000000..98c8df1de64 --- /dev/null +++ b/queue-4.14/arm-omap2-hwmod-add-of_node_put-before-break.patch-25662 @@ -0,0 +1,42 @@ +From 220405b95e1e2495053516183f13411b6b35a4f7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 14 Oct 2021 04:57:19 -0400 +Subject: ARM: OMAP2+: hwmod: Add of_node_put() before break + +From: Wan Jiabing + +[ Upstream commit 80c469a0a03763f814715f3d12b6f3964c7423e8 ] + +Fix following coccicheck warning: +./arch/arm/mach-omap2/omap_hwmod.c:753:1-23: WARNING: Function +for_each_matching_node should have of_node_put() before break + +Early exits from for_each_matching_node should decrement the +node reference counter. + +Signed-off-by: Wan Jiabing +Signed-off-by: Tony Lindgren +Signed-off-by: Sasha Levin +--- + arch/arm/mach-omap2/omap_hwmod.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c +index 9274a484c6a39..f6afd866e4cf9 100644 +--- a/arch/arm/mach-omap2/omap_hwmod.c ++++ b/arch/arm/mach-omap2/omap_hwmod.c +@@ -768,8 +768,10 @@ static int _init_clkctrl_providers(void) + + for_each_matching_node(np, ti_clkctrl_match_table) { + ret = _setup_clkctrl_provider(np); +- if (ret) ++ if (ret) { ++ of_node_put(np); + break; ++ } + } + + return ret; +-- +2.34.1 + diff --git a/queue-4.14/ata-libata-core-disable-trim-on-m88v29.patch b/queue-4.14/ata-libata-core-disable-trim-on-m88v29.patch new file mode 100644 index 00000000000..dd97364a8db --- /dev/null +++ b/queue-4.14/ata-libata-core-disable-trim-on-m88v29.patch @@ -0,0 +1,43 @@ +From 44b1fb9c3b0bbf0b357318caf598afe7b0f74367 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 8ec71243cdcca..791374199e227 100644 +--- a/drivers/ata/libata-core.c ++++ b/drivers/ata/libata-core.c +@@ -4603,6 +4603,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.14/ata-libata-core-disable-trim-on-m88v29.patch-13162 b/queue-4.14/ata-libata-core-disable-trim-on-m88v29.patch-13162 new file mode 100644 index 00000000000..dd97364a8db --- /dev/null +++ b/queue-4.14/ata-libata-core-disable-trim-on-m88v29.patch-13162 @@ -0,0 +1,43 @@ +From 44b1fb9c3b0bbf0b357318caf598afe7b0f74367 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 8ec71243cdcca..791374199e227 100644 +--- a/drivers/ata/libata-core.c ++++ b/drivers/ata/libata-core.c +@@ -4603,6 +4603,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.14/net-macb-align-the-dma-and-coherent-dma-masks.patch b/queue-4.14/net-macb-align-the-dma-and-coherent-dma-masks.patch new file mode 100644 index 00000000000..0b5b71f8a18 --- /dev/null +++ b/queue-4.14/net-macb-align-the-dma-and-coherent-dma-masks.patch @@ -0,0 +1,51 @@ +From eb197c9cfffb7e00ef3412c59e1012eb280f92a8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 9 Feb 2022 15:13:25 +0530 +Subject: net: macb: Align the dma and coherent dma masks + +From: Marc St-Amand + +[ Upstream commit 37f7860602b5b2d99fc7465f6407f403f5941988 ] + +Single page and coherent memory blocks can use different DMA masks +when the macb accesses physical memory directly. The kernel is clever +enough to allocate pages that fit into the requested address width. + +When using the ARM SMMU, the DMA mask must be the same for single +pages and big coherent memory blocks. Otherwise the translation +tables turn into one big mess. + + [ 74.959909] macb ff0e0000.ethernet eth0: DMA bus error: HRESP not OK + [ 74.959989] arm-smmu fd800000.smmu: Unhandled context fault: fsr=0x402, iova=0x3165687460, fsynr=0x20001, cbfrsynra=0x877, cb=1 + [ 75.173939] macb ff0e0000.ethernet eth0: DMA bus error: HRESP not OK + [ 75.173955] arm-smmu fd800000.smmu: Unhandled context fault: fsr=0x402, iova=0x3165687460, fsynr=0x20001, cbfrsynra=0x877, cb=1 + +Since using the same DMA mask does not hurt direct 1:1 physical +memory mappings, this commit always aligns DMA and coherent masks. + +Signed-off-by: Marc St-Amand +Signed-off-by: Harini Katakam +Acked-by: Nicolas Ferre +Tested-by: Conor Dooley +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/cadence/macb_main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c +index b07ea8a26c20a..045ab0ec5ca25 100644 +--- a/drivers/net/ethernet/cadence/macb_main.c ++++ b/drivers/net/ethernet/cadence/macb_main.c +@@ -3528,7 +3528,7 @@ static int macb_probe(struct platform_device *pdev) + + #ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT + if (GEM_BFEXT(DAW64, gem_readl(bp, DCFG6))) { +- dma_set_mask(&pdev->dev, DMA_BIT_MASK(44)); ++ dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(44)); + bp->hw_dma_cap |= HW_DMA_CAP_64B; + } + #endif +-- +2.34.1 + diff --git a/queue-4.14/net-macb-align-the-dma-and-coherent-dma-masks.patch-6161 b/queue-4.14/net-macb-align-the-dma-and-coherent-dma-masks.patch-6161 new file mode 100644 index 00000000000..0b5b71f8a18 --- /dev/null +++ b/queue-4.14/net-macb-align-the-dma-and-coherent-dma-masks.patch-6161 @@ -0,0 +1,51 @@ +From eb197c9cfffb7e00ef3412c59e1012eb280f92a8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 9 Feb 2022 15:13:25 +0530 +Subject: net: macb: Align the dma and coherent dma masks + +From: Marc St-Amand + +[ Upstream commit 37f7860602b5b2d99fc7465f6407f403f5941988 ] + +Single page and coherent memory blocks can use different DMA masks +when the macb accesses physical memory directly. The kernel is clever +enough to allocate pages that fit into the requested address width. + +When using the ARM SMMU, the DMA mask must be the same for single +pages and big coherent memory blocks. Otherwise the translation +tables turn into one big mess. + + [ 74.959909] macb ff0e0000.ethernet eth0: DMA bus error: HRESP not OK + [ 74.959989] arm-smmu fd800000.smmu: Unhandled context fault: fsr=0x402, iova=0x3165687460, fsynr=0x20001, cbfrsynra=0x877, cb=1 + [ 75.173939] macb ff0e0000.ethernet eth0: DMA bus error: HRESP not OK + [ 75.173955] arm-smmu fd800000.smmu: Unhandled context fault: fsr=0x402, iova=0x3165687460, fsynr=0x20001, cbfrsynra=0x877, cb=1 + +Since using the same DMA mask does not hurt direct 1:1 physical +memory mappings, this commit always aligns DMA and coherent masks. + +Signed-off-by: Marc St-Amand +Signed-off-by: Harini Katakam +Acked-by: Nicolas Ferre +Tested-by: Conor Dooley +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/cadence/macb_main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c +index b07ea8a26c20a..045ab0ec5ca25 100644 +--- a/drivers/net/ethernet/cadence/macb_main.c ++++ b/drivers/net/ethernet/cadence/macb_main.c +@@ -3528,7 +3528,7 @@ static int macb_probe(struct platform_device *pdev) + + #ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT + if (GEM_BFEXT(DAW64, gem_readl(bp, DCFG6))) { +- dma_set_mask(&pdev->dev, DMA_BIT_MASK(44)); ++ dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(44)); + bp->hw_dma_cap |= HW_DMA_CAP_64B; + } + #endif +-- +2.34.1 + diff --git a/queue-4.14/net-usb-qmi_wwan-add-support-for-dell-dw5829e.patch b/queue-4.14/net-usb-qmi_wwan-add-support-for-dell-dw5829e.patch new file mode 100644 index 00000000000..3759fcf7ed2 --- /dev/null +++ b/queue-4.14/net-usb-qmi_wwan-add-support-for-dell-dw5829e.patch @@ -0,0 +1,70 @@ +From f33062b65a0eaf079edd757723edcecf472439a2 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 928219ab09128..e8d57954596d2 100644 +--- a/drivers/net/usb/qmi_wwan.c ++++ b/drivers/net/usb/qmi_wwan.c +@@ -1347,6 +1347,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.14/net-usb-qmi_wwan-add-support-for-dell-dw5829e.patch-1414 b/queue-4.14/net-usb-qmi_wwan-add-support-for-dell-dw5829e.patch-1414 new file mode 100644 index 00000000000..3759fcf7ed2 --- /dev/null +++ b/queue-4.14/net-usb-qmi_wwan-add-support-for-dell-dw5829e.patch-1414 @@ -0,0 +1,70 @@ +From f33062b65a0eaf079edd757723edcecf472439a2 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 928219ab09128..e8d57954596d2 100644 +--- a/drivers/net/usb/qmi_wwan.c ++++ b/drivers/net/usb/qmi_wwan.c +@@ -1347,6 +1347,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.14/series b/queue-4.14/series index 228c75f7262..0108abe23ba 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -34,3 +34,13 @@ mtd-rawnand-brcmnand-refactored-code-to-introduce-he.patch mtd-rawnand-brcmnand-fixed-incorrect-sub-page-ecc-st.patch kvm-x86-pmu-use-amd64_raw_event_mask-for-perf_type_r.patch nfs-do-not-report-writeback-errors-in-nfs_getattr.patch +arm-omap2-hwmod-add-of_node_put-before-break.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 +net-macb-align-the-dma-and-coherent-dma-masks.patch +arm-omap2-hwmod-add-of_node_put-before-break.patch-25662 +ata-libata-core-disable-trim-on-m88v29.patch-13162 +tracing-fix-tp_printk-option-related-with-tp_printk_.patch-3779 +net-usb-qmi_wwan-add-support-for-dell-dw5829e.patch-1414 +net-macb-align-the-dma-and-coherent-dma-masks.patch-6161 diff --git a/queue-4.14/tracing-fix-tp_printk-option-related-with-tp_printk_.patch b/queue-4.14/tracing-fix-tp_printk-option-related-with-tp_printk_.patch new file mode 100644 index 00000000000..c7bca47624f --- /dev/null +++ b/queue-4.14/tracing-fix-tp_printk-option-related-with-tp_printk_.patch @@ -0,0 +1,49 @@ +From d8caf52d74613897e86e0721198780755695ae3f 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 fd8e1ec39c270..c1da2a4a629a1 100644 +--- a/kernel/trace/trace.c ++++ b/kernel/trace/trace.c +@@ -230,6 +230,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.14/tracing-fix-tp_printk-option-related-with-tp_printk_.patch-3779 b/queue-4.14/tracing-fix-tp_printk-option-related-with-tp_printk_.patch-3779 new file mode 100644 index 00000000000..c7bca47624f --- /dev/null +++ b/queue-4.14/tracing-fix-tp_printk-option-related-with-tp_printk_.patch-3779 @@ -0,0 +1,49 @@ +From d8caf52d74613897e86e0721198780755695ae3f 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 fd8e1ec39c270..c1da2a4a629a1 100644 +--- a/kernel/trace/trace.c ++++ b/kernel/trace/trace.c +@@ -230,6 +230,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 +