From: Sasha Levin Date: Thu, 19 Aug 2021 13:00:10 +0000 (-0400) Subject: Fixes for 4.4 X-Git-Tag: v5.13.13~32 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bb7b6dd9686d1b1ef64d9dbb353a2c011914128a;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.4 Signed-off-by: Sasha Levin --- diff --git a/queue-4.4/arm-dts-am43x-epos-evm-reduce-i2c0-bus-speed-for-tps.patch b/queue-4.4/arm-dts-am43x-epos-evm-reduce-i2c0-bus-speed-for-tps.patch new file mode 100644 index 00000000000..c0d7ea747a2 --- /dev/null +++ b/queue-4.4/arm-dts-am43x-epos-evm-reduce-i2c0-bus-speed-for-tps.patch @@ -0,0 +1,50 @@ +From 543bfca185e71d23da0c201912e588ec3755ff4c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 16 Jul 2021 09:07:30 -0700 +Subject: ARM: dts: am43x-epos-evm: Reduce i2c0 bus speed for tps65218 + +From: Dave Gerlach + +[ Upstream commit 20a6b3fd8e2e2c063b25fbf2ee74d86b898e5087 ] + +Based on the latest timing specifications for the TPS65218 from the data +sheet, http://www.ti.com/lit/ds/symlink/tps65218.pdf, document SLDS206 +from November 2014, we must change the i2c bus speed to better fit within +the minimum high SCL time required for proper i2c transfer. + +When running at 400khz, measurements show that SCL spends +0.8125 uS/1.666 uS high/low which violates the requirement for minimum +high period of SCL provided in datasheet Table 7.6 which is 1 uS. +Switching to 100khz gives us 5 uS/5 uS high/low which both fall above +the minimum given values for 100 khz, 4.0 uS/4.7 uS high/low. + +Without this patch occasionally a voltage set operation from the kernel +will appear to have worked but the actual voltage reflected on the PMIC +will not have updated, causing problems especially with cpufreq that may +update to a higher OPP without actually raising the voltage on DCDC2, +leading to a hang. + +Signed-off-by: Dave Gerlach +Signed-off-by: Kevin Hilman +Signed-off-by: Tony Lindgren +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/am43x-epos-evm.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts +index a74b09f17a1a..e7cd99793bc6 100644 +--- a/arch/arm/boot/dts/am43x-epos-evm.dts ++++ b/arch/arm/boot/dts/am43x-epos-evm.dts +@@ -411,7 +411,7 @@ + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&i2c0_pins>; +- clock-frequency = <400000>; ++ clock-frequency = <100000>; + + tps65218: tps65218@24 { + reg = <0x24>; +-- +2.30.2 + diff --git a/queue-4.4/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch b/queue-4.4/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch new file mode 100644 index 00000000000..5078bc03fbf --- /dev/null +++ b/queue-4.4/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch @@ -0,0 +1,55 @@ +From b9812a8aa6eed8ec79440014fbef6f4e1e2c2f83 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 21 Jul 2021 17:16:04 +0200 +Subject: ARM: ixp4xx: goramo_mlr depends on old PCI driver + +From: Arnd Bergmann + +[ Upstream commit 796a8c85b1216618258e08b463d3bef0d7123760 ] + +When this driver is disabled, the board file fails to build, +so add a dependency: + +arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_pci_preinit': +arch/arm/mach-ixp4xx/goramo_mlr.c:472:9: error: implicit declaration of function 'ixp4xx_pci_preinit'; did you mean 'iop3xx_pci_preinit'? [-Werror=implicit-function-declaration] + 472 | ixp4xx_pci_preinit(); + | ^~~~~~~~~~~~~~~~~~ + | iop3xx_pci_preinit +arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_pci_postinit': +arch/arm/mach-ixp4xx/goramo_mlr.c:481:22: error: implicit declaration of function 'ixp4xx_pci_read' [-Werror=implicit-function-declaration] + 481 | if (!ixp4xx_pci_read(addr, NP_CMD_CONFIGREAD, &value)) { + | ^~~~~~~~~~~~~~~ +arch/arm/mach-ixp4xx/goramo_mlr.c:231:35: error: 'IXP4XX_UART1_BASE_PHYS' undeclared here (not in a function) + 231 | .start = IXP4XX_UART1_BASE_PHYS, + | ^~~~~~~~~~~~~~~~~~~~~~ +arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_init': +arch/arm/mach-ixp4xx/goramo_mlr.c:376:9: error: implicit declaration of function 'ixp4xx_sys_init' [-Werror=implicit-function-declaration] + 376 | ixp4xx_sys_init(); + | ^~~~~~~~~~~~~~~ + +Signed-off-by: Arnd Bergmann +Reviewed-by: Linus Walleij +Cc: Linus Walleij +Cc: soc@kernel.org +Link: https://lore.kernel.org/r/20210721151620.2373500-1-arnd@kernel.org' +Signed-off-by: Arnd Bergmann +Signed-off-by: Sasha Levin +--- + arch/arm/mach-ixp4xx/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig +index c342dc4e8a45..2489b6151ace 100644 +--- a/arch/arm/mach-ixp4xx/Kconfig ++++ b/arch/arm/mach-ixp4xx/Kconfig +@@ -76,6 +76,7 @@ config MACH_IXDP465 + + config MACH_GORAMO_MLR + bool "GORAMO Multi Link Router" ++ depends on IXP4XX_PCI_LEGACY + help + Say 'Y' here if you want your kernel to support GORAMO + MultiLink router. +-- +2.30.2 + diff --git a/queue-4.4/dmaengine-of-dma-router_xlate-to-return-eprobe_defer.patch b/queue-4.4/dmaengine-of-dma-router_xlate-to-return-eprobe_defer.patch new file mode 100644 index 00000000000..37e65d53ddb --- /dev/null +++ b/queue-4.4/dmaengine-of-dma-router_xlate-to-return-eprobe_defer.patch @@ -0,0 +1,63 @@ +From 3b03a41bb6fb3b625af1bb3bcb4582795bdcef76 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 17 Jul 2021 22:00:21 +0300 +Subject: dmaengine: of-dma: router_xlate to return -EPROBE_DEFER if controller + is not yet available + +From: Peter Ujfalusi + +[ Upstream commit eda97cb095f2958bbad55684a6ca3e7d7af0176a ] + +If the router_xlate can not find the controller in the available DMA +devices then it should return with -EPORBE_DEFER in a same way as the +of_dma_request_slave_channel() does. + +The issue can be reproduced if the event router is registered before the +DMA controller itself and a driver would request for a channel before the +controller is registered. +In of_dma_request_slave_channel(): +1. of_dma_find_controller() would find the dma_router +2. ofdma->of_dma_xlate() would fail and returned NULL +3. -ENODEV is returned as error code + +with this patch we would return in this case the correct -EPROBE_DEFER and +the client can try to request the channel later. + +Signed-off-by: Peter Ujfalusi +Link: https://lore.kernel.org/r/20210717190021.21897-1-peter.ujfalusi@gmail.com +Signed-off-by: Vinod Koul +Signed-off-by: Sasha Levin +--- + drivers/dma/of-dma.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/drivers/dma/of-dma.c b/drivers/dma/of-dma.c +index 86c591481dfe..4a5dbf30605a 100644 +--- a/drivers/dma/of-dma.c ++++ b/drivers/dma/of-dma.c +@@ -68,8 +68,12 @@ static struct dma_chan *of_dma_router_xlate(struct of_phandle_args *dma_spec, + return NULL; + + ofdma_target = of_dma_find_controller(&dma_spec_target); +- if (!ofdma_target) +- return NULL; ++ if (!ofdma_target) { ++ ofdma->dma_router->route_free(ofdma->dma_router->dev, ++ route_data); ++ chan = ERR_PTR(-EPROBE_DEFER); ++ goto err; ++ } + + chan = ofdma_target->of_dma_xlate(&dma_spec_target, ofdma_target); + if (IS_ERR_OR_NULL(chan)) { +@@ -80,6 +84,7 @@ static struct dma_chan *of_dma_router_xlate(struct of_phandle_args *dma_spec, + chan->route_data = route_data; + } + ++err: + /* + * Need to put the node back since the ofdma->of_dma_route_allocate + * has taken it for generating the new, translated dma_spec +-- +2.30.2 + diff --git a/queue-4.4/dmaengine-usb-dmac-fix-pm-reference-leak-in-usb_dmac.patch b/queue-4.4/dmaengine-usb-dmac-fix-pm-reference-leak-in-usb_dmac.patch new file mode 100644 index 00000000000..646bf69678c --- /dev/null +++ b/queue-4.4/dmaengine-usb-dmac-fix-pm-reference-leak-in-usb_dmac.patch @@ -0,0 +1,40 @@ +From 3a24cde2fab032f0ebd6507b223735ae4e818262 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 6 Jul 2021 20:45:21 +0800 +Subject: dmaengine: usb-dmac: Fix PM reference leak in usb_dmac_probe() + +From: Yu Kuai + +[ Upstream commit 1da569fa7ec8cb0591c74aa3050d4ea1397778b4 ] + +pm_runtime_get_sync will increment pm usage counter even it failed. +Forgetting to putting operation will result in reference leak here. +Fix it by moving the error_pm label above the pm_runtime_put() in +the error path. + +Reported-by: Hulk Robot +Signed-off-by: Yu Kuai +Link: https://lore.kernel.org/r/20210706124521.1371901-1-yukuai3@huawei.com +Signed-off-by: Vinod Koul +Signed-off-by: Sasha Levin +--- + drivers/dma/sh/usb-dmac.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/dma/sh/usb-dmac.c b/drivers/dma/sh/usb-dmac.c +index cc8fc601ed47..416057d9f0b6 100644 +--- a/drivers/dma/sh/usb-dmac.c ++++ b/drivers/dma/sh/usb-dmac.c +@@ -863,8 +863,8 @@ static int usb_dmac_probe(struct platform_device *pdev) + + error: + of_dma_controller_free(pdev->dev.of_node); +- pm_runtime_put(&pdev->dev); + error_pm: ++ pm_runtime_put(&pdev->dev); + pm_runtime_disable(&pdev->dev); + return ret; + } +-- +2.30.2 + diff --git a/queue-4.4/scsi-core-avoid-printing-an-error-if-target_alloc-re.patch b/queue-4.4/scsi-core-avoid-printing-an-error-if-target_alloc-re.patch new file mode 100644 index 00000000000..0f33f58b010 --- /dev/null +++ b/queue-4.4/scsi-core-avoid-printing-an-error-if-target_alloc-re.patch @@ -0,0 +1,45 @@ +From 68bda439032746043b95034b3a2425e3573d75db Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 26 Jul 2021 17:24:02 +0530 +Subject: scsi: core: Avoid printing an error if target_alloc() returns -ENXIO + +From: Sreekanth Reddy + +[ Upstream commit 70edd2e6f652f67d854981fd67f9ad0f1deaea92 ] + +Avoid printing a 'target allocation failed' error if the driver +target_alloc() callback function returns -ENXIO. This return value +indicates that the corresponding H:C:T:L entry is empty. + +Removing this error reduces the scan time if the user issues SCAN_WILD_CARD +scan operation through sysfs parameter on a host with a lot of empty +H:C:T:L entries. + +Avoiding the printk on -ENXIO matches the behavior of the other callback +functions during scanning. + +Link: https://lore.kernel.org/r/20210726115402.1936-1-sreekanth.reddy@broadcom.com +Signed-off-by: Sreekanth Reddy +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/scsi_scan.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c +index 647a057a9b6c..5e34c7ed483c 100644 +--- a/drivers/scsi/scsi_scan.c ++++ b/drivers/scsi/scsi_scan.c +@@ -457,7 +457,8 @@ static struct scsi_target *scsi_alloc_target(struct device *parent, + error = shost->hostt->target_alloc(starget); + + if(error) { +- dev_printk(KERN_ERR, dev, "target allocation failed, error %d\n", error); ++ if (error != -ENXIO) ++ dev_err(dev, "target allocation failed, error %d\n", error); + /* don't want scsi_target_reap to do the final + * put because it will be under the host lock */ + scsi_target_destroy(starget); +-- +2.30.2 + diff --git a/queue-4.4/scsi-megaraid_mm-fix-end-of-loop-tests-for-list_for_.patch b/queue-4.4/scsi-megaraid_mm-fix-end-of-loop-tests-for-list_for_.patch new file mode 100644 index 00000000000..6ddcc449d13 --- /dev/null +++ b/queue-4.4/scsi-megaraid_mm-fix-end-of-loop-tests-for-list_for_.patch @@ -0,0 +1,93 @@ +From 98cd408153254eccd7a9cdcda89f026aa5489969 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 8 Jul 2021 13:16:42 +0530 +Subject: scsi: megaraid_mm: Fix end of loop tests for list_for_each_entry() + +From: Harshvardhan Jha + +[ Upstream commit 77541f78eadfe9fdb018a7b8b69f0f2af2cf4b82 ] + +The list_for_each_entry() iterator, "adapter" in this code, can never be +NULL. If we exit the loop without finding the correct adapter then +"adapter" points invalid memory that is an offset from the list head. This +will eventually lead to memory corruption and presumably a kernel crash. + +Link: https://lore.kernel.org/r/20210708074642.23599-1-harshvardhan.jha@oracle.com +Acked-by: Sumit Saxena +Signed-off-by: Harshvardhan Jha +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/megaraid/megaraid_mm.c | 21 +++++++++++++++------ + 1 file changed, 15 insertions(+), 6 deletions(-) + +diff --git a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c +index a70692779a16..34067dfd2841 100644 +--- a/drivers/scsi/megaraid/megaraid_mm.c ++++ b/drivers/scsi/megaraid/megaraid_mm.c +@@ -246,7 +246,7 @@ mraid_mm_get_adapter(mimd_t __user *umimd, int *rval) + mimd_t mimd; + uint32_t adapno; + int iterator; +- ++ bool is_found; + + if (copy_from_user(&mimd, umimd, sizeof(mimd_t))) { + *rval = -EFAULT; +@@ -262,12 +262,16 @@ mraid_mm_get_adapter(mimd_t __user *umimd, int *rval) + + adapter = NULL; + iterator = 0; ++ is_found = false; + + list_for_each_entry(adapter, &adapters_list_g, list) { +- if (iterator++ == adapno) break; ++ if (iterator++ == adapno) { ++ is_found = true; ++ break; ++ } + } + +- if (!adapter) { ++ if (!is_found) { + *rval = -ENODEV; + return NULL; + } +@@ -735,6 +739,7 @@ ioctl_done(uioc_t *kioc) + uint32_t adapno; + int iterator; + mraid_mmadp_t* adapter; ++ bool is_found; + + /* + * When the kioc returns from driver, make sure it still doesn't +@@ -757,19 +762,23 @@ ioctl_done(uioc_t *kioc) + iterator = 0; + adapter = NULL; + adapno = kioc->adapno; ++ is_found = false; + + con_log(CL_ANN, ( KERN_WARNING "megaraid cmm: completed " + "ioctl that was timedout before\n")); + + list_for_each_entry(adapter, &adapters_list_g, list) { +- if (iterator++ == adapno) break; ++ if (iterator++ == adapno) { ++ is_found = true; ++ break; ++ } + } + + kioc->timedout = 0; + +- if (adapter) { ++ if (is_found) + mraid_mm_dealloc_kioc( adapter, kioc ); +- } ++ + } + else { + wake_up(&wait_q); +-- +2.30.2 + diff --git a/queue-4.4/series b/queue-4.4/series index c0dc8be570c..a7a990f0fd4 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -13,3 +13,9 @@ pci-msi-enforce-that-msi-x-table-entry-is-masked-for-update.patch pci-msi-enforce-msi-entry-updates-to-be-visible.patch vmlinux.lds.h-handle-clang-s-module.-c-d-tor-sections.patch kvm-nsvm-avoid-picking-up-unsupported-bits-from-l2-in-int_ctl-cve-2021-3653.patch +dmaengine-usb-dmac-fix-pm-reference-leak-in-usb_dmac.patch +arm-dts-am43x-epos-evm-reduce-i2c0-bus-speed-for-tps.patch +dmaengine-of-dma-router_xlate-to-return-eprobe_defer.patch +scsi-megaraid_mm-fix-end-of-loop-tests-for-list_for_.patch +scsi-core-avoid-printing-an-error-if-target_alloc-re.patch +arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch