From: Sasha Levin Date: Sun, 16 Aug 2020 13:50:47 +0000 (-0400) Subject: Fixes for 5.4 X-Git-Tag: v4.19.140~56 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ad7d6dc2466bf55eb70f3600671e0e2f69d9819c;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 5.4 Signed-off-by: Sasha Levin --- diff --git a/queue-5.4/acpica-do-not-increment-operation_region-reference-c.patch b/queue-5.4/acpica-do-not-increment-operation_region-reference-c.patch new file mode 100644 index 00000000000..14a39d620d5 --- /dev/null +++ b/queue-5.4/acpica-do-not-increment-operation_region-reference-c.patch @@ -0,0 +1,81 @@ +From ec0596562d0d8ad54dfcb46c6c044380f33aaf96 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 20 Jul 2020 10:31:20 -0700 +Subject: ACPICA: Do not increment operation_region reference counts for field + units + +From: Erik Kaneda + +[ Upstream commit 6a54ebae6d047c988a31f5ac5a64ab5cf83797a2 ] + +ACPICA commit e17b28cfcc31918d0db9547b6b274b09c413eb70 + +Object reference counts are used as a part of ACPICA's garbage +collection mechanism. This mechanism keeps track of references to +heap-allocated structures such as the ACPI operand objects. + +Recent server firmware has revealed that this reference count can +overflow on large servers that declare many field units under the +same operation_region. This occurs because each field unit declaration +will add a reference count to the source operation_region. + +This change solves the reference count overflow for operation_regions +objects by preventing fieldunits from incrementing their +operation_region's reference count. Each operation_region's reference +count will not be changed by named objects declared under the Field +operator. During namespace deletion, the operation_region namespace +node will be deleted and each fieldunit will be deleted without +touching the deleted operation_region object. + +Link: https://github.com/acpica/acpica/commit/e17b28cf +Signed-off-by: Erik Kaneda +Signed-off-by: Bob Moore +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + drivers/acpi/acpica/exprep.c | 4 ---- + drivers/acpi/acpica/utdelete.c | 6 +----- + 2 files changed, 1 insertion(+), 9 deletions(-) + +diff --git a/drivers/acpi/acpica/exprep.c b/drivers/acpi/acpica/exprep.c +index 728d752f7adcd..85f799c9c25c4 100644 +--- a/drivers/acpi/acpica/exprep.c ++++ b/drivers/acpi/acpica/exprep.c +@@ -473,10 +473,6 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info) + (u8)access_byte_width; + } + } +- /* An additional reference for the container */ +- +- acpi_ut_add_reference(obj_desc->field.region_obj); +- + ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, + "RegionField: BitOff %X, Off %X, Gran %X, Region %p\n", + obj_desc->field.start_field_bit_offset, +diff --git a/drivers/acpi/acpica/utdelete.c b/drivers/acpi/acpica/utdelete.c +index c365faf4e6cd4..4c0d4e4341961 100644 +--- a/drivers/acpi/acpica/utdelete.c ++++ b/drivers/acpi/acpica/utdelete.c +@@ -568,11 +568,6 @@ acpi_ut_update_object_reference(union acpi_operand_object *object, u16 action) + next_object = object->buffer_field.buffer_obj; + break; + +- case ACPI_TYPE_LOCAL_REGION_FIELD: +- +- next_object = object->field.region_obj; +- break; +- + case ACPI_TYPE_LOCAL_BANK_FIELD: + + next_object = object->bank_field.bank_obj; +@@ -613,6 +608,7 @@ acpi_ut_update_object_reference(union acpi_operand_object *object, u16 action) + } + break; + ++ case ACPI_TYPE_LOCAL_REGION_FIELD: + case ACPI_TYPE_REGION: + default: + +-- +2.25.1 + diff --git a/queue-5.4/agp-intel-fix-a-memory-leak-on-module-initialisation.patch b/queue-5.4/agp-intel-fix-a-memory-leak-on-module-initialisation.patch new file mode 100644 index 00000000000..3424656454e --- /dev/null +++ b/queue-5.4/agp-intel-fix-a-memory-leak-on-module-initialisation.patch @@ -0,0 +1,43 @@ +From 7b5610df8d3f81c4a1e7ea7037ced5cade2becdb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 22 May 2020 09:34:51 +0100 +Subject: agp/intel: Fix a memory leak on module initialisation failure + +From: Qiushi Wu + +[ Upstream commit b975abbd382fe442713a4c233549abb90e57c22b ] + +In intel_gtt_setup_scratch_page(), pointer "page" is not released if +pci_dma_mapping_error() return an error, leading to a memory leak on +module initialisation failure. Simply fix this issue by freeing "page" +before return. + +Fixes: 0e87d2b06cb46 ("intel-gtt: initialize our own scratch page") +Signed-off-by: Qiushi Wu +Reviewed-by: Chris Wilson +Signed-off-by: Chris Wilson +Link: https://patchwork.freedesktop.org/patch/msgid/20200522083451.7448-1-chris@chris-wilson.co.uk +Signed-off-by: Sasha Levin +--- + drivers/char/agp/intel-gtt.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c +index b161bdf600004..0941d38b2d32f 100644 +--- a/drivers/char/agp/intel-gtt.c ++++ b/drivers/char/agp/intel-gtt.c +@@ -304,8 +304,10 @@ static int intel_gtt_setup_scratch_page(void) + if (intel_private.needs_dmar) { + dma_addr = pci_map_page(intel_private.pcidev, page, 0, + PAGE_SIZE, PCI_DMA_BIDIRECTIONAL); +- if (pci_dma_mapping_error(intel_private.pcidev, dma_addr)) ++ if (pci_dma_mapping_error(intel_private.pcidev, dma_addr)) { ++ __free_page(page); + return -EINVAL; ++ } + + intel_private.scratch_page_dma = dma_addr; + } else +-- +2.25.1 + diff --git a/queue-5.4/arm-at91-pm-add-missing-put_device-call-in-at91_pm_s.patch b/queue-5.4/arm-at91-pm-add-missing-put_device-call-in-at91_pm_s.patch new file mode 100644 index 00000000000..6c1250e92f2 --- /dev/null +++ b/queue-5.4/arm-at91-pm-add-missing-put_device-call-in-at91_pm_s.patch @@ -0,0 +1,64 @@ +From 18a37ece577e2a81f90530ab67ab6d6e8182d451 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 4 Jun 2020 20:33:01 +0800 +Subject: ARM: at91: pm: add missing put_device() call in at91_pm_sram_init() + +From: yu kuai + +[ Upstream commit f87a4f022c44e5b87e842a9f3e644fba87e8385f ] + +if of_find_device_by_node() succeed, at91_pm_sram_init() doesn't have +a corresponding put_device(). Thus add a jump target to fix the exception +handling for this function implementation. + +Fixes: d2e467905596 ("ARM: at91: pm: use the mmio-sram pool to access SRAM") +Signed-off-by: yu kuai +Signed-off-by: Alexandre Belloni +Link: https://lore.kernel.org/r/20200604123301.3905837-1-yukuai3@huawei.com +Signed-off-by: Sasha Levin +--- + arch/arm/mach-at91/pm.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c +index 52665f30d236d..6bc3000deb86e 100644 +--- a/arch/arm/mach-at91/pm.c ++++ b/arch/arm/mach-at91/pm.c +@@ -592,13 +592,13 @@ static void __init at91_pm_sram_init(void) + sram_pool = gen_pool_get(&pdev->dev, NULL); + if (!sram_pool) { + pr_warn("%s: sram pool unavailable!\n", __func__); +- return; ++ goto out_put_device; + } + + sram_base = gen_pool_alloc(sram_pool, at91_pm_suspend_in_sram_sz); + if (!sram_base) { + pr_warn("%s: unable to alloc sram!\n", __func__); +- return; ++ goto out_put_device; + } + + sram_pbase = gen_pool_virt_to_phys(sram_pool, sram_base); +@@ -606,12 +606,17 @@ static void __init at91_pm_sram_init(void) + at91_pm_suspend_in_sram_sz, false); + if (!at91_suspend_sram_fn) { + pr_warn("SRAM: Could not map\n"); +- return; ++ goto out_put_device; + } + + /* Copy the pm suspend handler to SRAM */ + at91_suspend_sram_fn = fncpy(at91_suspend_sram_fn, + &at91_pm_suspend_in_sram, at91_pm_suspend_in_sram_sz); ++ return; ++ ++out_put_device: ++ put_device(&pdev->dev); ++ return; + } + + static bool __init at91_is_pm_mode_active(int pm_mode) +-- +2.25.1 + diff --git a/queue-5.4/arm-dts-gose-fix-ports-node-name-for-adv7180.patch b/queue-5.4/arm-dts-gose-fix-ports-node-name-for-adv7180.patch new file mode 100644 index 00000000000..4df825772fc --- /dev/null +++ b/queue-5.4/arm-dts-gose-fix-ports-node-name-for-adv7180.patch @@ -0,0 +1,40 @@ +From 6d734443b4ef6f91f7f0b9f7683c6a3cb09661b3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 4 Jul 2020 17:58:55 +0200 +Subject: ARM: dts: gose: Fix ports node name for adv7180 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Niklas Söderlund + +[ Upstream commit d344234abde938ae1062edb6c05852b0bafb4a03 ] + +When adding the adv7180 device node the ports node was misspelled as +port, fix this. + +Fixes: 8cae359049a88b75 ("ARM: dts: gose: add composite video input") +Signed-off-by: Niklas Söderlund +Link: https://lore.kernel.org/r/20200704155856.3037010-2-niklas.soderlund+renesas@ragnatech.se +Signed-off-by: Geert Uytterhoeven +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/r8a7793-gose.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/r8a7793-gose.dts b/arch/arm/boot/dts/r8a7793-gose.dts +index 42f3313e6988a..dc435ac95d23a 100644 +--- a/arch/arm/boot/dts/r8a7793-gose.dts ++++ b/arch/arm/boot/dts/r8a7793-gose.dts +@@ -339,7 +339,7 @@ composite-in@20 { + reg = <0x20>; + remote = <&vin1>; + +- port { ++ ports { + #address-cells = <1>; + #size-cells = <0>; + +-- +2.25.1 + diff --git a/queue-5.4/arm-dts-gose-fix-ports-node-name-for-adv7612.patch b/queue-5.4/arm-dts-gose-fix-ports-node-name-for-adv7612.patch new file mode 100644 index 00000000000..df56ec02d3e --- /dev/null +++ b/queue-5.4/arm-dts-gose-fix-ports-node-name-for-adv7612.patch @@ -0,0 +1,40 @@ +From 25b1e2b3e582bf3c887734e9d61ffcec504925b3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 13 Jul 2020 13:10:16 +0200 +Subject: ARM: dts: gose: Fix ports node name for adv7612 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Niklas Söderlund + +[ Upstream commit 59692ac5a7bb8c97ff440fc8917828083fbc38d6 ] + +When adding the adv7612 device node the ports node was misspelled as +port, fix this. + +Fixes: bc63cd87f3ce924f ("ARM: dts: gose: add HDMI input") +Signed-off-by: Niklas Söderlund +Link: https://lore.kernel.org/r/20200713111016.523189-1-niklas.soderlund+renesas@ragnatech.se +Signed-off-by: Geert Uytterhoeven +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/r8a7793-gose.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/r8a7793-gose.dts b/arch/arm/boot/dts/r8a7793-gose.dts +index dc435ac95d23a..9f507393c3752 100644 +--- a/arch/arm/boot/dts/r8a7793-gose.dts ++++ b/arch/arm/boot/dts/r8a7793-gose.dts +@@ -399,7 +399,7 @@ hdmi-in@4c { + interrupts = <2 IRQ_TYPE_LEVEL_LOW>; + default-input = <0>; + +- port { ++ ports { + #address-cells = <1>; + #size-cells = <0>; + +-- +2.25.1 + diff --git a/queue-5.4/arm-dts-sunxi-bananapi-m2-plus-v1.2-add-regulator-su.patch b/queue-5.4/arm-dts-sunxi-bananapi-m2-plus-v1.2-add-regulator-su.patch new file mode 100644 index 00000000000..4a293f471dc --- /dev/null +++ b/queue-5.4/arm-dts-sunxi-bananapi-m2-plus-v1.2-add-regulator-su.patch @@ -0,0 +1,50 @@ +From e8ef7677cad6393dd3f1fc62c5cf254fc27a746d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 18 Jul 2020 00:00:47 +0800 +Subject: ARM: dts: sunxi: bananapi-m2-plus-v1.2: Add regulator supply to all + CPU cores + +From: Chen-Yu Tsai + +[ Upstream commit 55b271af765b0e03d1ff29502f81644b1a3c87fd ] + +The device tree currently only assigns the a supply for the first CPU +core, when in reality the regulator supply is shared by all four cores. +This might cause an issue if the implementation does not realize the +sharing of the supply. + +Assign the same regulator supply to the remaining CPU cores to address +this. + +Fixes: 6eeb4180d4b9 ("ARM: dts: sunxi: h3-h5: Add Bananapi M2+ v1.2 device trees") +Signed-off-by: Chen-Yu Tsai +Signed-off-by: Maxime Ripard +Link: https://lore.kernel.org/r/20200717160053.31191-3-wens@kernel.org +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/sunxi-bananapi-m2-plus-v1.2.dtsi | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/arch/arm/boot/dts/sunxi-bananapi-m2-plus-v1.2.dtsi b/arch/arm/boot/dts/sunxi-bananapi-m2-plus-v1.2.dtsi +index 22466afd38a3a..a628b5ee72b65 100644 +--- a/arch/arm/boot/dts/sunxi-bananapi-m2-plus-v1.2.dtsi ++++ b/arch/arm/boot/dts/sunxi-bananapi-m2-plus-v1.2.dtsi +@@ -28,3 +28,15 @@ reg_vdd_cpux: vdd-cpux { + &cpu0 { + cpu-supply = <®_vdd_cpux>; + }; ++ ++&cpu1 { ++ cpu-supply = <®_vdd_cpux>; ++}; ++ ++&cpu2 { ++ cpu-supply = <®_vdd_cpux>; ++}; ++ ++&cpu3 { ++ cpu-supply = <®_vdd_cpux>; ++}; +-- +2.25.1 + diff --git a/queue-5.4/arm-dts-sunxi-bananapi-m2-plus-v1.2-fix-cpu-supply-v.patch b/queue-5.4/arm-dts-sunxi-bananapi-m2-plus-v1.2-fix-cpu-supply-v.patch new file mode 100644 index 00000000000..ad6fb877802 --- /dev/null +++ b/queue-5.4/arm-dts-sunxi-bananapi-m2-plus-v1.2-fix-cpu-supply-v.patch @@ -0,0 +1,49 @@ +From 0b48c3ebc04e7653f1a861ed34812d5813f629fb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 18 Jul 2020 00:00:48 +0800 +Subject: ARM: dts: sunxi: bananapi-m2-plus-v1.2: Fix CPU supply voltages + +From: Chen-Yu Tsai + +[ Upstream commit e4dae01bf08b754de79072441c357737220b873f ] + +The Bananapi M2+ uses a GPIO line to change the effective resistance of +the CPU supply regulator's feedback resistor network. The voltages +described in the device tree were given directly by the vendor. This +turns out to be slightly off compared to the real values. + +The updated voltages are based on calculations of the feedback resistor +network, and verified down to three decimal places with a multi-meter. + +Fixes: 6eeb4180d4b9 ("ARM: dts: sunxi: h3-h5: Add Bananapi M2+ v1.2 device trees") +Signed-off-by: Chen-Yu Tsai +Signed-off-by: Maxime Ripard +Link: https://lore.kernel.org/r/20200717160053.31191-4-wens@kernel.org +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/sunxi-bananapi-m2-plus-v1.2.dtsi | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/boot/dts/sunxi-bananapi-m2-plus-v1.2.dtsi b/arch/arm/boot/dts/sunxi-bananapi-m2-plus-v1.2.dtsi +index a628b5ee72b65..235994a4a2ebb 100644 +--- a/arch/arm/boot/dts/sunxi-bananapi-m2-plus-v1.2.dtsi ++++ b/arch/arm/boot/dts/sunxi-bananapi-m2-plus-v1.2.dtsi +@@ -16,12 +16,12 @@ reg_vdd_cpux: vdd-cpux { + regulator-type = "voltage"; + regulator-boot-on; + regulator-always-on; +- regulator-min-microvolt = <1100000>; +- regulator-max-microvolt = <1300000>; ++ regulator-min-microvolt = <1108475>; ++ regulator-max-microvolt = <1308475>; + regulator-ramp-delay = <50>; /* 4ms */ + gpios = <&r_pio 0 1 GPIO_ACTIVE_HIGH>; /* PL1 */ + gpios-states = <0x1>; +- states = <1100000 0>, <1300000 1>; ++ states = <1108475 0>, <1308475 1>; + }; + }; + +-- +2.25.1 + diff --git a/queue-5.4/arm-exynos-mcpm-restore-big.little-cpuidle-support.patch b/queue-5.4/arm-exynos-mcpm-restore-big.little-cpuidle-support.patch new file mode 100644 index 00000000000..1431477cec2 --- /dev/null +++ b/queue-5.4/arm-exynos-mcpm-restore-big.little-cpuidle-support.patch @@ -0,0 +1,72 @@ +From 572d25d2f823e781193ba9707e9b650c404747a4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 29 Jun 2020 12:02:18 +0200 +Subject: ARM: exynos: MCPM: Restore big.LITTLE cpuidle support + +From: Marek Szyprowski + +[ Upstream commit ea9dd8f61c8a890843f68e8dc0062ce78365aab8 ] + +Call exynos_cpu_power_up(cpunr) unconditionally. This is needed by the +big.LITTLE cpuidle driver and has no side-effects on other code paths. + +The additional soft-reset call during little core power up has been added +to properly boot all cores on the Exynos5422-based boards with secure +firmware (like Odroid XU3/XU4 family). This however broke big.LITTLE +CPUidle driver, which worked only on boards without secure firmware (like +Peach-Pit/Pi Chromebooks). Apply the workaround only when board is +running under secure firmware. + +Fixes: 833b5794e330 ("ARM: EXYNOS: reset Little cores when cpu is up") +Signed-off-by: Marek Szyprowski +Reviewed-by: Lukasz Luba +Signed-off-by: Krzysztof Kozlowski +Signed-off-by: Sasha Levin +--- + arch/arm/mach-exynos/mcpm-exynos.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/mach-exynos/mcpm-exynos.c b/arch/arm/mach-exynos/mcpm-exynos.c +index 9a681b421ae11..cd861c57d5adf 100644 +--- a/arch/arm/mach-exynos/mcpm-exynos.c ++++ b/arch/arm/mach-exynos/mcpm-exynos.c +@@ -26,6 +26,7 @@ + #define EXYNOS5420_USE_L2_COMMON_UP_STATE BIT(30) + + static void __iomem *ns_sram_base_addr __ro_after_init; ++static bool secure_firmware __ro_after_init; + + /* + * The common v7_exit_coherency_flush API could not be used because of the +@@ -58,15 +59,16 @@ static void __iomem *ns_sram_base_addr __ro_after_init; + static int exynos_cpu_powerup(unsigned int cpu, unsigned int cluster) + { + unsigned int cpunr = cpu + (cluster * EXYNOS5420_CPUS_PER_CLUSTER); ++ bool state; + + pr_debug("%s: cpu %u cluster %u\n", __func__, cpu, cluster); + if (cpu >= EXYNOS5420_CPUS_PER_CLUSTER || + cluster >= EXYNOS5420_NR_CLUSTERS) + return -EINVAL; + +- if (!exynos_cpu_power_state(cpunr)) { +- exynos_cpu_power_up(cpunr); +- ++ state = exynos_cpu_power_state(cpunr); ++ exynos_cpu_power_up(cpunr); ++ if (!state && secure_firmware) { + /* + * This assumes the cluster number of the big cores(Cortex A15) + * is 0 and the Little cores(Cortex A7) is 1. +@@ -258,6 +260,8 @@ static int __init exynos_mcpm_init(void) + return -ENOMEM; + } + ++ secure_firmware = exynos_secure_firmware_available(); ++ + /* + * To increase the stability of KFC reset we need to program + * the PMU SPARE3 register +-- +2.25.1 + diff --git a/queue-5.4/arm-socfpga-pm-add-missing-put_device-call-in-socfpg.patch b/queue-5.4/arm-socfpga-pm-add-missing-put_device-call-in-socfpg.patch new file mode 100644 index 00000000000..dfc493d10e8 --- /dev/null +++ b/queue-5.4/arm-socfpga-pm-add-missing-put_device-call-in-socfpg.patch @@ -0,0 +1,64 @@ +From 823e3aac3aca9d6c4a37dd5135d7b80ec43d733e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 21 Jul 2020 21:45:51 +0800 +Subject: ARM: socfpga: PM: add missing put_device() call in + socfpga_setup_ocram_self_refresh() + +From: Yu Kuai + +[ Upstream commit 3ad7b4e8f89d6bcc9887ca701cf2745a6aedb1a0 ] + +if of_find_device_by_node() succeed, socfpga_setup_ocram_self_refresh +doesn't have a corresponding put_device(). Thus add a jump target to +fix the exception handling for this function implementation. + +Fixes: 44fd8c7d4005 ("ARM: socfpga: support suspend to ram") +Signed-off-by: Yu Kuai +Signed-off-by: Dinh Nguyen +Signed-off-by: Sasha Levin +--- + arch/arm/mach-socfpga/pm.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/mach-socfpga/pm.c b/arch/arm/mach-socfpga/pm.c +index 6ed887cf8dc9a..365c0428b21b6 100644 +--- a/arch/arm/mach-socfpga/pm.c ++++ b/arch/arm/mach-socfpga/pm.c +@@ -49,14 +49,14 @@ static int socfpga_setup_ocram_self_refresh(void) + if (!ocram_pool) { + pr_warn("%s: ocram pool unavailable!\n", __func__); + ret = -ENODEV; +- goto put_node; ++ goto put_device; + } + + ocram_base = gen_pool_alloc(ocram_pool, socfpga_sdram_self_refresh_sz); + if (!ocram_base) { + pr_warn("%s: unable to alloc ocram!\n", __func__); + ret = -ENOMEM; +- goto put_node; ++ goto put_device; + } + + ocram_pbase = gen_pool_virt_to_phys(ocram_pool, ocram_base); +@@ -67,7 +67,7 @@ static int socfpga_setup_ocram_self_refresh(void) + if (!suspend_ocram_base) { + pr_warn("%s: __arm_ioremap_exec failed!\n", __func__); + ret = -ENOMEM; +- goto put_node; ++ goto put_device; + } + + /* Copy the code that puts DDR in self refresh to ocram */ +@@ -81,6 +81,8 @@ static int socfpga_setup_ocram_self_refresh(void) + if (!socfpga_sdram_self_refresh_in_ocram) + ret = -EFAULT; + ++put_device: ++ put_device(&pdev->dev); + put_node: + of_node_put(np); + +-- +2.25.1 + diff --git a/queue-5.4/arm64-dts-exynos-fix-silent-hang-after-boot-on-espre.patch b/queue-5.4/arm64-dts-exynos-fix-silent-hang-after-boot-on-espre.patch new file mode 100644 index 00000000000..b30c5696c6b --- /dev/null +++ b/queue-5.4/arm64-dts-exynos-fix-silent-hang-after-boot-on-espre.patch @@ -0,0 +1,37 @@ +From cc99891039dd091f68f930d6b8674fcd168a609d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 5 Jul 2020 12:39:17 +0530 +Subject: arm64: dts: exynos: Fix silent hang after boot on Espresso + +From: Alim Akhtar + +[ Upstream commit b072714bfc0e42c984b8fd6e069f3ca17de8137a ] + +Once regulators are disabled after kernel boot, on Espresso board silent +hang observed because of LDO7 being disabled. LDO7 actually provide +power to CPU cores and non-cpu blocks circuitries. Keep this regulator +always-on to fix this hang. + +Fixes: 9589f7721e16 ("arm64: dts: Add S2MPS15 PMIC node on exynos7-espresso") +Signed-off-by: Alim Akhtar +Signed-off-by: Krzysztof Kozlowski +Signed-off-by: Sasha Levin +--- + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/arm64/boot/dts/exynos/exynos7-espresso.dts b/arch/arm64/boot/dts/exynos/exynos7-espresso.dts +index 080e0f56e108f..61ee7b6a31594 100644 +--- a/arch/arm64/boot/dts/exynos/exynos7-espresso.dts ++++ b/arch/arm64/boot/dts/exynos/exynos7-espresso.dts +@@ -157,6 +157,7 @@ ldo7_reg: LDO7 { + regulator-min-microvolt = <700000>; + regulator-max-microvolt = <1150000>; + regulator-enable-ramp-delay = <125>; ++ regulator-always-on; + }; + + ldo8_reg: LDO8 { +-- +2.25.1 + diff --git a/queue-5.4/arm64-dts-hisilicon-hikey-fixes-to-comply-with-adi-a.patch b/queue-5.4/arm64-dts-hisilicon-hikey-fixes-to-comply-with-adi-a.patch new file mode 100644 index 00000000000..ae6bab38d60 --- /dev/null +++ b/queue-5.4/arm64-dts-hisilicon-hikey-fixes-to-comply-with-adi-a.patch @@ -0,0 +1,72 @@ +From 6501ac82d6a7b3dd550d49c295d6ebd6fa67a588 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 1 Jun 2020 08:33:06 +0200 +Subject: arm64: dts: hisilicon: hikey: fixes to comply with adi, adv7533 DT + binding +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Ricardo Cañuelo + +[ Upstream commit bbe28fc3cbabbef781bcdf847615d52ce2e26e42 ] + +hi3660-hikey960.dts: + Define a 'ports' node for 'adv7533: adv7533@39' and the + 'adi,dsi-lanes' property to make it compliant with the adi,adv7533 DT + binding. + + This fills the requirements to meet the binding requirements, + remote endpoints are not defined. + +hi6220-hikey.dts: + Change property name s/pd-gpio/pd-gpios, gpio properties should be + plural. This is just a cosmetic change. + +Signed-off-by: Ricardo Cañuelo +Acked-by: Laurent Pinchart +Signed-off-by: Wei Xu +Signed-off-by: Sasha Levin +--- + arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 11 +++++++++++ + arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 2 +- + 2 files changed, 12 insertions(+), 1 deletion(-) + +diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts +index e035cf195b19a..8c4bfbaf3a806 100644 +--- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts ++++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts +@@ -530,6 +530,17 @@ adv7533: adv7533@39 { + status = "ok"; + compatible = "adi,adv7533"; + reg = <0x39>; ++ adi,dsi-lanes = <4>; ++ ports { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ port@0 { ++ reg = <0>; ++ }; ++ port@1 { ++ reg = <1>; ++ }; ++ }; + }; + }; + +diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts +index c14205cd6bf5c..3e47150c05ec2 100644 +--- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts ++++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts +@@ -516,7 +516,7 @@ adv7533: adv7533@39 { + reg = <0x39>; + interrupt-parent = <&gpio1>; + interrupts = <1 2>; +- pd-gpio = <&gpio0 4 0>; ++ pd-gpios = <&gpio0 4 0>; + adi,dsi-lanes = <4>; + #sound-dai-cells = <0>; + +-- +2.25.1 + diff --git a/queue-5.4/arm64-dts-qcom-msm8916-replace-invalid-bias-pull-non.patch b/queue-5.4/arm64-dts-qcom-msm8916-replace-invalid-bias-pull-non.patch new file mode 100644 index 00000000000..6c706b1ff7c --- /dev/null +++ b/queue-5.4/arm64-dts-qcom-msm8916-replace-invalid-bias-pull-non.patch @@ -0,0 +1,81 @@ +From a744537f8a56111e8e37116ed8c085261836756a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 5 Jun 2020 20:59:14 +0200 +Subject: arm64: dts: qcom: msm8916: Replace invalid bias-pull-none property + +From: Stephan Gerhold + +[ Upstream commit 1b6a1a162defe649c5599d661b58ac64bb6f31b6 ] + +msm8916-pins.dtsi specifies "bias-pull-none" for most of the audio +pin configurations. This was likely copied from the qcom kernel fork +where the same property was used for these audio pins. + +However, "bias-pull-none" actually does not exist at all - not in +mainline and not in downstream. I can only guess that the original +intention was to configure "no pull", i.e. bias-disable. + +Change it to that instead. + +Fixes: 143bb9ad85b7 ("arm64: dts: qcom: add audio pinctrls") +Cc: Srinivas Kandagatla +Signed-off-by: Stephan Gerhold +Link: https://lore.kernel.org/r/20200605185916.318494-2-stephan@gerhold.net +Signed-off-by: Bjorn Andersson +Signed-off-by: Sasha Levin +--- + arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi +index 242aaea688040..1235830ffd0b7 100644 +--- a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi ++++ b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi +@@ -508,7 +508,7 @@ pinconf { + pins = "gpio63", "gpio64", "gpio65", "gpio66", + "gpio67", "gpio68"; + drive-strength = <8>; +- bias-pull-none; ++ bias-disable; + }; + }; + cdc_pdm_lines_sus: pdm_lines_off { +@@ -537,7 +537,7 @@ pinconf { + pins = "gpio113", "gpio114", "gpio115", + "gpio116"; + drive-strength = <8>; +- bias-pull-none; ++ bias-disable; + }; + }; + +@@ -565,7 +565,7 @@ pinmux { + pinconf { + pins = "gpio110"; + drive-strength = <8>; +- bias-pull-none; ++ bias-disable; + }; + }; + +@@ -591,7 +591,7 @@ pinmux { + pinconf { + pins = "gpio116"; + drive-strength = <8>; +- bias-pull-none; ++ bias-disable; + }; + }; + ext_mclk_tlmm_lines_sus: mclk_lines_off { +@@ -619,7 +619,7 @@ pinconf { + pins = "gpio112", "gpio117", "gpio118", + "gpio119"; + drive-strength = <8>; +- bias-pull-none; ++ bias-disable; + }; + }; + ext_sec_tlmm_lines_sus: tlmm_lines_off { +-- +2.25.1 + diff --git a/queue-5.4/arm64-dts-rockchip-fix-rk3368-lion-gmac-reset-gpio.patch b/queue-5.4/arm64-dts-rockchip-fix-rk3368-lion-gmac-reset-gpio.patch new file mode 100644 index 00000000000..0dff1a8da70 --- /dev/null +++ b/queue-5.4/arm64-dts-rockchip-fix-rk3368-lion-gmac-reset-gpio.patch @@ -0,0 +1,43 @@ +From 544836633db4de0e914baab9638a2aee7df61ba4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 7 Jun 2020 23:29:09 +0200 +Subject: arm64: dts: rockchip: fix rk3368-lion gmac reset gpio + +From: Heiko Stuebner + +[ Upstream commit 2300e6dab473e93181cf76e4fe6671aa3d24c57b ] + +The lion gmac node currently uses opposite active-values for the +gmac phy reset pin. The gpio-declaration uses active-high while the +separate snps,reset-active-low property marks the pin as active low. + +While on the kernel side this works ok, other DT users may get +confused - as seen with uboot right now. + +So bring this in line and make both properties match, similar to the +other Rockchip board. + +Fixes: d99a02bcfa81 ("arm64: dts: rockchip: add RK3368-uQ7 (Lion) SoM") +Signed-off-by: Heiko Stuebner +Link: https://lore.kernel.org/r/20200607212909.920575-1-heiko@sntech.de +Signed-off-by: Sasha Levin +--- + arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi +index e17311e090826..216aafd90e7f1 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi +@@ -156,7 +156,7 @@ &gmac { + pinctrl-0 = <&rgmii_pins>; + snps,reset-active-low; + snps,reset-delays-us = <0 10000 50000>; +- snps,reset-gpio = <&gpio3 RK_PB3 GPIO_ACTIVE_HIGH>; ++ snps,reset-gpio = <&gpio3 RK_PB3 GPIO_ACTIVE_LOW>; + tx_delay = <0x10>; + rx_delay = <0x10>; + status = "okay"; +-- +2.25.1 + diff --git a/queue-5.4/arm64-dts-rockchip-fix-rk3399-puma-gmac-reset-gpio.patch b/queue-5.4/arm64-dts-rockchip-fix-rk3399-puma-gmac-reset-gpio.patch new file mode 100644 index 00000000000..284478a4ff5 --- /dev/null +++ b/queue-5.4/arm64-dts-rockchip-fix-rk3399-puma-gmac-reset-gpio.patch @@ -0,0 +1,43 @@ +From 74a0d92c5e648da261803aaed6e6c5f8d7ef6884 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 3 Jun 2020 15:28:36 +0200 +Subject: arm64: dts: rockchip: fix rk3399-puma gmac reset gpio + +From: Heiko Stuebner + +[ Upstream commit 8a445086f8af0b7b9bd8d1901d6f306bb154f70d ] + +The puma gmac node currently uses opposite active-values for the +gmac phy reset pin. The gpio-declaration uses active-high while the +separate snps,reset-active-low property marks the pin as active low. + +While on the kernel side this works ok, other DT users may get +confused - as seen with uboot right now. + +So bring this in line and make both properties match, similar to the +other Rockchip board. + +Fixes: 2c66fc34e945 ("arm64: dts: rockchip: add RK3399-Q7 (Puma) SoM") +Signed-off-by: Heiko Stuebner +Link: https://lore.kernel.org/r/20200603132836.362519-1-heiko@sntech.de +Signed-off-by: Sasha Levin +--- + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi +index fb47e4046f4e4..45b86933c6ea0 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi +@@ -157,7 +157,7 @@ &gmac { + phy-mode = "rgmii"; + pinctrl-names = "default"; + pinctrl-0 = <&rgmii_pins>; +- snps,reset-gpio = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>; ++ snps,reset-gpio = <&gpio3 RK_PC0 GPIO_ACTIVE_LOW>; + snps,reset-active-low; + snps,reset-delays-us = <0 10000 50000>; + tx_delay = <0x10>; +-- +2.25.1 + diff --git a/queue-5.4/arm64-dts-rockchip-fix-rk3399-puma-vcc5v0-host-gpio.patch b/queue-5.4/arm64-dts-rockchip-fix-rk3399-puma-vcc5v0-host-gpio.patch new file mode 100644 index 00000000000..04e14abe974 --- /dev/null +++ b/queue-5.4/arm64-dts-rockchip-fix-rk3399-puma-vcc5v0-host-gpio.patch @@ -0,0 +1,43 @@ +From d122717916b88ab1a2c3f8405ed0e9ec2095d257 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 4 Jun 2020 11:12:39 +0200 +Subject: arm64: dts: rockchip: fix rk3399-puma vcc5v0-host gpio + +From: Heiko Stuebner + +[ Upstream commit 7a7184f6cfa9279f1a1c10a1845d247d7fad54ff ] + +The puma vcc5v0_host regulator node currently uses opposite active-values +for the enable pin. The gpio-declaration uses active-high while the +separate enable-active-low property marks the pin as active low. + +While on the kernel side this works ok, other DT users may get +confused - as seen with uboot right now. + +So bring this in line and make both properties match, similar to the +gmac fix. + +Fixes: 2c66fc34e945 ("arm64: dts: rockchip: add RK3399-Q7 (Puma) SoM") +Signed-off-by: Heiko Stuebner +Link: https://lore.kernel.org/r/20200604091239.424318-1-heiko@sntech.de +Signed-off-by: Sasha Levin +--- + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi +index 62ea288a1a70b..fb47e4046f4e4 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi +@@ -101,7 +101,7 @@ vcc3v3_sys: vcc3v3-sys { + + vcc5v0_host: vcc5v0-host-regulator { + compatible = "regulator-fixed"; +- gpio = <&gpio4 RK_PA3 GPIO_ACTIVE_HIGH>; ++ gpio = <&gpio4 RK_PA3 GPIO_ACTIVE_LOW>; + enable-active-low; + pinctrl-names = "default"; + pinctrl-0 = <&vcc5v0_host_en>; +-- +2.25.1 + diff --git a/queue-5.4/asoc-fsl_sai-fix-value-of-fsl_sai_cr1_rfw_mask.patch b/queue-5.4/asoc-fsl_sai-fix-value-of-fsl_sai_cr1_rfw_mask.patch new file mode 100644 index 00000000000..2c95ce54018 --- /dev/null +++ b/queue-5.4/asoc-fsl_sai-fix-value-of-fsl_sai_cr1_rfw_mask.patch @@ -0,0 +1,61 @@ +From 1e7837ef1682c1abfd072ba24a22031854fc9de3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 31 Jul 2020 14:28:15 +0800 +Subject: ASoC: fsl_sai: Fix value of FSL_SAI_CR1_RFW_MASK + +From: Shengjiu Wang + +[ Upstream commit 5aef1ff2397d021f93d874b57dff032fdfac73de ] + +The fifo_depth is 64 on i.MX8QM/i.MX8QXP, 128 on i.MX8MQ, 16 on +i.MX7ULP. + +Original FSL_SAI_CR1_RFW_MASK value 0x1F is not suitable for +these platform, the FIFO watermark mask should be updated +according to the fifo_depth. + +Fixes: a860fac42097 ("ASoC: fsl_sai: Add support for imx7ulp/imx8mq") +Signed-off-by: Shengjiu Wang +Reviewed-by: Fabio Estevam +Link: https://lore.kernel.org/r/1596176895-28724-1-git-send-email-shengjiu.wang@nxp.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/fsl/fsl_sai.c | 5 +++-- + sound/soc/fsl/fsl_sai.h | 2 +- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c +index 41b83ecaf0082..914b75c23d1bf 100644 +--- a/sound/soc/fsl/fsl_sai.c ++++ b/sound/soc/fsl/fsl_sai.c +@@ -680,10 +680,11 @@ static int fsl_sai_dai_probe(struct snd_soc_dai *cpu_dai) + regmap_write(sai->regmap, FSL_SAI_RCSR(ofs), 0); + + regmap_update_bits(sai->regmap, FSL_SAI_TCR1(ofs), +- FSL_SAI_CR1_RFW_MASK, ++ FSL_SAI_CR1_RFW_MASK(sai->soc_data->fifo_depth), + sai->soc_data->fifo_depth - FSL_SAI_MAXBURST_TX); + regmap_update_bits(sai->regmap, FSL_SAI_RCR1(ofs), +- FSL_SAI_CR1_RFW_MASK, FSL_SAI_MAXBURST_RX - 1); ++ FSL_SAI_CR1_RFW_MASK(sai->soc_data->fifo_depth), ++ FSL_SAI_MAXBURST_RX - 1); + + snd_soc_dai_init_dma_data(cpu_dai, &sai->dma_params_tx, + &sai->dma_params_rx); +diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h +index 76b15deea80c7..6aba7d28f5f34 100644 +--- a/sound/soc/fsl/fsl_sai.h ++++ b/sound/soc/fsl/fsl_sai.h +@@ -94,7 +94,7 @@ + #define FSL_SAI_CSR_FRDE BIT(0) + + /* SAI Transmit and Receive Configuration 1 Register */ +-#define FSL_SAI_CR1_RFW_MASK 0x1f ++#define FSL_SAI_CR1_RFW_MASK(x) ((x) - 1) + + /* SAI Transmit and Receive Configuration 2 Register */ + #define FSL_SAI_CR2_SYNC BIT(30) +-- +2.25.1 + diff --git a/queue-5.4/asoc-intel-bxt_rt298-add-missing-.owner-field.patch b/queue-5.4/asoc-intel-bxt_rt298-add-missing-.owner-field.patch new file mode 100644 index 00000000000..c9f732ca0c4 --- /dev/null +++ b/queue-5.4/asoc-intel-bxt_rt298-add-missing-.owner-field.patch @@ -0,0 +1,50 @@ +From 9fdf30b72b47c3ee2b49fc20ebc4806d61b2c0d6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 25 Jun 2020 14:12:55 -0500 +Subject: ASoC: Intel: bxt_rt298: add missing .owner field + +From: Pierre-Louis Bossart + +[ Upstream commit 88cee34b776f80d2da04afb990c2a28c36799c43 ] + +This field is required for ASoC cards. Not setting it will result in a +module->name pointer being NULL and generate problems such as + +cat /proc/asound/modules + 0 (efault) + +Fixes: 76016322ec56 ('ASoC: Intel: Add Broxton-P machine driver') +Reported-by: Jaroslav Kysela +Suggested-by: Takashi Iwai +Signed-off-by: Pierre-Louis Bossart +Reviewed-by: Kai Vehmanen +Link: https://lore.kernel.org/r/20200625191308.3322-5-pierre-louis.bossart@linux.intel.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/intel/boards/bxt_rt298.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/sound/soc/intel/boards/bxt_rt298.c b/sound/soc/intel/boards/bxt_rt298.c +index adf416a49b483..60fb874950504 100644 +--- a/sound/soc/intel/boards/bxt_rt298.c ++++ b/sound/soc/intel/boards/bxt_rt298.c +@@ -556,6 +556,7 @@ static int bxt_card_late_probe(struct snd_soc_card *card) + /* broxton audio machine driver for SPT + RT298S */ + static struct snd_soc_card broxton_rt298 = { + .name = "broxton-rt298", ++ .owner = THIS_MODULE, + .dai_link = broxton_rt298_dais, + .num_links = ARRAY_SIZE(broxton_rt298_dais), + .controls = broxton_controls, +@@ -571,6 +572,7 @@ static struct snd_soc_card broxton_rt298 = { + + static struct snd_soc_card geminilake_rt298 = { + .name = "geminilake-rt298", ++ .owner = THIS_MODULE, + .dai_link = broxton_rt298_dais, + .num_links = ARRAY_SIZE(broxton_rt298_dais), + .controls = broxton_controls, +-- +2.25.1 + diff --git a/queue-5.4/asoc-meson-axg-tdm-formatters-fix-sclk-inversion.patch b/queue-5.4/asoc-meson-axg-tdm-formatters-fix-sclk-inversion.patch new file mode 100644 index 00000000000..0da06d79f32 --- /dev/null +++ b/queue-5.4/asoc-meson-axg-tdm-formatters-fix-sclk-inversion.patch @@ -0,0 +1,121 @@ +From 56906d8e408617b2b00828ae34dbc7979a24a3c3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 29 Jul 2020 17:44:55 +0200 +Subject: ASoC: meson: axg-tdm-formatters: fix sclk inversion + +From: Jerome Brunet + +[ Upstream commit 0d3f01dcdc234001f979a0af0b6b31cb9f25b6c1 ] + +After carefully checking, it appears that both tdmout and tdmin require the +rising edge of the sclk they get to be synchronized with the frame sync +event (which should be a rising edge of lrclk). + +TDMIN was improperly set before this patch. Remove the sclk_invert quirk +which is no longer needed and fix the sclk phase. + +Fixes: 1a11d88f499c ("ASoC: meson: add tdm formatter base driver") +Signed-off-by: Jerome Brunet +Link: https://lore.kernel.org/r/20200729154456.1983396-4-jbrunet@baylibre.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/meson/axg-tdm-formatter.c | 11 ++++++----- + sound/soc/meson/axg-tdm-formatter.h | 1 - + sound/soc/meson/axg-tdmin.c | 2 -- + sound/soc/meson/axg-tdmout.c | 3 --- + 4 files changed, 6 insertions(+), 11 deletions(-) + +diff --git a/sound/soc/meson/axg-tdm-formatter.c b/sound/soc/meson/axg-tdm-formatter.c +index 358c8c0d861cd..f7e8e9da68a06 100644 +--- a/sound/soc/meson/axg-tdm-formatter.c ++++ b/sound/soc/meson/axg-tdm-formatter.c +@@ -70,7 +70,7 @@ EXPORT_SYMBOL_GPL(axg_tdm_formatter_set_channel_masks); + static int axg_tdm_formatter_enable(struct axg_tdm_formatter *formatter) + { + struct axg_tdm_stream *ts = formatter->stream; +- bool invert = formatter->drv->quirks->invert_sclk; ++ bool invert; + int ret; + + /* Do nothing if the formatter is already enabled */ +@@ -96,11 +96,12 @@ static int axg_tdm_formatter_enable(struct axg_tdm_formatter *formatter) + return ret; + + /* +- * If sclk is inverted, invert it back and provide the inversion +- * required by the formatter ++ * If sclk is inverted, it means the bit should latched on the ++ * rising edge which is what our HW expects. If not, we need to ++ * invert it before the formatter. + */ +- invert ^= axg_tdm_sclk_invert(ts->iface->fmt); +- ret = clk_set_phase(formatter->sclk, invert ? 180 : 0); ++ invert = axg_tdm_sclk_invert(ts->iface->fmt); ++ ret = clk_set_phase(formatter->sclk, invert ? 0 : 180); + if (ret) + return ret; + +diff --git a/sound/soc/meson/axg-tdm-formatter.h b/sound/soc/meson/axg-tdm-formatter.h +index 9ef98e955cb27..a1f0dcc0ff134 100644 +--- a/sound/soc/meson/axg-tdm-formatter.h ++++ b/sound/soc/meson/axg-tdm-formatter.h +@@ -16,7 +16,6 @@ struct snd_kcontrol; + + struct axg_tdm_formatter_hw { + unsigned int skew_offset; +- bool invert_sclk; + }; + + struct axg_tdm_formatter_ops { +diff --git a/sound/soc/meson/axg-tdmin.c b/sound/soc/meson/axg-tdmin.c +index 3d002b4eb939e..88ed95ae886bb 100644 +--- a/sound/soc/meson/axg-tdmin.c ++++ b/sound/soc/meson/axg-tdmin.c +@@ -228,7 +228,6 @@ static const struct axg_tdm_formatter_driver axg_tdmin_drv = { + .regmap_cfg = &axg_tdmin_regmap_cfg, + .ops = &axg_tdmin_ops, + .quirks = &(const struct axg_tdm_formatter_hw) { +- .invert_sclk = false, + .skew_offset = 2, + }, + }; +@@ -238,7 +237,6 @@ static const struct axg_tdm_formatter_driver g12a_tdmin_drv = { + .regmap_cfg = &axg_tdmin_regmap_cfg, + .ops = &axg_tdmin_ops, + .quirks = &(const struct axg_tdm_formatter_hw) { +- .invert_sclk = false, + .skew_offset = 3, + }, + }; +diff --git a/sound/soc/meson/axg-tdmout.c b/sound/soc/meson/axg-tdmout.c +index 418ec314b37d4..3ceabddae629e 100644 +--- a/sound/soc/meson/axg-tdmout.c ++++ b/sound/soc/meson/axg-tdmout.c +@@ -238,7 +238,6 @@ static const struct axg_tdm_formatter_driver axg_tdmout_drv = { + .regmap_cfg = &axg_tdmout_regmap_cfg, + .ops = &axg_tdmout_ops, + .quirks = &(const struct axg_tdm_formatter_hw) { +- .invert_sclk = true, + .skew_offset = 1, + }, + }; +@@ -248,7 +247,6 @@ static const struct axg_tdm_formatter_driver g12a_tdmout_drv = { + .regmap_cfg = &axg_tdmout_regmap_cfg, + .ops = &axg_tdmout_ops, + .quirks = &(const struct axg_tdm_formatter_hw) { +- .invert_sclk = true, + .skew_offset = 2, + }, + }; +@@ -309,7 +307,6 @@ static const struct axg_tdm_formatter_driver sm1_tdmout_drv = { + .regmap_cfg = &axg_tdmout_regmap_cfg, + .ops = &axg_tdmout_ops, + .quirks = &(const struct axg_tdm_formatter_hw) { +- .invert_sclk = true, + .skew_offset = 2, + }, + }; +-- +2.25.1 + diff --git a/queue-5.4/asoc-meson-axg-tdm-interface-fix-link-fmt-setup.patch b/queue-5.4/asoc-meson-axg-tdm-interface-fix-link-fmt-setup.patch new file mode 100644 index 00000000000..0b58a9f32c5 --- /dev/null +++ b/queue-5.4/asoc-meson-axg-tdm-interface-fix-link-fmt-setup.patch @@ -0,0 +1,75 @@ +From 250e6531be0030d189d7aba9cdcc8e2052ace792 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 29 Jul 2020 17:44:53 +0200 +Subject: ASoC: meson: axg-tdm-interface: fix link fmt setup + +From: Jerome Brunet + +[ Upstream commit 6878ba91ce84f7a07887a0615af70f969508839f ] + +The .set_fmt() callback of the axg tdm interface incorrectly +test the content of SND_SOC_DAIFMT_MASTER_MASK as if it was a +bitfield, which it is not. + +Implement the test correctly. + +Fixes: d60e4f1e4be5 ("ASoC: meson: add tdm interface driver") +Signed-off-by: Jerome Brunet +Link: https://lore.kernel.org/r/20200729154456.1983396-2-jbrunet@baylibre.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/meson/axg-tdm-interface.c | 26 +++++++++++++++++--------- + 1 file changed, 17 insertions(+), 9 deletions(-) + +diff --git a/sound/soc/meson/axg-tdm-interface.c b/sound/soc/meson/axg-tdm-interface.c +index d51f3344be7c6..e25336f739123 100644 +--- a/sound/soc/meson/axg-tdm-interface.c ++++ b/sound/soc/meson/axg-tdm-interface.c +@@ -119,18 +119,25 @@ static int axg_tdm_iface_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) + { + struct axg_tdm_iface *iface = snd_soc_dai_get_drvdata(dai); + +- /* These modes are not supported */ +- if (fmt & (SND_SOC_DAIFMT_CBS_CFM | SND_SOC_DAIFMT_CBM_CFS)) { ++ switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { ++ case SND_SOC_DAIFMT_CBS_CFS: ++ if (!iface->mclk) { ++ dev_err(dai->dev, "cpu clock master: mclk missing\n"); ++ return -ENODEV; ++ } ++ break; ++ ++ case SND_SOC_DAIFMT_CBM_CFM: ++ break; ++ ++ case SND_SOC_DAIFMT_CBS_CFM: ++ case SND_SOC_DAIFMT_CBM_CFS: + dev_err(dai->dev, "only CBS_CFS and CBM_CFM are supported\n"); ++ /* Fall-through */ ++ default: + return -EINVAL; + } + +- /* If the TDM interface is the clock master, it requires mclk */ +- if (!iface->mclk && (fmt & SND_SOC_DAIFMT_CBS_CFS)) { +- dev_err(dai->dev, "cpu clock master: mclk missing\n"); +- return -ENODEV; +- } +- + iface->fmt = fmt; + return 0; + } +@@ -319,7 +326,8 @@ static int axg_tdm_iface_hw_params(struct snd_pcm_substream *substream, + if (ret) + return ret; + +- if (iface->fmt & SND_SOC_DAIFMT_CBS_CFS) { ++ if ((iface->fmt & SND_SOC_DAIFMT_MASTER_MASK) == ++ SND_SOC_DAIFMT_CBS_CFS) { + ret = axg_tdm_iface_set_sclk(dai, params); + if (ret) + return ret; +-- +2.25.1 + diff --git a/queue-5.4/asoc-meson-axg-tdmin-fix-g12a-skew.patch b/queue-5.4/asoc-meson-axg-tdmin-fix-g12a-skew.patch new file mode 100644 index 00000000000..47c21ae5426 --- /dev/null +++ b/queue-5.4/asoc-meson-axg-tdmin-fix-g12a-skew.patch @@ -0,0 +1,56 @@ +From 38ed4b9e3648cc13ce46877202e69ef3ef8ec7fa Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 29 Jul 2020 17:44:54 +0200 +Subject: ASoC: meson: axg-tdmin: fix g12a skew + +From: Jerome Brunet + +[ Upstream commit 80a254394fcfe55450b0351da298ca7231889219 ] + +After carefully checking the result provided by the TDMIN on the g12a and +sm1 SoC families, the TDMIN skew offset appears to be 3 instead of 2 on the +axg. + +Fixes: f01bc67f58fd ("ASoC: meson: axg-tdm-formatter: rework quirks settings") +Signed-off-by: Jerome Brunet +Link: https://lore.kernel.org/r/20200729154456.1983396-3-jbrunet@baylibre.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/meson/axg-tdmin.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/sound/soc/meson/axg-tdmin.c b/sound/soc/meson/axg-tdmin.c +index 973d4c02ef8db..3d002b4eb939e 100644 +--- a/sound/soc/meson/axg-tdmin.c ++++ b/sound/soc/meson/axg-tdmin.c +@@ -233,10 +233,26 @@ static const struct axg_tdm_formatter_driver axg_tdmin_drv = { + }, + }; + ++static const struct axg_tdm_formatter_driver g12a_tdmin_drv = { ++ .component_drv = &axg_tdmin_component_drv, ++ .regmap_cfg = &axg_tdmin_regmap_cfg, ++ .ops = &axg_tdmin_ops, ++ .quirks = &(const struct axg_tdm_formatter_hw) { ++ .invert_sclk = false, ++ .skew_offset = 3, ++ }, ++}; ++ + static const struct of_device_id axg_tdmin_of_match[] = { + { + .compatible = "amlogic,axg-tdmin", + .data = &axg_tdmin_drv, ++ }, { ++ .compatible = "amlogic,g12a-tdmin", ++ .data = &g12a_tdmin_drv, ++ }, { ++ .compatible = "amlogic,sm1-tdmin", ++ .data = &g12a_tdmin_drv, + }, {} + }; + MODULE_DEVICE_TABLE(of, axg_tdmin_of_match); +-- +2.25.1 + diff --git a/queue-5.4/asoc-meson-fixes-the-missed-kfree-for-axg_card_add_t.patch b/queue-5.4/asoc-meson-fixes-the-missed-kfree-for-axg_card_add_t.patch new file mode 100644 index 00000000000..f4dc9be1d8b --- /dev/null +++ b/queue-5.4/asoc-meson-fixes-the-missed-kfree-for-axg_card_add_t.patch @@ -0,0 +1,39 @@ +From fee070e033e821fa2e682324284ac8de26fef02c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 17 Jul 2020 16:22:42 +0800 +Subject: ASoC: meson: fixes the missed kfree() for axg_card_add_tdm_loopback + +From: Jing Xiangfeng + +[ Upstream commit bd054ece7d9cdd88e900df6625e951a01d9f655e ] + +axg_card_add_tdm_loopback() misses to call kfree() in an error path. We +can use devm_kasprintf() to fix the issue, also improve maintainability. +So use it instead. + +Fixes: c84836d7f650 ("ASoC: meson: axg-card: use modern dai_link style") +Signed-off-by: Jing Xiangfeng +Reviewed-by: Jerome Brunet +Link: https://lore.kernel.org/r/20200717082242.130627-1-jingxiangfeng@huawei.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/meson/axg-card.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c +index 1f698adde506c..7126344017fa6 100644 +--- a/sound/soc/meson/axg-card.c ++++ b/sound/soc/meson/axg-card.c +@@ -266,7 +266,7 @@ static int axg_card_add_tdm_loopback(struct snd_soc_card *card, + + lb = &card->dai_link[*index + 1]; + +- lb->name = kasprintf(GFP_KERNEL, "%s-lb", pad->name); ++ lb->name = devm_kasprintf(card->dev, GFP_KERNEL, "%s-lb", pad->name); + if (!lb->name) + return -ENOMEM; + +-- +2.25.1 + diff --git a/queue-5.4/asoc-sof-nocodec-add-missing-.owner-field.patch b/queue-5.4/asoc-sof-nocodec-add-missing-.owner-field.patch new file mode 100644 index 00000000000..0a67f83bc4a --- /dev/null +++ b/queue-5.4/asoc-sof-nocodec-add-missing-.owner-field.patch @@ -0,0 +1,42 @@ +From 94322ba8fab691e4570fa45e2ee923fbb97965fc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 25 Jun 2020 14:12:52 -0500 +Subject: ASoC: SOF: nocodec: add missing .owner field + +From: Pierre-Louis Bossart + +[ Upstream commit 8753889e2720c1ef7ebf03370e384f5bf5ff4fab ] + +This field is required for ASoC cards. Not setting it will result in a +module->name pointer being NULL and generate problems such as + +cat /proc/asound/modules + 0 (efault) + +Fixes: 8017b8fd37bf ('ASoC: SOF: Add Nocodec machine driver support') +Reported-by: Jaroslav Kysela +Suggested-by: Takashi Iwai +Signed-off-by: Pierre-Louis Bossart +Reviewed-by: Kai Vehmanen +Link: https://lore.kernel.org/r/20200625191308.3322-2-pierre-louis.bossart@linux.intel.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/sof/nocodec.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/sound/soc/sof/nocodec.c b/sound/soc/sof/nocodec.c +index ea0fe9a09f3f5..71410116add1a 100644 +--- a/sound/soc/sof/nocodec.c ++++ b/sound/soc/sof/nocodec.c +@@ -14,6 +14,7 @@ + + static struct snd_soc_card sof_nocodec_card = { + .name = "nocodec", /* the sof- prefix is added by the core */ ++ .owner = THIS_MODULE + }; + + static int sof_nocodec_bes_setup(struct device *dev, +-- +2.25.1 + diff --git a/queue-5.4/ath10k-acquire-tx_lock-in-tx-error-paths.patch b/queue-5.4/ath10k-acquire-tx_lock-in-tx-error-paths.patch new file mode 100644 index 00000000000..e0d87e5d9ee --- /dev/null +++ b/queue-5.4/ath10k-acquire-tx_lock-in-tx-error-paths.patch @@ -0,0 +1,50 @@ +From 7eb193519e716339c404da38ce2d582b25fd83d6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 4 Jun 2020 10:59:11 -0700 +Subject: ath10k: Acquire tx_lock in tx error paths + +From: Evan Green + +[ Upstream commit a738e766e3ed92c4ee5ec967777276b5ce11dd2c ] + +ath10k_htt_tx_free_msdu_id() has a lockdep assertion that htt->tx_lock +is held. Acquire the lock in a couple of error paths when calling that +function to ensure this condition is met. + +Fixes: 6421969f248fd ("ath10k: refactor tx pending management") +Fixes: e62ee5c381c59 ("ath10k: Add support for htt_data_tx_desc_64 descriptor") +Signed-off-by: Evan Green +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/20200604105901.1.I5b8b0c7ee0d3e51a73248975a9da61401b8f3900@changeid +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/ath/ath10k/htt_tx.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c +index 735482877a1f5..c38e1963ebc05 100644 +--- a/drivers/net/wireless/ath/ath10k/htt_tx.c ++++ b/drivers/net/wireless/ath/ath10k/htt_tx.c +@@ -1540,7 +1540,9 @@ static int ath10k_htt_tx_32(struct ath10k_htt *htt, + err_unmap_msdu: + dma_unmap_single(dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE); + err_free_msdu_id: ++ spin_lock_bh(&htt->tx_lock); + ath10k_htt_tx_free_msdu_id(htt, msdu_id); ++ spin_unlock_bh(&htt->tx_lock); + err: + return res; + } +@@ -1747,7 +1749,9 @@ static int ath10k_htt_tx_64(struct ath10k_htt *htt, + err_unmap_msdu: + dma_unmap_single(dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE); + err_free_msdu_id: ++ spin_lock_bh(&htt->tx_lock); + ath10k_htt_tx_free_msdu_id(htt, msdu_id); ++ spin_unlock_bh(&htt->tx_lock); + err: + return res; + } +-- +2.25.1 + diff --git a/queue-5.4/bcache-fix-super-block-seq-numbers-comparision-in-re.patch b/queue-5.4/bcache-fix-super-block-seq-numbers-comparision-in-re.patch new file mode 100644 index 00000000000..c95f32a5b2c --- /dev/null +++ b/queue-5.4/bcache-fix-super-block-seq-numbers-comparision-in-re.patch @@ -0,0 +1,79 @@ +From e0a4813dc46011dedd09f204ba95eb526cd5dbf7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 25 Jul 2020 20:00:26 +0800 +Subject: bcache: fix super block seq numbers comparision in + register_cache_set() + +From: Coly Li + +[ Upstream commit 117f636ea695270fe492d0c0c9dfadc7a662af47 ] + +In register_cache_set(), c is pointer to struct cache_set, and ca is +pointer to struct cache, if ca->sb.seq > c->sb.seq, it means this +registering cache has up to date version and other members, the in- +memory version and other members should be updated to the newer value. + +But current implementation makes a cache set only has a single cache +device, so the above assumption works well except for a special case. +The execption is when a cache device new created and both ca->sb.seq and +c->sb.seq are 0, because the super block is never flushed out yet. In +the location for the following if() check, +2156 if (ca->sb.seq > c->sb.seq) { +2157 c->sb.version = ca->sb.version; +2158 memcpy(c->sb.set_uuid, ca->sb.set_uuid, 16); +2159 c->sb.flags = ca->sb.flags; +2160 c->sb.seq = ca->sb.seq; +2161 pr_debug("set version = %llu\n", c->sb.version); +2162 } +c->sb.version is not initialized yet and valued 0. When ca->sb.seq is 0, +the if() check will fail (because both values are 0), and the cache set +version, set_uuid, flags and seq won't be updated. + +The above problem is hiden for current code, because the bucket size is +compatible among different super block version. And the next time when +running cache set again, ca->sb.seq will be larger than 0 and cache set +super block version will be updated properly. + +But if the large bucket feature is enabled, sb->bucket_size is the low +16bits of the bucket size. For a power of 2 value, when the actual +bucket size exceeds 16bit width, sb->bucket_size will always be 0. Then +read_super_common() will fail because the if() check to +is_power_of_2(sb->bucket_size) is false. This is how the long time +hidden bug is triggered. + +This patch modifies the if() check to the following way, +2156 if (ca->sb.seq > c->sb.seq || c->sb.seq == 0) { +Then cache set's version, set_uuid, flags and seq will always be updated +corectly including for a new created cache device. + +Signed-off-by: Coly Li +Reviewed-by: Hannes Reinecke +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + drivers/md/bcache/super.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c +index 68901745eb203..168d647078591 100644 +--- a/drivers/md/bcache/super.c ++++ b/drivers/md/bcache/super.c +@@ -2091,7 +2091,14 @@ static const char *register_cache_set(struct cache *ca) + sysfs_create_link(&c->kobj, &ca->kobj, buf)) + goto err; + +- if (ca->sb.seq > c->sb.seq) { ++ /* ++ * A special case is both ca->sb.seq and c->sb.seq are 0, ++ * such condition happens on a new created cache device whose ++ * super block is never flushed yet. In this case c->sb.version ++ * and other members should be updated too, otherwise we will ++ * have a mistaken super block version in cache set. ++ */ ++ if (ca->sb.seq > c->sb.seq || c->sb.seq == 0) { + c->sb.version = ca->sb.version; + memcpy(c->sb.set_uuid, ca->sb.set_uuid, 16); + c->sb.flags = ca->sb.flags; +-- +2.25.1 + diff --git a/queue-5.4/bdc-fix-bug-causing-crash-after-multiple-disconnects.patch b/queue-5.4/bdc-fix-bug-causing-crash-after-multiple-disconnects.patch new file mode 100644 index 00000000000..752c5116903 --- /dev/null +++ b/queue-5.4/bdc-fix-bug-causing-crash-after-multiple-disconnects.patch @@ -0,0 +1,92 @@ +From 3edc331c0fd1246605c3257e1bafef30f13cfce8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 22 Jul 2020 13:07:42 -0400 +Subject: bdc: Fix bug causing crash after multiple disconnects + +From: Sasi Kumar + +[ Upstream commit a95bdfd22076497288868c028619bc5995f5cc7f ] + +Multiple connects/disconnects can cause a crash on the second +disconnect. The driver had a problem where it would try to send +endpoint commands after it was disconnected which is not allowed +by the hardware. The fix is to only allow the endpoint commands +when the endpoint is connected. This will also fix issues that +showed up when using configfs to create gadgets. + +Signed-off-by: Sasi Kumar +Signed-off-by: Al Cooper +Acked-by: Florian Fainelli +Signed-off-by: Felipe Balbi +Signed-off-by: Sasha Levin +--- + drivers/usb/gadget/udc/bdc/bdc_core.c | 4 ++++ + drivers/usb/gadget/udc/bdc/bdc_ep.c | 16 ++++++++++------ + 2 files changed, 14 insertions(+), 6 deletions(-) + +diff --git a/drivers/usb/gadget/udc/bdc/bdc_core.c b/drivers/usb/gadget/udc/bdc/bdc_core.c +index cc4a16e253ac5..174555e94a6c0 100644 +--- a/drivers/usb/gadget/udc/bdc/bdc_core.c ++++ b/drivers/usb/gadget/udc/bdc/bdc_core.c +@@ -282,6 +282,7 @@ static void bdc_mem_init(struct bdc *bdc, bool reinit) + * in that case reinit is passed as 1 + */ + if (reinit) { ++ int i; + /* Enable interrupts */ + temp = bdc_readl(bdc->regs, BDC_BDCSC); + temp |= BDC_GIE; +@@ -291,6 +292,9 @@ static void bdc_mem_init(struct bdc *bdc, bool reinit) + /* Initialize SRR to 0 */ + memset(bdc->srr.sr_bds, 0, + NUM_SR_ENTRIES * sizeof(struct bdc_bd)); ++ /* clear ep flags to avoid post disconnect stops/deconfigs */ ++ for (i = 1; i < bdc->num_eps; ++i) ++ bdc->bdc_ep_array[i]->flags = 0; + } else { + /* One time initiaization only */ + /* Enable status report function pointers */ +diff --git a/drivers/usb/gadget/udc/bdc/bdc_ep.c b/drivers/usb/gadget/udc/bdc/bdc_ep.c +index d49c6dc1082dc..9ddc0b4e92c9c 100644 +--- a/drivers/usb/gadget/udc/bdc/bdc_ep.c ++++ b/drivers/usb/gadget/udc/bdc/bdc_ep.c +@@ -615,7 +615,6 @@ int bdc_ep_enable(struct bdc_ep *ep) + } + bdc_dbg_bd_list(bdc, ep); + /* only for ep0: config ep is called for ep0 from connect event */ +- ep->flags |= BDC_EP_ENABLED; + if (ep->ep_num == 1) + return ret; + +@@ -759,10 +758,13 @@ static int ep_dequeue(struct bdc_ep *ep, struct bdc_req *req) + __func__, ep->name, start_bdi, end_bdi); + dev_dbg(bdc->dev, "ep_dequeue ep=%p ep->desc=%p\n", + ep, (void *)ep->usb_ep.desc); +- /* Stop the ep to see where the HW is ? */ +- ret = bdc_stop_ep(bdc, ep->ep_num); +- /* if there is an issue with stopping ep, then no need to go further */ +- if (ret) ++ /* if still connected, stop the ep to see where the HW is ? */ ++ if (!(bdc_readl(bdc->regs, BDC_USPC) & BDC_PST_MASK)) { ++ ret = bdc_stop_ep(bdc, ep->ep_num); ++ /* if there is an issue, then no need to go further */ ++ if (ret) ++ return 0; ++ } else + return 0; + + /* +@@ -1911,7 +1913,9 @@ static int bdc_gadget_ep_disable(struct usb_ep *_ep) + __func__, ep->name, ep->flags); + + if (!(ep->flags & BDC_EP_ENABLED)) { +- dev_warn(bdc->dev, "%s is already disabled\n", ep->name); ++ if (bdc->gadget.speed != USB_SPEED_UNKNOWN) ++ dev_warn(bdc->dev, "%s is already disabled\n", ++ ep->name); + return 0; + } + spin_lock_irqsave(&bdc->lock, flags); +-- +2.25.1 + diff --git a/queue-5.4/blktrace-fix-debugfs-use-after-free.patch b/queue-5.4/blktrace-fix-debugfs-use-after-free.patch new file mode 100644 index 00000000000..d56c3cce8f5 --- /dev/null +++ b/queue-5.4/blktrace-fix-debugfs-use-after-free.patch @@ -0,0 +1,218 @@ +From 142bd0b0f9921cd8ed39150e9188c07926f761ce Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 19 Jun 2020 20:47:28 +0000 +Subject: blktrace: fix debugfs use after free + +From: Luis Chamberlain + +[ Upstream commit bad8e64fb19d3a0de5e564d9a7271c31bd684369 ] + +On commit 6ac93117ab00 ("blktrace: use existing disk debugfs directory") +merged on v4.12 Omar fixed the original blktrace code for request-based +drivers (multiqueue). This however left in place a possible crash, if you +happen to abuse blktrace while racing to remove / add a device. + +We used to use asynchronous removal of the request_queue, and with that +the issue was easier to reproduce. Now that we have reverted to +synchronous removal of the request_queue, the issue is still possible to +reproduce, its however just a bit more difficult. + +We essentially run two instances of break-blktrace which add/remove +a loop device, and setup a blktrace and just never tear the blktrace +down. We do this twice in parallel. This is easily reproduced with the +script run_0004.sh from break-blktrace [0]. + +We can end up with two types of panics each reflecting where we +race, one a failed blktrace setup: + +[ 252.426751] debugfs: Directory 'loop0' with parent 'block' already present! +[ 252.432265] BUG: kernel NULL pointer dereference, address: 00000000000000a0 +[ 252.436592] #PF: supervisor write access in kernel mode +[ 252.439822] #PF: error_code(0x0002) - not-present page +[ 252.442967] PGD 0 P4D 0 +[ 252.444656] Oops: 0002 [#1] SMP NOPTI +[ 252.446972] CPU: 10 PID: 1153 Comm: break-blktrace Tainted: G E 5.7.0-rc2-next-20200420+ #164 +[ 252.452673] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.13.0-1 04/01/2014 +[ 252.456343] RIP: 0010:down_write+0x15/0x40 +[ 252.458146] Code: eb ca e8 ae 22 8d ff cc cc cc cc cc cc cc cc cc cc cc cc + cc cc 0f 1f 44 00 00 55 48 89 fd e8 52 db ff ff 31 c0 ba 01 00 + 00 00 48 0f b1 55 00 75 0f 48 8b 04 25 c0 8b 01 00 48 89 + 45 08 5d +[ 252.463638] RSP: 0018:ffffa626415abcc8 EFLAGS: 00010246 +[ 252.464950] RAX: 0000000000000000 RBX: ffff958c25f0f5c0 RCX: ffffff8100000000 +[ 252.466727] RDX: 0000000000000001 RSI: ffffff8100000000 RDI: 00000000000000a0 +[ 252.468482] RBP: 00000000000000a0 R08: 0000000000000000 R09: 0000000000000001 +[ 252.470014] R10: 0000000000000000 R11: ffff958d1f9227ff R12: 0000000000000000 +[ 252.471473] R13: ffff958c25ea5380 R14: ffffffff8cce15f1 R15: 00000000000000a0 +[ 252.473346] FS: 00007f2e69dee540(0000) GS:ffff958c2fc80000(0000) knlGS:0000000000000000 +[ 252.475225] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +[ 252.476267] CR2: 00000000000000a0 CR3: 0000000427d10004 CR4: 0000000000360ee0 +[ 252.477526] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 +[ 252.478776] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 +[ 252.479866] Call Trace: +[ 252.480322] simple_recursive_removal+0x4e/0x2e0 +[ 252.481078] ? debugfs_remove+0x60/0x60 +[ 252.481725] ? relay_destroy_buf+0x77/0xb0 +[ 252.482662] debugfs_remove+0x40/0x60 +[ 252.483518] blk_remove_buf_file_callback+0x5/0x10 +[ 252.484328] relay_close_buf+0x2e/0x60 +[ 252.484930] relay_open+0x1ce/0x2c0 +[ 252.485520] do_blk_trace_setup+0x14f/0x2b0 +[ 252.486187] __blk_trace_setup+0x54/0xb0 +[ 252.486803] blk_trace_ioctl+0x90/0x140 +[ 252.487423] ? do_sys_openat2+0x1ab/0x2d0 +[ 252.488053] blkdev_ioctl+0x4d/0x260 +[ 252.488636] block_ioctl+0x39/0x40 +[ 252.489139] ksys_ioctl+0x87/0xc0 +[ 252.489675] __x64_sys_ioctl+0x16/0x20 +[ 252.490380] do_syscall_64+0x52/0x180 +[ 252.491032] entry_SYSCALL_64_after_hwframe+0x44/0xa9 + +And the other on the device removal: + +[ 128.528940] debugfs: Directory 'loop0' with parent 'block' already present! +[ 128.615325] BUG: kernel NULL pointer dereference, address: 00000000000000a0 +[ 128.619537] #PF: supervisor write access in kernel mode +[ 128.622700] #PF: error_code(0x0002) - not-present page +[ 128.625842] PGD 0 P4D 0 +[ 128.627585] Oops: 0002 [#1] SMP NOPTI +[ 128.629871] CPU: 12 PID: 544 Comm: break-blktrace Tainted: G E 5.7.0-rc2-next-20200420+ #164 +[ 128.635595] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.13.0-1 04/01/2014 +[ 128.640471] RIP: 0010:down_write+0x15/0x40 +[ 128.643041] Code: eb ca e8 ae 22 8d ff cc cc cc cc cc cc cc cc cc cc cc cc + cc cc 0f 1f 44 00 00 55 48 89 fd e8 52 db ff ff 31 c0 ba 01 00 + 00 00 48 0f b1 55 00 75 0f 65 48 8b 04 25 c0 8b 01 00 48 89 + 45 08 5d +[ 128.650180] RSP: 0018:ffffa9c3c05ebd78 EFLAGS: 00010246 +[ 128.651820] RAX: 0000000000000000 RBX: ffff8ae9a6370240 RCX: ffffff8100000000 +[ 128.653942] RDX: 0000000000000001 RSI: ffffff8100000000 RDI: 00000000000000a0 +[ 128.655720] RBP: 00000000000000a0 R08: 0000000000000002 R09: ffff8ae9afd2d3d0 +[ 128.657400] R10: 0000000000000056 R11: 0000000000000000 R12: 0000000000000000 +[ 128.659099] R13: 0000000000000000 R14: 0000000000000003 R15: 00000000000000a0 +[ 128.660500] FS: 00007febfd995540(0000) GS:ffff8ae9afd00000(0000) knlGS:0000000000000000 +[ 128.662204] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +[ 128.663426] CR2: 00000000000000a0 CR3: 0000000420042003 CR4: 0000000000360ee0 +[ 128.664776] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 +[ 128.666022] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 +[ 128.667282] Call Trace: +[ 128.667801] simple_recursive_removal+0x4e/0x2e0 +[ 128.668663] ? debugfs_remove+0x60/0x60 +[ 128.669368] debugfs_remove+0x40/0x60 +[ 128.669985] blk_trace_free+0xd/0x50 +[ 128.670593] __blk_trace_remove+0x27/0x40 +[ 128.671274] blk_trace_shutdown+0x30/0x40 +[ 128.671935] blk_release_queue+0x95/0xf0 +[ 128.672589] kobject_put+0xa5/0x1b0 +[ 128.673188] disk_release+0xa2/0xc0 +[ 128.673786] device_release+0x28/0x80 +[ 128.674376] kobject_put+0xa5/0x1b0 +[ 128.674915] loop_remove+0x39/0x50 [loop] +[ 128.675511] loop_control_ioctl+0x113/0x130 [loop] +[ 128.676199] ksys_ioctl+0x87/0xc0 +[ 128.676708] __x64_sys_ioctl+0x16/0x20 +[ 128.677274] do_syscall_64+0x52/0x180 +[ 128.677823] entry_SYSCALL_64_after_hwframe+0x44/0xa9 + +The common theme here is: + +debugfs: Directory 'loop0' with parent 'block' already present + +This crash happens because of how blktrace uses the debugfs directory +where it places its files. Upon init we always create the same directory +which would be needed by blktrace but we only do this for make_request +drivers (multiqueue) block drivers. When you race a removal of these +devices with a blktrace setup you end up in a situation where the +make_request recursive debugfs removal will sweep away the blktrace +files and then later blktrace will also try to remove individual +dentries which are already NULL. The inverse is also possible and hence +the two types of use after frees. + +We don't create the block debugfs directory on init for these types of +block devices: + + * request-based block driver block devices + * every possible partition + * scsi-generic + +And so, this race should in theory only be possible with make_request +drivers. + +We can fix the UAF by simply re-using the debugfs directory for +make_request drivers (multiqueue) and only creating the ephemeral +directory for the other type of block devices. The new clarifications +on relying on the q->blk_trace_mutex *and* also checking for q->blk_trace +*prior* to processing a blktrace ensures the debugfs directories are +only created if no possible directory name clashes are possible. + +This goes tested with: + + o nvme partitions + o ISCSI with tgt, and blktracing against scsi-generic with: + o block + o tape + o cdrom + o media changer + o blktests + +This patch is part of the work which disputes the severity of +CVE-2019-19770 which shows this issue is not a core debugfs issue, but +a misuse of debugfs within blktace. + +Fixes: 6ac93117ab00 ("blktrace: use existing disk debugfs directory") +Reported-by: syzbot+603294af2d01acfdd6da@syzkaller.appspotmail.com +Signed-off-by: Luis Chamberlain +Reviewed-by: Christoph Hellwig +Cc: Bart Van Assche +Cc: Omar Sandoval +Cc: Hannes Reinecke +Cc: Nicolai Stange +Cc: Greg Kroah-Hartman +Cc: Michal Hocko +Cc: "Martin K. Petersen" +Cc: "James E.J. Bottomley" +Cc: yu kuai +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + kernel/trace/blktrace.c | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) + +diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c +index eaee960153e1e..a4c8f9d9522e4 100644 +--- a/kernel/trace/blktrace.c ++++ b/kernel/trace/blktrace.c +@@ -521,10 +521,18 @@ static int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev, + if (!bt->msg_data) + goto err; + +- ret = -ENOENT; +- +- dir = debugfs_lookup(buts->name, blk_debugfs_root); +- if (!dir) ++#ifdef CONFIG_BLK_DEBUG_FS ++ /* ++ * When tracing whole make_request drivers (multiqueue) block devices, ++ * reuse the existing debugfs directory created by the block layer on ++ * init. For request-based block devices, all partitions block devices, ++ * and scsi-generic block devices we create a temporary new debugfs ++ * directory that will be removed once the trace ends. ++ */ ++ if (queue_is_mq(q) && bdev && bdev == bdev->bd_contains) ++ dir = q->debugfs_dir; ++ else ++#endif + bt->dir = dir = debugfs_create_dir(buts->name, blk_debugfs_root); + + bt->dev = dev; +@@ -565,8 +573,6 @@ static int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev, + + ret = 0; + err: +- if (dir && !bt->dir) +- dput(dir); + if (ret) + blk_trace_free(bt); + return ret; +-- +2.25.1 + diff --git a/queue-5.4/bluetooth-add-a-mutex-lock-to-avoid-uaf-in-do_enale_.patch b/queue-5.4/bluetooth-add-a-mutex-lock-to-avoid-uaf-in-do_enale_.patch new file mode 100644 index 00000000000..811f5e294f7 --- /dev/null +++ b/queue-5.4/bluetooth-add-a-mutex-lock-to-avoid-uaf-in-do_enale_.patch @@ -0,0 +1,142 @@ +From 6d0f90f0390e2e1e33995ce34890b153bd53daf6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 23 Jun 2020 20:28:41 +0800 +Subject: Bluetooth: add a mutex lock to avoid UAF in do_enale_set + +From: Lihong Kou + +[ Upstream commit f9c70bdc279b191da8d60777c627702c06e4a37d ] + +In the case we set or free the global value listen_chan in +different threads, we can encounter the UAF problems because +the method is not protected by any lock, add one to avoid +this bug. + +BUG: KASAN: use-after-free in l2cap_chan_close+0x48/0x990 +net/bluetooth/l2cap_core.c:730 +Read of size 8 at addr ffff888096950000 by task kworker/1:102/2868 + +CPU: 1 PID: 2868 Comm: kworker/1:102 Not tainted 5.5.0-syzkaller #0 +Hardware name: Google Google Compute Engine/Google Compute Engine, +BIOS Google 01/01/2011 +Workqueue: events do_enable_set +Call Trace: + __dump_stack lib/dump_stack.c:77 [inline] + dump_stack+0x1fb/0x318 lib/dump_stack.c:118 + print_address_description+0x74/0x5c0 mm/kasan/report.c:374 + __kasan_report+0x149/0x1c0 mm/kasan/report.c:506 + kasan_report+0x26/0x50 mm/kasan/common.c:641 + __asan_report_load8_noabort+0x14/0x20 mm/kasan/generic_report.c:135 + l2cap_chan_close+0x48/0x990 net/bluetooth/l2cap_core.c:730 + do_enable_set+0x660/0x900 net/bluetooth/6lowpan.c:1074 + process_one_work+0x7f5/0x10f0 kernel/workqueue.c:2264 + worker_thread+0xbbc/0x1630 kernel/workqueue.c:2410 + kthread+0x332/0x350 kernel/kthread.c:255 + ret_from_fork+0x24/0x30 arch/x86/entry/entry_64.S:352 + +Allocated by task 2870: + save_stack mm/kasan/common.c:72 [inline] + set_track mm/kasan/common.c:80 [inline] + __kasan_kmalloc+0x118/0x1c0 mm/kasan/common.c:515 + kasan_kmalloc+0x9/0x10 mm/kasan/common.c:529 + kmem_cache_alloc_trace+0x221/0x2f0 mm/slab.c:3551 + kmalloc include/linux/slab.h:555 [inline] + kzalloc include/linux/slab.h:669 [inline] + l2cap_chan_create+0x50/0x320 net/bluetooth/l2cap_core.c:446 + chan_create net/bluetooth/6lowpan.c:640 [inline] + bt_6lowpan_listen net/bluetooth/6lowpan.c:959 [inline] + do_enable_set+0x6a4/0x900 net/bluetooth/6lowpan.c:1078 + process_one_work+0x7f5/0x10f0 kernel/workqueue.c:2264 + worker_thread+0xbbc/0x1630 kernel/workqueue.c:2410 + kthread+0x332/0x350 kernel/kthread.c:255 + ret_from_fork+0x24/0x30 arch/x86/entry/entry_64.S:352 + +Freed by task 2870: + save_stack mm/kasan/common.c:72 [inline] + set_track mm/kasan/common.c:80 [inline] + kasan_set_free_info mm/kasan/common.c:337 [inline] + __kasan_slab_free+0x12e/0x1e0 mm/kasan/common.c:476 + kasan_slab_free+0xe/0x10 mm/kasan/common.c:485 + __cache_free mm/slab.c:3426 [inline] + kfree+0x10d/0x220 mm/slab.c:3757 + l2cap_chan_destroy net/bluetooth/l2cap_core.c:484 [inline] + kref_put include/linux/kref.h:65 [inline] + l2cap_chan_put+0x170/0x190 net/bluetooth/l2cap_core.c:498 + do_enable_set+0x66c/0x900 net/bluetooth/6lowpan.c:1075 + process_one_work+0x7f5/0x10f0 kernel/workqueue.c:2264 + worker_thread+0xbbc/0x1630 kernel/workqueue.c:2410 + kthread+0x332/0x350 kernel/kthread.c:255 + ret_from_fork+0x24/0x30 arch/x86/entry/entry_64.S:352 + +The buggy address belongs to the object at ffff888096950000 + which belongs to the cache kmalloc-2k of size 2048 +The buggy address is located 0 bytes inside of + 2048-byte region [ffff888096950000, ffff888096950800) +The buggy address belongs to the page: +page:ffffea00025a5400 refcount:1 mapcount:0 mapping:ffff8880aa400e00 index:0x0 +flags: 0xfffe0000000200(slab) +raw: 00fffe0000000200 ffffea00027d1548 ffffea0002397808 ffff8880aa400e00 +raw: 0000000000000000 ffff888096950000 0000000100000001 0000000000000000 +page dumped because: kasan: bad access detected + +Memory state around the buggy address: + ffff88809694ff00: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + ffff88809694ff80: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +>ffff888096950000: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb + ^ + ffff888096950080: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb + ffff888096950100: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb +================================================================== + +Reported-by: syzbot+96414aa0033c363d8458@syzkaller.appspotmail.com +Signed-off-by: Lihong Kou +Signed-off-by: Marcel Holtmann +Signed-off-by: Sasha Levin +--- + net/bluetooth/6lowpan.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c +index 4febc82a7c761..52fb6d6d6d585 100644 +--- a/net/bluetooth/6lowpan.c ++++ b/net/bluetooth/6lowpan.c +@@ -50,6 +50,7 @@ static bool enable_6lowpan; + /* We are listening incoming connections via this channel + */ + static struct l2cap_chan *listen_chan; ++static DEFINE_MUTEX(set_lock); + + struct lowpan_peer { + struct list_head list; +@@ -1070,12 +1071,14 @@ static void do_enable_set(struct work_struct *work) + + enable_6lowpan = set_enable->flag; + ++ mutex_lock(&set_lock); + if (listen_chan) { + l2cap_chan_close(listen_chan, 0); + l2cap_chan_put(listen_chan); + } + + listen_chan = bt_6lowpan_listen(); ++ mutex_unlock(&set_lock); + + kfree(set_enable); + } +@@ -1127,11 +1130,13 @@ static ssize_t lowpan_control_write(struct file *fp, + if (ret == -EINVAL) + return ret; + ++ mutex_lock(&set_lock); + if (listen_chan) { + l2cap_chan_close(listen_chan, 0); + l2cap_chan_put(listen_chan); + listen_chan = NULL; + } ++ mutex_unlock(&set_lock); + + if (conn) { + struct lowpan_peer *peer; +-- +2.25.1 + diff --git a/queue-5.4/bluetooth-btmtksdio-fix-up-firmware-download-sequenc.patch b/queue-5.4/bluetooth-btmtksdio-fix-up-firmware-download-sequenc.patch new file mode 100644 index 00000000000..28e5b006531 --- /dev/null +++ b/queue-5.4/bluetooth-btmtksdio-fix-up-firmware-download-sequenc.patch @@ -0,0 +1,59 @@ +From be28aed1acda768ce0a55d389990acbccc77be3c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 19 Jun 2020 19:52:02 +0000 +Subject: Bluetooth: btmtksdio: fix up firmware download sequence + +From: Sean Wang + +[ Upstream commit 737cd06072a72e8984e41af8e5919338d0c5bf2b ] + +Data RAM on the device have to be powered on before starting to download +the firmware. + +Fixes: 9aebfd4a2200 ("Bluetooth: mediatek: add support for MediaTek MT7663S and MT7668S SDIO devices") +Co-developed-by: Mark Chen +Signed-off-by: Mark Chen +Signed-off-by: Sean Wang +Signed-off-by: Marcel Holtmann +Signed-off-by: Sasha Levin +--- + drivers/bluetooth/btmtksdio.c | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) + +diff --git a/drivers/bluetooth/btmtksdio.c b/drivers/bluetooth/btmtksdio.c +index 8133382884537..b7de7cb8cca90 100644 +--- a/drivers/bluetooth/btmtksdio.c ++++ b/drivers/bluetooth/btmtksdio.c +@@ -684,7 +684,7 @@ static int mtk_setup_firmware(struct hci_dev *hdev, const char *fwname) + const u8 *fw_ptr; + size_t fw_size; + int err, dlen; +- u8 flag; ++ u8 flag, param; + + err = request_firmware(&fw, fwname, &hdev->dev); + if (err < 0) { +@@ -692,6 +692,20 @@ static int mtk_setup_firmware(struct hci_dev *hdev, const char *fwname) + return err; + } + ++ /* Power on data RAM the firmware relies on. */ ++ param = 1; ++ wmt_params.op = MTK_WMT_FUNC_CTRL; ++ wmt_params.flag = 3; ++ wmt_params.dlen = sizeof(param); ++ wmt_params.data = ¶m; ++ wmt_params.status = NULL; ++ ++ err = mtk_hci_wmt_sync(hdev, &wmt_params); ++ if (err < 0) { ++ bt_dev_err(hdev, "Failed to power on data RAM (%d)", err); ++ return err; ++ } ++ + fw_ptr = fw->data; + fw_size = fw->size; + +-- +2.25.1 + diff --git a/queue-5.4/bluetooth-btusb-fix-up-firmware-download-sequence.patch b/queue-5.4/bluetooth-btusb-fix-up-firmware-download-sequence.patch new file mode 100644 index 00000000000..da2929388f1 --- /dev/null +++ b/queue-5.4/bluetooth-btusb-fix-up-firmware-download-sequence.patch @@ -0,0 +1,59 @@ +From ed43d021f6ae933a0d668e62f9485f459ad7a8c2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 19 Jun 2020 19:52:01 +0000 +Subject: Bluetooth: btusb: fix up firmware download sequence + +From: Sean Wang + +[ Upstream commit f645125711c80f9651e4a57403d799070c6ad13b ] + +Data RAM on the device have to be powered on before starting to download +the firmware. + +Fixes: a1c49c434e15 ("Bluetooth: btusb: Add protocol support for MediaTek MT7668U USB devices") +Co-developed-by: Mark Chen +Signed-off-by: Mark Chen +Signed-off-by: Sean Wang +Signed-off-by: Marcel Holtmann +Signed-off-by: Sasha Levin +--- + drivers/bluetooth/btusb.c | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) + +diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c +index 9c3b063e1a1f7..f3f0529564da0 100644 +--- a/drivers/bluetooth/btusb.c ++++ b/drivers/bluetooth/btusb.c +@@ -2792,7 +2792,7 @@ static int btusb_mtk_setup_firmware(struct hci_dev *hdev, const char *fwname) + const u8 *fw_ptr; + size_t fw_size; + int err, dlen; +- u8 flag; ++ u8 flag, param; + + err = request_firmware(&fw, fwname, &hdev->dev); + if (err < 0) { +@@ -2800,6 +2800,20 @@ static int btusb_mtk_setup_firmware(struct hci_dev *hdev, const char *fwname) + return err; + } + ++ /* Power on data RAM the firmware relies on. */ ++ param = 1; ++ wmt_params.op = BTMTK_WMT_FUNC_CTRL; ++ wmt_params.flag = 3; ++ wmt_params.dlen = sizeof(param); ++ wmt_params.data = ¶m; ++ wmt_params.status = NULL; ++ ++ err = btusb_mtk_hci_wmt_sync(hdev, &wmt_params); ++ if (err < 0) { ++ bt_dev_err(hdev, "Failed to power on data RAM (%d)", err); ++ return err; ++ } ++ + fw_ptr = fw->data; + fw_size = fw->size; + +-- +2.25.1 + diff --git a/queue-5.4/bluetooth-hci_h5-set-hci_uart_reset_on_init-to-corre.patch b/queue-5.4/bluetooth-hci_h5-set-hci_uart_reset_on_init-to-corre.patch new file mode 100644 index 00000000000..f9019a186fd --- /dev/null +++ b/queue-5.4/bluetooth-hci_h5-set-hci_uart_reset_on_init-to-corre.patch @@ -0,0 +1,36 @@ +From 691c35230d36bffb9e74cf41b2d426ad66c42f84 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 21 Jul 2020 10:37:15 +0800 +Subject: Bluetooth: hci_h5: Set HCI_UART_RESET_ON_INIT to correct flags + +From: Nicolas Boichat + +[ Upstream commit a7ad4b6119d740b1ec5788f1b98be0fd1c1b5a5a ] + +HCI_UART_RESET_ON_INIT belongs in hdev_flags, not flags. + +Fixes: ce945552fde4a09 ("Bluetooth: hci_h5: Add support for serdev enumerated devices") +Signed-off-by: Nicolas Boichat +Reviewed-by: Hans de Goede +Signed-off-by: Marcel Holtmann +Signed-off-by: Sasha Levin +--- + drivers/bluetooth/hci_h5.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c +index dacf297baf595..5df0651b6cd55 100644 +--- a/drivers/bluetooth/hci_h5.c ++++ b/drivers/bluetooth/hci_h5.c +@@ -790,7 +790,7 @@ static int h5_serdev_probe(struct serdev_device *serdev) + if (!h5) + return -ENOMEM; + +- set_bit(HCI_UART_RESET_ON_INIT, &h5->serdev_hu.flags); ++ set_bit(HCI_UART_RESET_ON_INIT, &h5->serdev_hu.hdev_flags); + + h5->hu = &h5->serdev_hu; + h5->serdev_hu.serdev = serdev; +-- +2.25.1 + diff --git a/queue-5.4/bluetooth-hci_serdev-only-unregister-device-if-it-wa.patch b/queue-5.4/bluetooth-hci_serdev-only-unregister-device-if-it-wa.patch new file mode 100644 index 00000000000..1254169fcea --- /dev/null +++ b/queue-5.4/bluetooth-hci_serdev-only-unregister-device-if-it-wa.patch @@ -0,0 +1,37 @@ +From 9b9c032b4c31dc204933bcb7ca468685e5f99947 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 21 Jul 2020 10:37:16 +0800 +Subject: Bluetooth: hci_serdev: Only unregister device if it was registered + +From: Nicolas Boichat + +[ Upstream commit 202798db9570104728dce8bb57dfeed47ce764bc ] + +We should not call hci_unregister_dev if the device was not +successfully registered. + +Fixes: c34dc3bfa7642fd ("Bluetooth: hci_serdev: Introduce hci_uart_unregister_device()") +Signed-off-by: Nicolas Boichat +Signed-off-by: Marcel Holtmann +Signed-off-by: Sasha Levin +--- + drivers/bluetooth/hci_serdev.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/bluetooth/hci_serdev.c b/drivers/bluetooth/hci_serdev.c +index 4652896d49908..ad2f26cb2622e 100644 +--- a/drivers/bluetooth/hci_serdev.c ++++ b/drivers/bluetooth/hci_serdev.c +@@ -357,7 +357,8 @@ void hci_uart_unregister_device(struct hci_uart *hu) + struct hci_dev *hdev = hu->hdev; + + clear_bit(HCI_UART_PROTO_READY, &hu->flags); +- hci_unregister_dev(hdev); ++ if (test_bit(HCI_UART_REGISTERED, &hu->flags)) ++ hci_unregister_dev(hdev); + hci_free_dev(hdev); + + cancel_work_sync(&hu->write_work); +-- +2.25.1 + diff --git a/queue-5.4/bpf-fix-fds_example-sigsegv-error.patch b/queue-5.4/bpf-fix-fds_example-sigsegv-error.patch new file mode 100644 index 00000000000..6ef1b2ffe9a --- /dev/null +++ b/queue-5.4/bpf-fix-fds_example-sigsegv-error.patch @@ -0,0 +1,45 @@ +From 6b4dc781d66784592ebdc0d2c81e2d64a9d5dd95 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 10 Jul 2020 05:20:35 -0400 +Subject: bpf: Fix fds_example SIGSEGV error + +From: Wenbo Zhang + +[ Upstream commit eef8a42d6ce087d1c81c960ae0d14f955b742feb ] + +The `BPF_LOG_BUF_SIZE`'s value is `UINT32_MAX >> 8`, so define an array +with it on stack caused an overflow. + +Signed-off-by: Wenbo Zhang +Signed-off-by: Daniel Borkmann +Acked-by: Andrii Nakryiko +Link: https://lore.kernel.org/bpf/20200710092035.28919-1-ethercflow@gmail.com +Signed-off-by: Sasha Levin +--- + samples/bpf/fds_example.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/samples/bpf/fds_example.c b/samples/bpf/fds_example.c +index 2d4b717726b64..34b3fca788e8d 100644 +--- a/samples/bpf/fds_example.c ++++ b/samples/bpf/fds_example.c +@@ -30,6 +30,8 @@ + #define BPF_M_MAP 1 + #define BPF_M_PROG 2 + ++char bpf_log_buf[BPF_LOG_BUF_SIZE]; ++ + static void usage(void) + { + printf("Usage: fds_example [...]\n"); +@@ -57,7 +59,6 @@ static int bpf_prog_create(const char *object) + BPF_EXIT_INSN(), + }; + size_t insns_cnt = sizeof(insns) / sizeof(struct bpf_insn); +- char bpf_log_buf[BPF_LOG_BUF_SIZE]; + struct bpf_object *obj; + int prog_fd; + +-- +2.25.1 + diff --git a/queue-5.4/brcmfmac-keep-sdio-watchdog-running-when-console_int.patch b/queue-5.4/brcmfmac-keep-sdio-watchdog-running-when-console_int.patch new file mode 100644 index 00000000000..3fd7d9ac7ca --- /dev/null +++ b/queue-5.4/brcmfmac-keep-sdio-watchdog-running-when-console_int.patch @@ -0,0 +1,45 @@ +From 00eddd43261e504180778fdc8fcfba466db5db41 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 4 Jun 2020 02:18:33 -0500 +Subject: brcmfmac: keep SDIO watchdog running when console_interval is + non-zero + +From: Wright Feng + +[ Upstream commit eccbf46b15bb3e35d004148f7c3a8fa8e9b26c1e ] + +brcmfmac host driver makes SDIO bus sleep and stops SDIO watchdog if no +pending event or data. As a result, host driver does not poll firmware +console buffer before buffer overflow, which leads to missing firmware +logs. We should not stop SDIO watchdog if console_interval is non-zero +in debug build. + +Signed-off-by: Wright Feng +Signed-off-by: Chi-hsien Lin +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/20200604071835.3842-4-wright.feng@cypress.com +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +index d43247a95ce53..38e6809f16c75 100644 +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +@@ -3685,7 +3685,11 @@ static void brcmf_sdio_bus_watchdog(struct brcmf_sdio *bus) + if (bus->idlecount > bus->idletime) { + brcmf_dbg(SDIO, "idle\n"); + sdio_claim_host(bus->sdiodev->func1); +- brcmf_sdio_wd_timer(bus, false); ++#ifdef DEBUG ++ if (!BRCMF_FWCON_ON() || ++ bus->console_interval == 0) ++#endif ++ brcmf_sdio_wd_timer(bus, false); + bus->idlecount = 0; + brcmf_sdio_bus_sleep(bus, true, false); + sdio_release_host(bus->sdiodev->func1); +-- +2.25.1 + diff --git a/queue-5.4/brcmfmac-set-state-of-hanger-slot-to-free-when-flush.patch b/queue-5.4/brcmfmac-set-state-of-hanger-slot-to-free-when-flush.patch new file mode 100644 index 00000000000..ee7d37ca961 --- /dev/null +++ b/queue-5.4/brcmfmac-set-state-of-hanger-slot-to-free-when-flush.patch @@ -0,0 +1,80 @@ +From bcc9683a468e8891d380e5dc6443539252f477e6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 24 Jun 2020 04:16:07 -0500 +Subject: brcmfmac: set state of hanger slot to FREE when flushing PSQ + +From: Wright Feng + +[ Upstream commit fcdd7a875def793c38d7369633af3eba6c7cf089 ] + +When USB or SDIO device got abnormal bus disconnection, host driver +tried to clean up the skbs in PSQ and TXQ (The skb's pointer in hanger +slot linked to PSQ and TSQ), so we should set the state of skb hanger slot +to BRCMF_FWS_HANGER_ITEM_STATE_FREE before freeing skb. +In brcmf_fws_bus_txq_cleanup it already sets +BRCMF_FWS_HANGER_ITEM_STATE_FREE before freeing skb, therefore we add the +same thing in brcmf_fws_psq_flush to avoid following warning message. + + [ 1580.012880] ------------ [ cut here ]------------ + [ 1580.017550] WARNING: CPU: 3 PID: 3065 at +drivers/net/wireless/broadcom/brcm80211/brcmutil/utils.c:49 +brcmu_pkt_buf_free_skb+0x21/0x30 [brcmutil] + [ 1580.184017] Call Trace: + [ 1580.186514] brcmf_fws_cleanup+0x14e/0x190 [brcmfmac] + [ 1580.191594] brcmf_fws_del_interface+0x70/0x90 [brcmfmac] + [ 1580.197029] brcmf_proto_bcdc_del_if+0xe/0x10 [brcmfmac] + [ 1580.202418] brcmf_remove_interface+0x69/0x190 [brcmfmac] + [ 1580.207888] brcmf_detach+0x90/0xe0 [brcmfmac] + [ 1580.212385] brcmf_usb_disconnect+0x76/0xb0 [brcmfmac] + [ 1580.217557] usb_unbind_interface+0x72/0x260 + [ 1580.221857] device_release_driver_internal+0x141/0x200 + [ 1580.227152] device_release_driver+0x12/0x20 + [ 1580.231460] bus_remove_device+0xfd/0x170 + [ 1580.235504] device_del+0x1d9/0x300 + [ 1580.239041] usb_disable_device+0x9e/0x270 + [ 1580.243160] usb_disconnect+0x94/0x270 + [ 1580.246980] hub_event+0x76d/0x13b0 + [ 1580.250499] process_one_work+0x144/0x360 + [ 1580.254564] worker_thread+0x4d/0x3c0 + [ 1580.258247] kthread+0x109/0x140 + [ 1580.261515] ? rescuer_thread+0x340/0x340 + [ 1580.265543] ? kthread_park+0x60/0x60 + [ 1580.269237] ? SyS_exit_group+0x14/0x20 + [ 1580.273118] ret_from_fork+0x25/0x30 + [ 1580.300446] ------------ [ cut here ]------------ + +Acked-by: Arend van Spriel +Signed-off-by: Wright Feng +Signed-off-by: Chi-hsien Lin +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/20200624091608.25154-2-wright.feng@cypress.com +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c +index 2bd892df83cc5..eadc64454839d 100644 +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c +@@ -643,6 +643,7 @@ static inline int brcmf_fws_hanger_poppkt(struct brcmf_fws_hanger *h, + static void brcmf_fws_psq_flush(struct brcmf_fws_info *fws, struct pktq *q, + int ifidx) + { ++ struct brcmf_fws_hanger_item *hi; + bool (*matchfn)(struct sk_buff *, void *) = NULL; + struct sk_buff *skb; + int prec; +@@ -654,6 +655,9 @@ static void brcmf_fws_psq_flush(struct brcmf_fws_info *fws, struct pktq *q, + skb = brcmu_pktq_pdeq_match(q, prec, matchfn, &ifidx); + while (skb) { + hslot = brcmf_skb_htod_tag_get_field(skb, HSLOT); ++ hi = &fws->hanger.items[hslot]; ++ WARN_ON(skb != hi->pkt); ++ hi->state = BRCMF_FWS_HANGER_ITEM_STATE_FREE; + brcmf_fws_hanger_poppkt(&fws->hanger, hslot, &skb, + true); + brcmu_pkt_buf_free_skb(skb); +-- +2.25.1 + diff --git a/queue-5.4/brcmfmac-to-fix-bss-info-flag-definition-bug.patch b/queue-5.4/brcmfmac-to-fix-bss-info-flag-definition-bug.patch new file mode 100644 index 00000000000..bfe5be9bd0b --- /dev/null +++ b/queue-5.4/brcmfmac-to-fix-bss-info-flag-definition-bug.patch @@ -0,0 +1,39 @@ +From 36f8624385710ec24983c765c0b0db47e55ae2f6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 4 Jun 2020 02:18:35 -0500 +Subject: brcmfmac: To fix Bss Info flag definition Bug + +From: Prasanna Kerekoppa + +[ Upstream commit fa3266541b13f390eb35bdbc38ff4a03368be004 ] + +Bss info flag definition need to be fixed from 0x2 to 0x4 +This flag is for rssi info received on channel. +All Firmware branches defined as 0x4 and this is bug in brcmfmac. + +Signed-off-by: Prasanna Kerekoppa +Signed-off-by: Chi-hsien Lin +Signed-off-by: Wright Feng +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/20200604071835.3842-6-wright.feng@cypress.com +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h +index 37c512036e0e3..ce18433aaefb5 100644 +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h +@@ -19,7 +19,7 @@ + #define BRCMF_ARP_OL_PEER_AUTO_REPLY 0x00000008 + + #define BRCMF_BSS_INFO_VERSION 109 /* curr ver of brcmf_bss_info_le struct */ +-#define BRCMF_BSS_RSSI_ON_CHANNEL 0x0002 ++#define BRCMF_BSS_RSSI_ON_CHANNEL 0x0004 + + #define BRCMF_STA_BRCM 0x00000001 /* Running a Broadcom driver */ + #define BRCMF_STA_WME 0x00000002 /* WMM association */ +-- +2.25.1 + diff --git a/queue-5.4/btmrvl-fix-firmware-filename-for-sd8977-chipset.patch b/queue-5.4/btmrvl-fix-firmware-filename-for-sd8977-chipset.patch new file mode 100644 index 00000000000..28dddebd728 --- /dev/null +++ b/queue-5.4/btmrvl-fix-firmware-filename-for-sd8977-chipset.patch @@ -0,0 +1,50 @@ +From b62a5eb5b1a81b6500fdf79666cfa4557b2242b8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 3 Jun 2020 10:22:28 +0200 +Subject: btmrvl: Fix firmware filename for sd8977 chipset +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Pali Rohár + +[ Upstream commit dbec3af5f13b88a96e31f252957ae1a82484a923 ] + +Firmware for sd8977 chipset is distributed by Marvell package and also as +part of the linux-firmware repository in filename sdsd8977_combo_v2.bin. + +This patch fixes mwifiex driver to load correct firmware file for sd8977. + +Fixes: 8c57983bf7a79 ("Bluetooth: btmrvl: add support for sd8977 chipset") +Signed-off-by: Pali Rohár +Acked-by: Ganapathi Bhat +Signed-off-by: Marcel Holtmann +Signed-off-by: Sasha Levin +--- + drivers/bluetooth/btmrvl_sdio.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c +index 0f3a020703ab2..7aa2c94720bc5 100644 +--- a/drivers/bluetooth/btmrvl_sdio.c ++++ b/drivers/bluetooth/btmrvl_sdio.c +@@ -328,7 +328,7 @@ static const struct btmrvl_sdio_device btmrvl_sdio_sd8897 = { + + static const struct btmrvl_sdio_device btmrvl_sdio_sd8977 = { + .helper = NULL, +- .firmware = "mrvl/sd8977_uapsta.bin", ++ .firmware = "mrvl/sdsd8977_combo_v2.bin", + .reg = &btmrvl_reg_8977, + .support_pscan_win_report = true, + .sd_blksz_fw_dl = 256, +@@ -1831,6 +1831,6 @@ MODULE_FIRMWARE("mrvl/sd8787_uapsta.bin"); + MODULE_FIRMWARE("mrvl/sd8797_uapsta.bin"); + MODULE_FIRMWARE("mrvl/sd8887_uapsta.bin"); + MODULE_FIRMWARE("mrvl/sd8897_uapsta.bin"); +-MODULE_FIRMWARE("mrvl/sd8977_uapsta.bin"); ++MODULE_FIRMWARE("mrvl/sdsd8977_combo_v2.bin"); + MODULE_FIRMWARE("mrvl/sd8987_uapsta.bin"); + MODULE_FIRMWARE("mrvl/sd8997_uapsta.bin"); +-- +2.25.1 + diff --git a/queue-5.4/btmrvl-fix-firmware-filename-for-sd8997-chipset.patch b/queue-5.4/btmrvl-fix-firmware-filename-for-sd8997-chipset.patch new file mode 100644 index 00000000000..a38f4b5cf0c --- /dev/null +++ b/queue-5.4/btmrvl-fix-firmware-filename-for-sd8997-chipset.patch @@ -0,0 +1,48 @@ +From 2481b636c54d7d3c32a3b0071beb58fa7f85d49e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 3 Jun 2020 10:22:29 +0200 +Subject: btmrvl: Fix firmware filename for sd8997 chipset +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Pali Rohár + +[ Upstream commit 00eb0cb36fad53315047af12e83c643d3a2c2e49 ] + +Firmware for sd8997 chipset is distributed by Marvell package and also as +part of the linux-firmware repository in filename sdsd8997_combo_v4.bin. + +This patch fixes mwifiex driver to load correct firmware file for sd8997. + +Fixes: f0ef67485f591 ("Bluetooth: btmrvl: add sd8997 chipset support") +Signed-off-by: Pali Rohár +Acked-by: Ganapathi Bhat +Signed-off-by: Marcel Holtmann +Signed-off-by: Sasha Levin +--- + drivers/bluetooth/btmrvl_sdio.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c +index 7aa2c94720bc5..4c7978cb1786f 100644 +--- a/drivers/bluetooth/btmrvl_sdio.c ++++ b/drivers/bluetooth/btmrvl_sdio.c +@@ -346,7 +346,7 @@ static const struct btmrvl_sdio_device btmrvl_sdio_sd8987 = { + + static const struct btmrvl_sdio_device btmrvl_sdio_sd8997 = { + .helper = NULL, +- .firmware = "mrvl/sd8997_uapsta.bin", ++ .firmware = "mrvl/sdsd8997_combo_v4.bin", + .reg = &btmrvl_reg_8997, + .support_pscan_win_report = true, + .sd_blksz_fw_dl = 256, +@@ -1833,4 +1833,4 @@ MODULE_FIRMWARE("mrvl/sd8887_uapsta.bin"); + MODULE_FIRMWARE("mrvl/sd8897_uapsta.bin"); + MODULE_FIRMWARE("mrvl/sdsd8977_combo_v2.bin"); + MODULE_FIRMWARE("mrvl/sd8987_uapsta.bin"); +-MODULE_FIRMWARE("mrvl/sd8997_uapsta.bin"); ++MODULE_FIRMWARE("mrvl/sdsd8997_combo_v4.bin"); +-- +2.25.1 + diff --git a/queue-5.4/btrfs-fix-lockdep-splat-from-btrfs_dump_space_info.patch b/queue-5.4/btrfs-fix-lockdep-splat-from-btrfs_dump_space_info.patch new file mode 100644 index 00000000000..87f9cc732f1 --- /dev/null +++ b/queue-5.4/btrfs-fix-lockdep-splat-from-btrfs_dump_space_info.patch @@ -0,0 +1,198 @@ +From f6890568aeda545ac3abf4ce8b082c0569f48738 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 17 Jul 2020 15:12:29 -0400 +Subject: btrfs: fix lockdep splat from btrfs_dump_space_info + +From: Josef Bacik + +[ Upstream commit ab0db043c35da3477e57d4d516492b2d51a5ca0f ] + +When running with -o enospc_debug you can get the following splat if one +of the dump_space_info's trip + + ====================================================== + WARNING: possible circular locking dependency detected + 5.8.0-rc5+ #20 Tainted: G OE + ------------------------------------------------------ + dd/563090 is trying to acquire lock: + ffff9e7dbf4f1e18 (&ctl->tree_lock){+.+.}-{2:2}, at: btrfs_dump_free_space+0x2b/0xa0 [btrfs] + + but task is already holding lock: + ffff9e7e2284d428 (&cache->lock){+.+.}-{2:2}, at: btrfs_dump_space_info+0xaa/0x120 [btrfs] + + which lock already depends on the new lock. + + the existing dependency chain (in reverse order) is: + + -> #3 (&cache->lock){+.+.}-{2:2}: + _raw_spin_lock+0x25/0x30 + btrfs_add_reserved_bytes+0x3c/0x3c0 [btrfs] + find_free_extent+0x7ef/0x13b0 [btrfs] + btrfs_reserve_extent+0x9b/0x180 [btrfs] + btrfs_alloc_tree_block+0xc1/0x340 [btrfs] + alloc_tree_block_no_bg_flush+0x4a/0x60 [btrfs] + __btrfs_cow_block+0x122/0x530 [btrfs] + btrfs_cow_block+0x106/0x210 [btrfs] + commit_cowonly_roots+0x55/0x300 [btrfs] + btrfs_commit_transaction+0x4ed/0xac0 [btrfs] + sync_filesystem+0x74/0x90 + generic_shutdown_super+0x22/0x100 + kill_anon_super+0x14/0x30 + btrfs_kill_super+0x12/0x20 [btrfs] + deactivate_locked_super+0x36/0x70 + cleanup_mnt+0x104/0x160 + task_work_run+0x5f/0x90 + __prepare_exit_to_usermode+0x1bd/0x1c0 + do_syscall_64+0x5e/0xb0 + entry_SYSCALL_64_after_hwframe+0x44/0xa9 + + -> #2 (&space_info->lock){+.+.}-{2:2}: + _raw_spin_lock+0x25/0x30 + btrfs_block_rsv_release+0x1a6/0x3f0 [btrfs] + btrfs_inode_rsv_release+0x4f/0x170 [btrfs] + btrfs_clear_delalloc_extent+0x155/0x480 [btrfs] + clear_state_bit+0x81/0x1a0 [btrfs] + __clear_extent_bit+0x25c/0x5d0 [btrfs] + clear_extent_bit+0x15/0x20 [btrfs] + btrfs_invalidatepage+0x2b7/0x3c0 [btrfs] + truncate_cleanup_page+0x47/0xe0 + truncate_inode_pages_range+0x238/0x840 + truncate_pagecache+0x44/0x60 + btrfs_setattr+0x202/0x5e0 [btrfs] + notify_change+0x33b/0x490 + do_truncate+0x76/0xd0 + path_openat+0x687/0xa10 + do_filp_open+0x91/0x100 + do_sys_openat2+0x215/0x2d0 + do_sys_open+0x44/0x80 + do_syscall_64+0x52/0xb0 + entry_SYSCALL_64_after_hwframe+0x44/0xa9 + + -> #1 (&tree->lock#2){+.+.}-{2:2}: + _raw_spin_lock+0x25/0x30 + find_first_extent_bit+0x32/0x150 [btrfs] + write_pinned_extent_entries.isra.0+0xc5/0x100 [btrfs] + __btrfs_write_out_cache+0x172/0x480 [btrfs] + btrfs_write_out_cache+0x7a/0xf0 [btrfs] + btrfs_write_dirty_block_groups+0x286/0x3b0 [btrfs] + commit_cowonly_roots+0x245/0x300 [btrfs] + btrfs_commit_transaction+0x4ed/0xac0 [btrfs] + close_ctree+0xf9/0x2f5 [btrfs] + generic_shutdown_super+0x6c/0x100 + kill_anon_super+0x14/0x30 + btrfs_kill_super+0x12/0x20 [btrfs] + deactivate_locked_super+0x36/0x70 + cleanup_mnt+0x104/0x160 + task_work_run+0x5f/0x90 + __prepare_exit_to_usermode+0x1bd/0x1c0 + do_syscall_64+0x5e/0xb0 + entry_SYSCALL_64_after_hwframe+0x44/0xa9 + + -> #0 (&ctl->tree_lock){+.+.}-{2:2}: + __lock_acquire+0x1240/0x2460 + lock_acquire+0xab/0x360 + _raw_spin_lock+0x25/0x30 + btrfs_dump_free_space+0x2b/0xa0 [btrfs] + btrfs_dump_space_info+0xf4/0x120 [btrfs] + btrfs_reserve_extent+0x176/0x180 [btrfs] + __btrfs_prealloc_file_range+0x145/0x550 [btrfs] + cache_save_setup+0x28d/0x3b0 [btrfs] + btrfs_start_dirty_block_groups+0x1fc/0x4f0 [btrfs] + btrfs_commit_transaction+0xcc/0xac0 [btrfs] + btrfs_alloc_data_chunk_ondemand+0x162/0x4c0 [btrfs] + btrfs_check_data_free_space+0x4c/0xa0 [btrfs] + btrfs_buffered_write.isra.0+0x19b/0x740 [btrfs] + btrfs_file_write_iter+0x3cf/0x610 [btrfs] + new_sync_write+0x11e/0x1b0 + vfs_write+0x1c9/0x200 + ksys_write+0x68/0xe0 + do_syscall_64+0x52/0xb0 + entry_SYSCALL_64_after_hwframe+0x44/0xa9 + + other info that might help us debug this: + + Chain exists of: + &ctl->tree_lock --> &space_info->lock --> &cache->lock + + Possible unsafe locking scenario: + + CPU0 CPU1 + ---- ---- + lock(&cache->lock); + lock(&space_info->lock); + lock(&cache->lock); + lock(&ctl->tree_lock); + + *** DEADLOCK *** + + 6 locks held by dd/563090: + #0: ffff9e7e21d18448 (sb_writers#14){.+.+}-{0:0}, at: vfs_write+0x195/0x200 + #1: ffff9e7dd0410ed8 (&sb->s_type->i_mutex_key#19){++++}-{3:3}, at: btrfs_file_write_iter+0x86/0x610 [btrfs] + #2: ffff9e7e21d18638 (sb_internal#2){.+.+}-{0:0}, at: start_transaction+0x40b/0x5b0 [btrfs] + #3: ffff9e7e1f05d688 (&cur_trans->cache_write_mutex){+.+.}-{3:3}, at: btrfs_start_dirty_block_groups+0x158/0x4f0 [btrfs] + #4: ffff9e7e2284ddb8 (&space_info->groups_sem){++++}-{3:3}, at: btrfs_dump_space_info+0x69/0x120 [btrfs] + #5: ffff9e7e2284d428 (&cache->lock){+.+.}-{2:2}, at: btrfs_dump_space_info+0xaa/0x120 [btrfs] + + stack backtrace: + CPU: 3 PID: 563090 Comm: dd Tainted: G OE 5.8.0-rc5+ #20 + Hardware name: To Be Filled By O.E.M. To Be Filled By O.E.M./890FX Deluxe5, BIOS P1.40 05/03/2011 + Call Trace: + dump_stack+0x96/0xd0 + check_noncircular+0x162/0x180 + __lock_acquire+0x1240/0x2460 + ? wake_up_klogd.part.0+0x30/0x40 + lock_acquire+0xab/0x360 + ? btrfs_dump_free_space+0x2b/0xa0 [btrfs] + _raw_spin_lock+0x25/0x30 + ? btrfs_dump_free_space+0x2b/0xa0 [btrfs] + btrfs_dump_free_space+0x2b/0xa0 [btrfs] + btrfs_dump_space_info+0xf4/0x120 [btrfs] + btrfs_reserve_extent+0x176/0x180 [btrfs] + __btrfs_prealloc_file_range+0x145/0x550 [btrfs] + ? btrfs_qgroup_reserve_data+0x1d/0x60 [btrfs] + cache_save_setup+0x28d/0x3b0 [btrfs] + btrfs_start_dirty_block_groups+0x1fc/0x4f0 [btrfs] + btrfs_commit_transaction+0xcc/0xac0 [btrfs] + ? start_transaction+0xe0/0x5b0 [btrfs] + btrfs_alloc_data_chunk_ondemand+0x162/0x4c0 [btrfs] + btrfs_check_data_free_space+0x4c/0xa0 [btrfs] + btrfs_buffered_write.isra.0+0x19b/0x740 [btrfs] + ? ktime_get_coarse_real_ts64+0xa8/0xd0 + ? trace_hardirqs_on+0x1c/0xe0 + btrfs_file_write_iter+0x3cf/0x610 [btrfs] + new_sync_write+0x11e/0x1b0 + vfs_write+0x1c9/0x200 + ksys_write+0x68/0xe0 + do_syscall_64+0x52/0xb0 + entry_SYSCALL_64_after_hwframe+0x44/0xa9 + +This is because we're holding the block_group->lock while trying to dump +the free space cache. However we don't need this lock, we just need it +to read the values for the printk, so move the free space cache dumping +outside of the block group lock. + +Signed-off-by: Josef Bacik +Reviewed-by: David Sterba +Signed-off-by: David Sterba +Signed-off-by: Sasha Levin +--- + fs/btrfs/space-info.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c +index 7889a59a57fa4..6f484f0d347eb 100644 +--- a/fs/btrfs/space-info.c ++++ b/fs/btrfs/space-info.c +@@ -304,8 +304,8 @@ void btrfs_dump_space_info(struct btrfs_fs_info *fs_info, + cache->key.objectid, cache->key.offset, + btrfs_block_group_used(&cache->item), cache->pinned, + cache->reserved, cache->ro ? "[readonly]" : ""); +- btrfs_dump_free_space(cache, bytes); + spin_unlock(&cache->lock); ++ btrfs_dump_free_space(cache, bytes); + } + if (++index < BTRFS_NR_RAID_TYPES) + goto again; +-- +2.25.1 + diff --git a/queue-5.4/bus-ti-sysc-add-missing-quirk-flags-for-usb_host_hs.patch b/queue-5.4/bus-ti-sysc-add-missing-quirk-flags-for-usb_host_hs.patch new file mode 100644 index 00000000000..19ca885a9eb --- /dev/null +++ b/queue-5.4/bus-ti-sysc-add-missing-quirk-flags-for-usb_host_hs.patch @@ -0,0 +1,47 @@ +From 46fa8b831154fe81af8d2ada7ac89e4e826c16c9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 13 Jul 2020 09:59:47 -0700 +Subject: bus: ti-sysc: Add missing quirk flags for usb_host_hs + +From: Tony Lindgren + +[ Upstream commit 4254632dba27271f6de66efd87e444ee405dee29 ] + +Similar to what we have for the legacy platform data, we need to +configure SWSUP_SIDLE and SWSUP_MSTANDBY quirks for usb_host_hs. + +These are needed to drop the legacy platform data for usb_host_hs. + +Signed-off-by: Tony Lindgren +Signed-off-by: Sasha Levin +--- + drivers/bus/ti-sysc.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c +index f8bc052cd853a..770a780dfa544 100644 +--- a/drivers/bus/ti-sysc.c ++++ b/drivers/bus/ti-sysc.c +@@ -1371,6 +1371,10 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = { + SYSC_QUIRK_SWSUP_SIDLE | SYSC_QUIRK_SWSUP_MSTANDBY), + SYSC_QUIRK("tptc", 0, 0, -ENODEV, -ENODEV, 0x40007c00, 0xffffffff, + SYSC_QUIRK_SWSUP_SIDLE | SYSC_QUIRK_SWSUP_MSTANDBY), ++ SYSC_QUIRK("usb_host_hs", 0, 0, 0x10, 0x14, 0x50700100, 0xffffffff, ++ SYSC_QUIRK_SWSUP_SIDLE | SYSC_QUIRK_SWSUP_MSTANDBY), ++ SYSC_QUIRK("usb_host_hs", 0, 0, 0x10, -ENODEV, 0x50700101, 0xffffffff, ++ SYSC_QUIRK_SWSUP_SIDLE | SYSC_QUIRK_SWSUP_MSTANDBY), + SYSC_QUIRK("usb_otg_hs", 0, 0x400, 0x404, 0x408, 0x00000050, + 0xffffffff, SYSC_QUIRK_SWSUP_SIDLE | SYSC_QUIRK_SWSUP_MSTANDBY), + SYSC_QUIRK("usb_otg_hs", 0, 0, 0x10, -ENODEV, 0x4ea2080d, 0xffffffff, +@@ -1440,8 +1444,6 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = { + SYSC_QUIRK("tpcc", 0, 0, -ENODEV, -ENODEV, 0x40014c00, 0xffffffff, 0), + SYSC_QUIRK("usbhstll", 0, 0, 0x10, 0x14, 0x00000004, 0xffffffff, 0), + SYSC_QUIRK("usbhstll", 0, 0, 0x10, 0x14, 0x00000008, 0xffffffff, 0), +- SYSC_QUIRK("usb_host_hs", 0, 0, 0x10, 0x14, 0x50700100, 0xffffffff, 0), +- SYSC_QUIRK("usb_host_hs", 0, 0, 0x10, -ENODEV, 0x50700101, 0xffffffff, 0), + SYSC_QUIRK("venc", 0x58003000, 0, -ENODEV, -ENODEV, 0x00000002, 0xffffffff, 0), + SYSC_QUIRK("vfpe", 0, 0, 0x104, -ENODEV, 0x4d001200, 0xffffffff, 0), + #endif +-- +2.25.1 + diff --git a/queue-5.4/clk-bcm63xx-gate-fix-last-clock-availability.patch b/queue-5.4/clk-bcm63xx-gate-fix-last-clock-availability.patch new file mode 100644 index 00000000000..59feb5a2b2b --- /dev/null +++ b/queue-5.4/clk-bcm63xx-gate-fix-last-clock-availability.patch @@ -0,0 +1,40 @@ +From 6728518f977fc4887c09bcd8ce8ee6bf8ff0f267 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 9 Jun 2020 13:08:46 +0200 +Subject: clk: bcm63xx-gate: fix last clock availability +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Álvaro Fernández Rojas + +[ Upstream commit cf8030d7035bd3e89c9e66f7193a7fc8057a9b9a ] + +In order to make the last clock available, maxbit has to be set to the +highest bit value plus 1. + +Fixes: 1c099779c1e2 ("clk: add BCM63XX gated clock controller driver") +Signed-off-by: Álvaro Fernández Rojas +Link: https://lore.kernel.org/r/20200609110846.4029620-1-noltari@gmail.com +Reviewed-by: Florian Fainelli +Signed-off-by: Stephen Boyd +Signed-off-by: Sasha Levin +--- + drivers/clk/bcm/clk-bcm63xx-gate.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/clk/bcm/clk-bcm63xx-gate.c b/drivers/clk/bcm/clk-bcm63xx-gate.c +index 98e884957db87..911a29bd744ef 100644 +--- a/drivers/clk/bcm/clk-bcm63xx-gate.c ++++ b/drivers/clk/bcm/clk-bcm63xx-gate.c +@@ -155,6 +155,7 @@ static int clk_bcm63xx_probe(struct platform_device *pdev) + + for (entry = table; entry->name; entry++) + maxbit = max_t(u8, maxbit, entry->bit); ++ maxbit++; + + hw = devm_kzalloc(&pdev->dev, struct_size(hw, data.hws, maxbit), + GFP_KERNEL); +-- +2.25.1 + diff --git a/queue-5.4/clk-scmi-fix-min-and-max-rate-when-registering-clock.patch b/queue-5.4/clk-scmi-fix-min-and-max-rate-when-registering-clock.patch new file mode 100644 index 00000000000..c403e4fd959 --- /dev/null +++ b/queue-5.4/clk-scmi-fix-min-and-max-rate-when-registering-clock.patch @@ -0,0 +1,71 @@ +From 336512c9d93ebc3562119ede6450b6309b8af1e6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 9 Jul 2020 09:17:05 +0100 +Subject: clk: scmi: Fix min and max rate when registering clocks with discrete + rates + +From: Sudeep Holla + +[ Upstream commit fcd2e0deae50bce48450f14c8fc5611b08d7438c ] + +Currently we are not initializing the scmi clock with discrete rates +correctly. We fetch the min_rate and max_rate value only for clocks with +ranges and ignore the ones with discrete rates. This will lead to wrong +initialization of rate range when clock supports discrete rate. + +Fix this by using the first and the last rate in the sorted list of the +discrete clock rates while registering the clock. + +Link: https://lore.kernel.org/r/20200709081705.46084-2-sudeep.holla@arm.com +Fixes: 6d6a1d82eaef7 ("clk: add support for clocks provided by SCMI") +Reviewed-by: Stephen Boyd +Reported-and-tested-by: Dien Pham +Signed-off-by: Sudeep Holla +Signed-off-by: Sasha Levin +--- + drivers/clk/clk-scmi.c | 22 +++++++++++++++++++--- + 1 file changed, 19 insertions(+), 3 deletions(-) + +diff --git a/drivers/clk/clk-scmi.c b/drivers/clk/clk-scmi.c +index 886f7c5df51a9..e3cdb4a282fea 100644 +--- a/drivers/clk/clk-scmi.c ++++ b/drivers/clk/clk-scmi.c +@@ -103,6 +103,8 @@ static const struct clk_ops scmi_clk_ops = { + static int scmi_clk_ops_init(struct device *dev, struct scmi_clk *sclk) + { + int ret; ++ unsigned long min_rate, max_rate; ++ + struct clk_init_data init = { + .flags = CLK_GET_RATE_NOCACHE, + .num_parents = 0, +@@ -112,9 +114,23 @@ static int scmi_clk_ops_init(struct device *dev, struct scmi_clk *sclk) + + sclk->hw.init = &init; + ret = devm_clk_hw_register(dev, &sclk->hw); +- if (!ret) +- clk_hw_set_rate_range(&sclk->hw, sclk->info->range.min_rate, +- sclk->info->range.max_rate); ++ if (ret) ++ return ret; ++ ++ if (sclk->info->rate_discrete) { ++ int num_rates = sclk->info->list.num_rates; ++ ++ if (num_rates <= 0) ++ return -EINVAL; ++ ++ min_rate = sclk->info->list.rates[0]; ++ max_rate = sclk->info->list.rates[num_rates - 1]; ++ } else { ++ min_rate = sclk->info->range.min_rate; ++ max_rate = sclk->info->range.max_rate; ++ } ++ ++ clk_hw_set_rate_range(&sclk->hw, min_rate, max_rate); + return ret; + } + +-- +2.25.1 + diff --git a/queue-5.4/console-newport_con-fix-an-issue-about-leak-related-.patch b/queue-5.4/console-newport_con-fix-an-issue-about-leak-related-.patch new file mode 100644 index 00000000000..7a9df9f1fc7 --- /dev/null +++ b/queue-5.4/console-newport_con-fix-an-issue-about-leak-related-.patch @@ -0,0 +1,91 @@ +From 1b0b5f3aab9fdca714585f378c056ca00b5e154f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 24 Apr 2020 00:42:51 +0800 +Subject: console: newport_con: fix an issue about leak related system + resources + +From: Dejin Zheng + +[ Upstream commit fd4b8243877250c05bb24af7fea5567110c9720b ] + +A call of the function do_take_over_console() can fail here. +The corresponding system resources were not released then. +Thus add a call of iounmap() and release_mem_region() +together with the check of a failure predicate. and also +add release_mem_region() on device removal. + +Fixes: e86bb8acc0fdc ("[PATCH] VT binding: Make newport_con support binding") +Suggested-by: Bartlomiej Zolnierkiewicz +Signed-off-by: Dejin Zheng +Reviewed-by: Andy Shevchenko +Cc: Greg Kroah-Hartman +cc: Thomas Gleixner +Cc: Andrew Morton +Signed-off-by: Bartlomiej Zolnierkiewicz +Link: https://patchwork.freedesktop.org/patch/msgid/20200423164251.3349-1-zhengdejin5@gmail.com +Signed-off-by: Sasha Levin +--- + drivers/video/console/newport_con.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/newport_con.c +index 00dddf6e08b0c..2d2ee17052e83 100644 +--- a/drivers/video/console/newport_con.c ++++ b/drivers/video/console/newport_con.c +@@ -32,6 +32,8 @@ + #include + #include + ++#define NEWPORT_LEN 0x10000 ++ + #define FONT_DATA ((unsigned char *)font_vga_8x16.data) + + /* borrowed from fbcon.c */ +@@ -43,6 +45,7 @@ + static unsigned char *font_data[MAX_NR_CONSOLES]; + + static struct newport_regs *npregs; ++static unsigned long newport_addr; + + static int logo_active; + static int topscan; +@@ -702,7 +705,6 @@ const struct consw newport_con = { + static int newport_probe(struct gio_device *dev, + const struct gio_device_id *id) + { +- unsigned long newport_addr; + int err; + + if (!dev->resource.start) +@@ -712,7 +714,7 @@ static int newport_probe(struct gio_device *dev, + return -EBUSY; /* we only support one Newport as console */ + + newport_addr = dev->resource.start + 0xF0000; +- if (!request_mem_region(newport_addr, 0x10000, "Newport")) ++ if (!request_mem_region(newport_addr, NEWPORT_LEN, "Newport")) + return -ENODEV; + + npregs = (struct newport_regs *)/* ioremap cannot fail */ +@@ -720,6 +722,11 @@ static int newport_probe(struct gio_device *dev, + console_lock(); + err = do_take_over_console(&newport_con, 0, MAX_NR_CONSOLES - 1, 1); + console_unlock(); ++ ++ if (err) { ++ iounmap((void *)npregs); ++ release_mem_region(newport_addr, NEWPORT_LEN); ++ } + return err; + } + +@@ -727,6 +734,7 @@ static void newport_remove(struct gio_device *dev) + { + give_up_console(&newport_con); + iounmap((void *)npregs); ++ release_mem_region(newport_addr, NEWPORT_LEN); + } + + static struct gio_device_id newport_ids[] = { +-- +2.25.1 + diff --git a/queue-5.4/coresight-tmc-fix-tmc-mode-read-in-tmc_read_unprepar.patch b/queue-5.4/coresight-tmc-fix-tmc-mode-read-in-tmc_read_unprepar.patch new file mode 100644 index 00000000000..5a2330c3659 --- /dev/null +++ b/queue-5.4/coresight-tmc-fix-tmc-mode-read-in-tmc_read_unprepar.patch @@ -0,0 +1,80 @@ +From 9fa31c343ea262cb5c1fa2d2c949c8738e266978 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 16 Jul 2020 11:57:42 -0600 +Subject: coresight: tmc: Fix TMC mode read in tmc_read_unprepare_etb() + +From: Sai Prakash Ranjan + +[ Upstream commit d021f5c5ff679432c5e9faee0fd7350db2efb97c ] + +Reading TMC mode register without proper coresight power +management can lead to exceptions like the one in the call +trace below in tmc_read_unprepare_etb() when the trace data +is read after the sink is disabled. So fix this by having +a check for coresight sysfs mode before reading TMC mode +management register in tmc_read_unprepare_etb() similar to +tmc_read_prepare_etb(). + + SError Interrupt on CPU6, code 0xbe000411 -- SError + pstate: 80400089 (Nzcv daIf +PAN -UAO) + pc : tmc_read_unprepare_etb+0x74/0x108 + lr : tmc_read_unprepare_etb+0x54/0x108 + sp : ffffff80d9507c30 + x29: ffffff80d9507c30 x28: ffffff80b3569a0c + x27: 0000000000000000 x26: 00000000000a0001 + x25: ffffff80cbae9550 x24: 0000000000000010 + x23: ffffffd07296b0f0 x22: ffffffd0109ee028 + x21: 0000000000000000 x20: ffffff80d19e70e0 + x19: ffffff80d19e7080 x18: 0000000000000000 + x17: 0000000000000000 x16: 0000000000000000 + x15: 0000000000000000 x14: 0000000000000000 + x13: 0000000000000000 x12: 0000000000000000 + x11: 0000000000000000 x10: dfffffd000000001 + x9 : 0000000000000000 x8 : 0000000000000002 + x7 : ffffffd071d0fe78 x6 : 0000000000000000 + x5 : 0000000000000080 x4 : 0000000000000001 + x3 : ffffffd071d0fe98 x2 : 0000000000000000 + x1 : 0000000000000004 x0 : 0000000000000001 + Kernel panic - not syncing: Asynchronous SError Interrupt + +Fixes: 4525412a5046 ("coresight: tmc: making prepare/unprepare functions generic") +Reported-by: Mike Leach +Signed-off-by: Sai Prakash Ranjan +Tested-by: Mike Leach +Signed-off-by: Mathieu Poirier +Link: https://lore.kernel.org/r/20200716175746.3338735-14-mathieu.poirier@linaro.org +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/hwtracing/coresight/coresight-tmc-etf.c | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) + +diff --git a/drivers/hwtracing/coresight/coresight-tmc-etf.c b/drivers/hwtracing/coresight/coresight-tmc-etf.c +index 36cce2bfb7449..6375504ba8b00 100644 +--- a/drivers/hwtracing/coresight/coresight-tmc-etf.c ++++ b/drivers/hwtracing/coresight/coresight-tmc-etf.c +@@ -639,15 +639,14 @@ int tmc_read_unprepare_etb(struct tmc_drvdata *drvdata) + + spin_lock_irqsave(&drvdata->spinlock, flags); + +- /* There is no point in reading a TMC in HW FIFO mode */ +- mode = readl_relaxed(drvdata->base + TMC_MODE); +- if (mode != TMC_MODE_CIRCULAR_BUFFER) { +- spin_unlock_irqrestore(&drvdata->spinlock, flags); +- return -EINVAL; +- } +- + /* Re-enable the TMC if need be */ + if (drvdata->mode == CS_MODE_SYSFS) { ++ /* There is no point in reading a TMC in HW FIFO mode */ ++ mode = readl_relaxed(drvdata->base + TMC_MODE); ++ if (mode != TMC_MODE_CIRCULAR_BUFFER) { ++ spin_unlock_irqrestore(&drvdata->spinlock, flags); ++ return -EINVAL; ++ } + /* + * The trace run will continue with the same allocated trace + * buffer. As such zero-out the buffer so that we don't end +-- +2.25.1 + diff --git a/queue-5.4/cpufreq-ap806-fix-cpufreq-driver-needs-ap-cpu-clk.patch b/queue-5.4/cpufreq-ap806-fix-cpufreq-driver-needs-ap-cpu-clk.patch new file mode 100644 index 00000000000..763331210e9 --- /dev/null +++ b/queue-5.4/cpufreq-ap806-fix-cpufreq-driver-needs-ap-cpu-clk.patch @@ -0,0 +1,38 @@ +From 6b31d80e1ca190c87a09a8c07ea2eda2a42ab8eb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 22 Jun 2020 14:01:23 +0200 +Subject: cpufreq: ap806: fix cpufreq driver needs ap cpu clk + +From: Sven Auhagen + +[ Upstream commit 8c37ad2f523396e15cf002b29f8f796447c71932 ] + +The Armada 8K cpufreq driver needs the Armada AP CPU CLK +to work. This dependency is currently not satisfied and +the ARMADA_AP_CPU_CLK can not be selected independently. + +Add it to the cpufreq Armada8k driver. + +Fixes: f525a670533d ("cpufreq: ap806: add cpufreq driver for Armada 8K") +Signed-off-by: Sven Auhagen +Signed-off-by: Viresh Kumar +Signed-off-by: Sasha Levin +--- + drivers/cpufreq/Kconfig.arm | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm +index a905796f7f856..25f11e9ec3587 100644 +--- a/drivers/cpufreq/Kconfig.arm ++++ b/drivers/cpufreq/Kconfig.arm +@@ -41,6 +41,7 @@ config ARM_ARMADA_37XX_CPUFREQ + config ARM_ARMADA_8K_CPUFREQ + tristate "Armada 8K CPUFreq driver" + depends on ARCH_MVEBU && CPUFREQ_DT ++ select ARMADA_AP_CPU_CLK + help + This enables the CPUFreq driver support for Marvell + Armada8k SOCs. +-- +2.25.1 + diff --git a/queue-5.4/crc-t10dif-fix-potential-crypto-notify-dead-lock.patch b/queue-5.4/crc-t10dif-fix-potential-crypto-notify-dead-lock.patch new file mode 100644 index 00000000000..68faf5a9520 --- /dev/null +++ b/queue-5.4/crc-t10dif-fix-potential-crypto-notify-dead-lock.patch @@ -0,0 +1,157 @@ +From 99cddb751bc9d41a6021156862d356143a393140 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 5 Jun 2020 16:59:18 +1000 +Subject: crc-t10dif: Fix potential crypto notify dead-lock + +From: Herbert Xu + +[ Upstream commit 3906f640224dbe7714b52b66d7d68c0812808e19 ] + +The crypto notify call occurs with a read mutex held so you must +not do any substantial work directly. In particular, you cannot +call crypto_alloc_* as they may trigger further notifications +which may dead-lock in the presence of another writer. + +This patch fixes this by postponing the work into a work queue and +taking the same lock in the module init function. + +While we're at it this patch also ensures that all RCU accesses are +marked appropriately (tested with sparse). + +Finally this also reveals a race condition in module param show +function as it may be called prior to the module init function. +It's fixed by testing whether crct10dif_tfm is NULL (this is true +iff the init function has not completed assuming fallback is false). + +Fixes: 11dcb1037f40 ("crc-t10dif: Allow current transform to be...") +Fixes: b76377543b73 ("crc-t10dif: Pick better transform if one...") +Signed-off-by: Herbert Xu +Reviewed-by: Martin K. Petersen +Reviewed-by: Eric Biggers +Signed-off-by: Herbert Xu +Signed-off-by: Sasha Levin +--- + lib/crc-t10dif.c | 54 +++++++++++++++++++++++++++++++++++++----------- + 1 file changed, 42 insertions(+), 12 deletions(-) + +diff --git a/lib/crc-t10dif.c b/lib/crc-t10dif.c +index 8cc01a6034165..c9acf1c12cfcb 100644 +--- a/lib/crc-t10dif.c ++++ b/lib/crc-t10dif.c +@@ -19,39 +19,46 @@ + static struct crypto_shash __rcu *crct10dif_tfm; + static struct static_key crct10dif_fallback __read_mostly; + static DEFINE_MUTEX(crc_t10dif_mutex); ++static struct work_struct crct10dif_rehash_work; + +-static int crc_t10dif_rehash(struct notifier_block *self, unsigned long val, void *data) ++static int crc_t10dif_notify(struct notifier_block *self, unsigned long val, void *data) + { + struct crypto_alg *alg = data; +- struct crypto_shash *new, *old; + + if (val != CRYPTO_MSG_ALG_LOADED || + static_key_false(&crct10dif_fallback) || + strncmp(alg->cra_name, CRC_T10DIF_STRING, strlen(CRC_T10DIF_STRING))) + return 0; + ++ schedule_work(&crct10dif_rehash_work); ++ return 0; ++} ++ ++static void crc_t10dif_rehash(struct work_struct *work) ++{ ++ struct crypto_shash *new, *old; ++ + mutex_lock(&crc_t10dif_mutex); + old = rcu_dereference_protected(crct10dif_tfm, + lockdep_is_held(&crc_t10dif_mutex)); + if (!old) { + mutex_unlock(&crc_t10dif_mutex); +- return 0; ++ return; + } + new = crypto_alloc_shash("crct10dif", 0, 0); + if (IS_ERR(new)) { + mutex_unlock(&crc_t10dif_mutex); +- return 0; ++ return; + } + rcu_assign_pointer(crct10dif_tfm, new); + mutex_unlock(&crc_t10dif_mutex); + + synchronize_rcu(); + crypto_free_shash(old); +- return 0; + } + + static struct notifier_block crc_t10dif_nb = { +- .notifier_call = crc_t10dif_rehash, ++ .notifier_call = crc_t10dif_notify, + }; + + __u16 crc_t10dif_update(__u16 crc, const unsigned char *buffer, size_t len) +@@ -86,19 +93,26 @@ EXPORT_SYMBOL(crc_t10dif); + + static int __init crc_t10dif_mod_init(void) + { ++ struct crypto_shash *tfm; ++ ++ INIT_WORK(&crct10dif_rehash_work, crc_t10dif_rehash); + crypto_register_notifier(&crc_t10dif_nb); +- crct10dif_tfm = crypto_alloc_shash("crct10dif", 0, 0); +- if (IS_ERR(crct10dif_tfm)) { ++ mutex_lock(&crc_t10dif_mutex); ++ tfm = crypto_alloc_shash("crct10dif", 0, 0); ++ if (IS_ERR(tfm)) { + static_key_slow_inc(&crct10dif_fallback); +- crct10dif_tfm = NULL; ++ tfm = NULL; + } ++ RCU_INIT_POINTER(crct10dif_tfm, tfm); ++ mutex_unlock(&crc_t10dif_mutex); + return 0; + } + + static void __exit crc_t10dif_mod_fini(void) + { + crypto_unregister_notifier(&crc_t10dif_nb); +- crypto_free_shash(crct10dif_tfm); ++ cancel_work_sync(&crct10dif_rehash_work); ++ crypto_free_shash(rcu_dereference_protected(crct10dif_tfm, 1)); + } + + module_init(crc_t10dif_mod_init); +@@ -106,11 +120,27 @@ module_exit(crc_t10dif_mod_fini); + + static int crc_t10dif_transform_show(char *buffer, const struct kernel_param *kp) + { ++ struct crypto_shash *tfm; ++ const char *name; ++ int len; ++ + if (static_key_false(&crct10dif_fallback)) + return sprintf(buffer, "fallback\n"); + +- return sprintf(buffer, "%s\n", +- crypto_tfm_alg_driver_name(crypto_shash_tfm(crct10dif_tfm))); ++ rcu_read_lock(); ++ tfm = rcu_dereference(crct10dif_tfm); ++ if (!tfm) { ++ len = sprintf(buffer, "init\n"); ++ goto unlock; ++ } ++ ++ name = crypto_tfm_alg_driver_name(crypto_shash_tfm(tfm)); ++ len = sprintf(buffer, "%s\n", name); ++ ++unlock: ++ rcu_read_unlock(); ++ ++ return len; + } + + module_param_call(transform, NULL, crc_t10dif_transform_show, NULL, 0644); +-- +2.25.1 + diff --git a/queue-5.4/crypto-aesni-fix-build-with-llvm_ias-1.patch b/queue-5.4/crypto-aesni-fix-build-with-llvm_ias-1.patch new file mode 100644 index 00000000000..cafaf2a4fec --- /dev/null +++ b/queue-5.4/crypto-aesni-fix-build-with-llvm_ias-1.patch @@ -0,0 +1,109 @@ +From 504d946829901a7e284caf7c0799fdc4ee6902e4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 3 Jul 2020 16:32:06 +0200 +Subject: crypto: aesni - Fix build with LLVM_IAS=1 + +From: Sedat Dilek + +[ Upstream commit 3347c8a079d67af21760a78cc5f2abbcf06d9571 ] + +When building with LLVM_IAS=1 means using Clang's Integrated Assembly (IAS) +from LLVM/Clang >= v10.0.1-rc1+ instead of GNU/as from GNU/binutils +I see the following breakage in Debian/testing AMD64: + +:15:74: error: too many positional arguments + PRECOMPUTE 8*3+8(%rsp), %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7, + ^ + arch/x86/crypto/aesni-intel_asm.S:1598:2: note: while in macro instantiation + GCM_INIT %r9, 8*3 +8(%rsp), 8*3 +16(%rsp), 8*3 +24(%rsp) + ^ +:47:2: error: unknown use of instruction mnemonic without a size suffix + GHASH_4_ENCRYPT_4_PARALLEL_dec %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, %xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7, %xmm8, enc + ^ +arch/x86/crypto/aesni-intel_asm.S:1599:2: note: while in macro instantiation + GCM_ENC_DEC dec + ^ +:15:74: error: too many positional arguments + PRECOMPUTE 8*3+8(%rsp), %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7, + ^ +arch/x86/crypto/aesni-intel_asm.S:1686:2: note: while in macro instantiation + GCM_INIT %r9, 8*3 +8(%rsp), 8*3 +16(%rsp), 8*3 +24(%rsp) + ^ +:47:2: error: unknown use of instruction mnemonic without a size suffix + GHASH_4_ENCRYPT_4_PARALLEL_enc %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, %xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7, %xmm8, enc + ^ +arch/x86/crypto/aesni-intel_asm.S:1687:2: note: while in macro instantiation + GCM_ENC_DEC enc + +Craig Topper suggested me in ClangBuiltLinux issue #1050: + +> I think the "too many positional arguments" is because the parser isn't able +> to handle the trailing commas. +> +> The "unknown use of instruction mnemonic" is because the macro was named +> GHASH_4_ENCRYPT_4_PARALLEL_DEC but its being instantiated with +> GHASH_4_ENCRYPT_4_PARALLEL_dec I guess gas ignores case on the +> macro instantiation, but llvm doesn't. + +First, I removed the trailing comma in the PRECOMPUTE line. + +Second, I substituted: +1. GHASH_4_ENCRYPT_4_PARALLEL_DEC -> GHASH_4_ENCRYPT_4_PARALLEL_dec +2. GHASH_4_ENCRYPT_4_PARALLEL_ENC -> GHASH_4_ENCRYPT_4_PARALLEL_enc + +With these changes I was able to build with LLVM_IAS=1 and boot on bare metal. + +I confirmed that this works with Linux-kernel v5.7.5 final. + +NOTE: This patch is on top of Linux v5.7 final. + +Thanks to Craig and especially Nick for double-checking and his comments. + +Suggested-by: Craig Topper +Suggested-by: Craig Topper +Suggested-by: Nick Desaulniers +Reviewed-by: Nick Desaulniers +Cc: "ClangBuiltLinux" +Link: https://github.com/ClangBuiltLinux/linux/issues/1050 +Link: https://bugs.llvm.org/show_bug.cgi?id=24494 +Signed-off-by: Sedat Dilek +Signed-off-by: Herbert Xu +Signed-off-by: Sasha Levin +--- + arch/x86/crypto/aesni-intel_asm.S | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S +index e40bdf024ba76..9afeb58c910eb 100644 +--- a/arch/x86/crypto/aesni-intel_asm.S ++++ b/arch/x86/crypto/aesni-intel_asm.S +@@ -266,7 +266,7 @@ ALL_F: .octa 0xffffffffffffffffffffffffffffffff + PSHUFB_XMM %xmm2, %xmm0 + movdqu %xmm0, CurCount(%arg2) # ctx_data.current_counter = iv + +- PRECOMPUTE \SUBKEY, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7, ++ PRECOMPUTE \SUBKEY, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7 + movdqu HashKey(%arg2), %xmm13 + + CALC_AAD_HASH %xmm13, \AAD, \AADLEN, %xmm0, %xmm1, %xmm2, %xmm3, \ +@@ -978,7 +978,7 @@ _initial_blocks_done\@: + * arg1, %arg3, %arg4 are used as pointers only, not modified + * %r11 is the data offset value + */ +-.macro GHASH_4_ENCRYPT_4_PARALLEL_ENC TMP1 TMP2 TMP3 TMP4 TMP5 \ ++.macro GHASH_4_ENCRYPT_4_PARALLEL_enc TMP1 TMP2 TMP3 TMP4 TMP5 \ + TMP6 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 XMM8 operation + + movdqa \XMM1, \XMM5 +@@ -1186,7 +1186,7 @@ aes_loop_par_enc_done\@: + * arg1, %arg3, %arg4 are used as pointers only, not modified + * %r11 is the data offset value + */ +-.macro GHASH_4_ENCRYPT_4_PARALLEL_DEC TMP1 TMP2 TMP3 TMP4 TMP5 \ ++.macro GHASH_4_ENCRYPT_4_PARALLEL_dec TMP1 TMP2 TMP3 TMP4 TMP5 \ + TMP6 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 XMM8 operation + + movdqa \XMM1, \XMM5 +-- +2.25.1 + diff --git a/queue-5.4/crypto-ccree-fix-resource-leak-on-error-path.patch b/queue-5.4/crypto-ccree-fix-resource-leak-on-error-path.patch new file mode 100644 index 00000000000..35cae2ee4c9 --- /dev/null +++ b/queue-5.4/crypto-ccree-fix-resource-leak-on-error-path.patch @@ -0,0 +1,86 @@ +From 243d83a31e9c18103c4d7cf7b31f48b156489617 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 21 Jun 2020 14:19:57 +0300 +Subject: crypto: ccree - fix resource leak on error path + +From: Gilad Ben-Yossef + +[ Upstream commit 9bc6165d608d676f05d8bf156a2c9923ee38d05b ] + +Fix a small resource leak on the error path of cipher processing. + +Signed-off-by: Gilad Ben-Yossef +Fixes: 63ee04c8b491e ("crypto: ccree - add skcipher support") +Cc: Markus Elfring +Signed-off-by: Herbert Xu +Signed-off-by: Sasha Levin +--- + drivers/crypto/ccree/cc_cipher.c | 30 ++++++++++++++++++------------ + 1 file changed, 18 insertions(+), 12 deletions(-) + +diff --git a/drivers/crypto/ccree/cc_cipher.c b/drivers/crypto/ccree/cc_cipher.c +index cd9c60268bf8d..9bf0cce578f02 100644 +--- a/drivers/crypto/ccree/cc_cipher.c ++++ b/drivers/crypto/ccree/cc_cipher.c +@@ -163,7 +163,6 @@ static int cc_cipher_init(struct crypto_tfm *tfm) + skcipher_alg.base); + struct device *dev = drvdata_to_dev(cc_alg->drvdata); + unsigned int max_key_buf_size = cc_alg->skcipher_alg.max_keysize; +- int rc = 0; + + dev_dbg(dev, "Initializing context @%p for %s\n", ctx_p, + crypto_tfm_alg_name(tfm)); +@@ -175,10 +174,19 @@ static int cc_cipher_init(struct crypto_tfm *tfm) + ctx_p->flow_mode = cc_alg->flow_mode; + ctx_p->drvdata = cc_alg->drvdata; + ++ if (ctx_p->cipher_mode == DRV_CIPHER_ESSIV) { ++ /* Alloc hash tfm for essiv */ ++ ctx_p->shash_tfm = crypto_alloc_shash("sha256-generic", 0, 0); ++ if (IS_ERR(ctx_p->shash_tfm)) { ++ dev_err(dev, "Error allocating hash tfm for ESSIV.\n"); ++ return PTR_ERR(ctx_p->shash_tfm); ++ } ++ } ++ + /* Allocate key buffer, cache line aligned */ + ctx_p->user.key = kmalloc(max_key_buf_size, GFP_KERNEL); + if (!ctx_p->user.key) +- return -ENOMEM; ++ goto free_shash; + + dev_dbg(dev, "Allocated key buffer in context. key=@%p\n", + ctx_p->user.key); +@@ -190,21 +198,19 @@ static int cc_cipher_init(struct crypto_tfm *tfm) + if (dma_mapping_error(dev, ctx_p->user.key_dma_addr)) { + dev_err(dev, "Mapping Key %u B at va=%pK for DMA failed\n", + max_key_buf_size, ctx_p->user.key); +- return -ENOMEM; ++ goto free_key; + } + dev_dbg(dev, "Mapped key %u B at va=%pK to dma=%pad\n", + max_key_buf_size, ctx_p->user.key, &ctx_p->user.key_dma_addr); + +- if (ctx_p->cipher_mode == DRV_CIPHER_ESSIV) { +- /* Alloc hash tfm for essiv */ +- ctx_p->shash_tfm = crypto_alloc_shash("sha256-generic", 0, 0); +- if (IS_ERR(ctx_p->shash_tfm)) { +- dev_err(dev, "Error allocating hash tfm for ESSIV.\n"); +- return PTR_ERR(ctx_p->shash_tfm); +- } +- } ++ return 0; + +- return rc; ++free_key: ++ kfree(ctx_p->user.key); ++free_shash: ++ crypto_free_shash(ctx_p->shash_tfm); ++ ++ return -ENOMEM; + } + + static void cc_cipher_exit(struct crypto_tfm *tfm) +-- +2.25.1 + diff --git a/queue-5.4/cxl-fix-kobject-memleak.patch b/queue-5.4/cxl-fix-kobject-memleak.patch new file mode 100644 index 00000000000..b7e4b024433 --- /dev/null +++ b/queue-5.4/cxl-fix-kobject-memleak.patch @@ -0,0 +1,44 @@ +From a4cc9dcf2e93da3b4a4526fdc69546bf32cc2abd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 2 Jun 2020 20:07:33 +0800 +Subject: cxl: Fix kobject memleak + +From: Wang Hai + +[ Upstream commit 85c5cbeba8f4fb28e6b9bfb3e467718385f78f76 ] + +Currently the error return path from kobject_init_and_add() is not +followed by a call to kobject_put() - which means we are leaking +the kobject. + +Fix it by adding a call to kobject_put() in the error path of +kobject_init_and_add(). + +Fixes: b087e6190ddc ("cxl: Export optional AFU configuration record in sysfs") +Reported-by: Hulk Robot +Signed-off-by: Wang Hai +Acked-by: Andrew Donnellan +Acked-by: Frederic Barrat +Link: https://lore.kernel.org/r/20200602120733.5943-1-wanghai38@huawei.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/misc/cxl/sysfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/misc/cxl/sysfs.c b/drivers/misc/cxl/sysfs.c +index f0263d1a1fdf2..d97a243ad30c0 100644 +--- a/drivers/misc/cxl/sysfs.c ++++ b/drivers/misc/cxl/sysfs.c +@@ -624,7 +624,7 @@ static struct afu_config_record *cxl_sysfs_afu_new_cr(struct cxl_afu *afu, int c + rc = kobject_init_and_add(&cr->kobj, &afu_config_record_type, + &afu->dev.kobj, "cr%i", cr->cr); + if (rc) +- goto err; ++ goto err1; + + rc = sysfs_create_bin_file(&cr->kobj, &cr->config_attr); + if (rc) +-- +2.25.1 + diff --git a/queue-5.4/dlm-fix-kobject-memleak.patch b/queue-5.4/dlm-fix-kobject-memleak.patch new file mode 100644 index 00000000000..66c702ae5ff --- /dev/null +++ b/queue-5.4/dlm-fix-kobject-memleak.patch @@ -0,0 +1,52 @@ +From 35f211c4626c23ee753c34c7a1d24273ff4e2a15 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 15 Jun 2020 11:25:33 +0800 +Subject: dlm: Fix kobject memleak + +From: Wang Hai + +[ Upstream commit 0ffddafc3a3970ef7013696e7f36b3d378bc4c16 ] + +Currently the error return path from kobject_init_and_add() is not +followed by a call to kobject_put() - which means we are leaking +the kobject. + +Set do_unreg = 1 before kobject_init_and_add() to ensure that +kobject_put() can be called in its error patch. + +Fixes: 901195ed7f4b ("Kobject: change GFS2 to use kobject_init_and_add") +Reported-by: Hulk Robot +Signed-off-by: Wang Hai +Signed-off-by: David Teigland +Signed-off-by: Sasha Levin +--- + fs/dlm/lockspace.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c +index afb8340918b86..c689359ca532b 100644 +--- a/fs/dlm/lockspace.c ++++ b/fs/dlm/lockspace.c +@@ -632,6 +632,9 @@ static int new_lockspace(const char *name, const char *cluster, + wait_event(ls->ls_recover_lock_wait, + test_bit(LSFL_RECOVER_LOCK, &ls->ls_flags)); + ++ /* let kobject handle freeing of ls if there's an error */ ++ do_unreg = 1; ++ + ls->ls_kobj.kset = dlm_kset; + error = kobject_init_and_add(&ls->ls_kobj, &dlm_ktype, NULL, + "%s", ls->ls_name); +@@ -639,9 +642,6 @@ static int new_lockspace(const char *name, const char *cluster, + goto out_recoverd; + kobject_uevent(&ls->ls_kobj, KOBJ_ADD); + +- /* let kobject handle freeing of ls if there's an error */ +- do_unreg = 1; +- + /* This uevent triggers dlm_controld in userspace to add us to the + group of nodes that are members of this lockspace (managed by the + cluster infrastructure.) Once it's done that, it tells us who the +-- +2.25.1 + diff --git a/queue-5.4/drm-amd-powerplay-fix-compile-error-with-arch-arc.patch b/queue-5.4/drm-amd-powerplay-fix-compile-error-with-arch-arc.patch new file mode 100644 index 00000000000..b5d28901f6c --- /dev/null +++ b/queue-5.4/drm-amd-powerplay-fix-compile-error-with-arch-arc.patch @@ -0,0 +1,43 @@ +From a90d1c20476dad80fb98641f6852f2e3758e6b56 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 28 Jun 2020 19:12:42 +0800 +Subject: drm/amd/powerplay: fix compile error with ARCH=arc + +From: Evan Quan + +[ Upstream commit 9822ba2ead1baa3de4860ad9472f652c4cc78c9c ] + +Fix the compile error below: +drivers/gpu/drm/amd/amdgpu/../powerplay/smu_v11_0.c: In function 'smu_v11_0_init_microcode': +>> arch/arc/include/asm/bug.h:22:2: error: implicit declaration of function 'pr_warn'; did you mean 'pci_warn'? [-Werror=implicit-function-declaration] + 22 | pr_warn("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __func__); \ + | ^~~~~~~ +drivers/gpu/drm/amd/amdgpu/../powerplay/smu_v11_0.c:176:3: note: in expansion of macro 'BUG' + 176 | BUG(); + +Reported-by: kernel test robot +Signed-off-by: Evan Quan +Acked-by: Alex Deucher +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c +index 0922d9cd858a0..c4d8c52c6b9ca 100644 +--- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c ++++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c +@@ -171,7 +171,8 @@ static int smu_v11_0_init_microcode(struct smu_context *smu) + chip_name = "navi12"; + break; + default: +- BUG(); ++ dev_err(adev->dev, "Unsupported ASIC type %d\n", adev->asic_type); ++ return -EINVAL; + } + + snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_smc.bin", chip_name); +-- +2.25.1 + diff --git a/queue-5.4/drm-amdgpu-avoid-dereferencing-a-null-pointer.patch b/queue-5.4/drm-amdgpu-avoid-dereferencing-a-null-pointer.patch new file mode 100644 index 00000000000..85927eb3efc --- /dev/null +++ b/queue-5.4/drm-amdgpu-avoid-dereferencing-a-null-pointer.patch @@ -0,0 +1,79 @@ +From 9412f2c38e804ec4911f63d2b24914aac98e42cc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 5 Jun 2019 16:30:13 +0800 +Subject: drm/amdgpu: avoid dereferencing a NULL pointer +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Jack Xiao + +[ Upstream commit 55611b507fd6453d26030c0c0619fdf0c262766d ] + +Check if irq_src is NULL to avoid dereferencing a NULL pointer, +for MES ring is uneccessary to recieve an interrupt notification. + +Signed-off-by: Jack Xiao +Acked-by: Alex Deucher +Reviewed-by: Hawking Zhang +Reviewed-by: Christian König +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +index 23085b352cf2d..c212d5fc665c6 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +@@ -404,7 +404,9 @@ int amdgpu_fence_driver_start_ring(struct amdgpu_ring *ring, + ring->fence_drv.gpu_addr = adev->uvd.inst[ring->me].gpu_addr + index; + } + amdgpu_fence_write(ring, atomic_read(&ring->fence_drv.last_seq)); +- amdgpu_irq_get(adev, irq_src, irq_type); ++ ++ if (irq_src) ++ amdgpu_irq_get(adev, irq_src, irq_type); + + ring->fence_drv.irq_src = irq_src; + ring->fence_drv.irq_type = irq_type; +@@ -539,8 +541,9 @@ void amdgpu_fence_driver_fini(struct amdgpu_device *adev) + /* no need to trigger GPU reset as we are unloading */ + amdgpu_fence_driver_force_completion(ring); + } +- amdgpu_irq_put(adev, ring->fence_drv.irq_src, +- ring->fence_drv.irq_type); ++ if (ring->fence_drv.irq_src) ++ amdgpu_irq_put(adev, ring->fence_drv.irq_src, ++ ring->fence_drv.irq_type); + drm_sched_fini(&ring->sched); + del_timer_sync(&ring->fence_drv.fallback_timer); + for (j = 0; j <= ring->fence_drv.num_fences_mask; ++j) +@@ -576,8 +579,9 @@ void amdgpu_fence_driver_suspend(struct amdgpu_device *adev) + } + + /* disable the interrupt */ +- amdgpu_irq_put(adev, ring->fence_drv.irq_src, +- ring->fence_drv.irq_type); ++ if (ring->fence_drv.irq_src) ++ amdgpu_irq_put(adev, ring->fence_drv.irq_src, ++ ring->fence_drv.irq_type); + } + } + +@@ -603,8 +607,9 @@ void amdgpu_fence_driver_resume(struct amdgpu_device *adev) + continue; + + /* enable the interrupt */ +- amdgpu_irq_get(adev, ring->fence_drv.irq_src, +- ring->fence_drv.irq_type); ++ if (ring->fence_drv.irq_src) ++ amdgpu_irq_get(adev, ring->fence_drv.irq_src, ++ ring->fence_drv.irq_type); + } + } + +-- +2.25.1 + diff --git a/queue-5.4/drm-amdgpu-display-bail-early-in-dm_pp_get_static_cl.patch b/queue-5.4/drm-amdgpu-display-bail-early-in-dm_pp_get_static_cl.patch new file mode 100644 index 00000000000..0f852145db1 --- /dev/null +++ b/queue-5.4/drm-amdgpu-display-bail-early-in-dm_pp_get_static_cl.patch @@ -0,0 +1,36 @@ +From 810ecd3806f1059834dade1afca79b2bc62347eb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 17 Jun 2020 16:33:47 -0400 +Subject: drm/amdgpu/display bail early in dm_pp_get_static_clocks + +From: Alex Deucher + +[ Upstream commit 376814f5fcf1aadda501d1413d56e8af85d19a97 ] + +If there are no supported callbacks. We'll fall back to the +nominal clocks. + +Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1170 +Reviewed-by: Evan Quan +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c +index 785322cd4c6c9..7241d4c207789 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c +@@ -530,6 +530,8 @@ bool dm_pp_get_static_clocks( + &pp_clk_info); + else if (adev->smu.funcs) + ret = smu_get_current_clocks(&adev->smu, &pp_clk_info); ++ else ++ return false; + if (ret) + return false; + +-- +2.25.1 + diff --git a/queue-5.4/drm-arm-fix-unintentional-integer-overflow-on-left-s.patch b/queue-5.4/drm-arm-fix-unintentional-integer-overflow-on-left-s.patch new file mode 100644 index 00000000000..bc632fe402f --- /dev/null +++ b/queue-5.4/drm-arm-fix-unintentional-integer-overflow-on-left-s.patch @@ -0,0 +1,41 @@ +From 861894999decd1f6be097d3f7048aa0bc85aafcc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 18 Jun 2020 11:04:00 +0100 +Subject: drm/arm: fix unintentional integer overflow on left shift + +From: Colin Ian King + +[ Upstream commit 5f368ddea6fec519bdb93b5368f6a844b6ea27a6 ] + +Shifting the integer value 1 is evaluated using 32-bit arithmetic +and then used in an expression that expects a long value leads to +a potential integer overflow. Fix this by using the BIT macro to +perform the shift to avoid the overflow. + +Addresses-Coverity: ("Unintentional integer overflow") +Fixes: ad49f8602fe8 ("drm/arm: Add support for Mali Display Processors") +Signed-off-by: Colin Ian King +Acked-by: Liviu Dudau +Signed-off-by: Liviu Dudau +Link: https://patchwork.freedesktop.org/patch/msgid/20200618100400.11464-1-colin.king@canonical.com +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/arm/malidp_planes.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/arm/malidp_planes.c b/drivers/gpu/drm/arm/malidp_planes.c +index 3c70a53813bf2..0b2bb485d9be3 100644 +--- a/drivers/gpu/drm/arm/malidp_planes.c ++++ b/drivers/gpu/drm/arm/malidp_planes.c +@@ -928,7 +928,7 @@ int malidp_de_planes_init(struct drm_device *drm) + const struct malidp_hw_regmap *map = &malidp->dev->hw->map; + struct malidp_plane *plane = NULL; + enum drm_plane_type plane_type; +- unsigned long crtcs = 1 << drm->mode_config.num_crtc; ++ unsigned long crtcs = BIT(drm->mode_config.num_crtc); + unsigned long flags = DRM_MODE_ROTATE_0 | DRM_MODE_ROTATE_90 | DRM_MODE_ROTATE_180 | + DRM_MODE_ROTATE_270 | DRM_MODE_REFLECT_X | DRM_MODE_REFLECT_Y; + unsigned int blend_caps = BIT(DRM_MODE_BLEND_PIXEL_NONE) | +-- +2.25.1 + diff --git a/queue-5.4/drm-bridge-sil_sii8620-initialize-return-of-sii8620_.patch b/queue-5.4/drm-bridge-sil_sii8620-initialize-return-of-sii8620_.patch new file mode 100644 index 00000000000..32b7d4aa67a --- /dev/null +++ b/queue-5.4/drm-bridge-sil_sii8620-initialize-return-of-sii8620_.patch @@ -0,0 +1,49 @@ +From 49026fc255d05a30e9b8f9dabda3d8840b536992 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 12 Jul 2020 08:24:53 -0700 +Subject: drm/bridge: sil_sii8620: initialize return of sii8620_readb + +From: Tom Rix + +[ Upstream commit 02cd2d3144653e6e2a0c7ccaa73311e48e2dc686 ] + +clang static analysis flags this error + +sil-sii8620.c:184:2: warning: Undefined or garbage value + returned to caller [core.uninitialized.UndefReturn] + return ret; + ^~~~~~~~~~ + +sii8620_readb calls sii8620_read_buf. +sii8620_read_buf can return without setting its output +pararmeter 'ret'. + +So initialize ret. + +Fixes: ce6e153f414a ("drm/bridge: add Silicon Image SiI8620 driver") +Signed-off-by: Tom Rix +Reviewed-by: Laurent Pinchart +Reviewed-by: Andrzej Hajda +Signed-off-by: Sam Ravnborg +Link: https://patchwork.freedesktop.org/patch/msgid/20200712152453.27510-1-trix@redhat.com +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/bridge/sil-sii8620.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/bridge/sil-sii8620.c b/drivers/gpu/drm/bridge/sil-sii8620.c +index bd3165ee53541..04431dbac4a4f 100644 +--- a/drivers/gpu/drm/bridge/sil-sii8620.c ++++ b/drivers/gpu/drm/bridge/sil-sii8620.c +@@ -177,7 +177,7 @@ static void sii8620_read_buf(struct sii8620 *ctx, u16 addr, u8 *buf, int len) + + static u8 sii8620_readb(struct sii8620 *ctx, u16 addr) + { +- u8 ret; ++ u8 ret = 0; + + sii8620_read_buf(ctx, addr, &ret, 1); + return ret; +-- +2.25.1 + diff --git a/queue-5.4/drm-bridge-ti-sn65dsi86-clear-old-error-bits-before-.patch b/queue-5.4/drm-bridge-ti-sn65dsi86-clear-old-error-bits-before-.patch new file mode 100644 index 00000000000..725a3fa0fbc --- /dev/null +++ b/queue-5.4/drm-bridge-ti-sn65dsi86-clear-old-error-bits-before-.patch @@ -0,0 +1,46 @@ +From 42e3450ee079c19a882481c7bd83d03918b3248c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 8 May 2020 16:33:29 -0700 +Subject: drm/bridge: ti-sn65dsi86: Clear old error bits before AUX transfers + +From: Douglas Anderson + +[ Upstream commit baef4d56195b6d6e0f681f6eac03d8c6db011d34 ] + +The AUX channel transfer error bits in the status register are latched +and need to be cleared. Clear them before doing our transfer so we +don't see old bits and get confused. + +Without this patch having a single failure would mean that all future +transfers would look like they failed. + +Fixes: b814ec6d4535 ("drm/bridge: ti-sn65dsi86: Implement AUX channel") +Signed-off-by: Douglas Anderson +Reviewed-by: Rob Clark +Signed-off-by: Sam Ravnborg +Link: https://patchwork.freedesktop.org/patch/msgid/20200508163314.1.Idfa69d5d3fc9623083c0ff78572fea87dccb199c@changeid +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c +index 0a580957c8cf1..f1de4bb6558ca 100644 +--- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c ++++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c +@@ -647,6 +647,12 @@ static ssize_t ti_sn_aux_transfer(struct drm_dp_aux *aux, + buf[i]); + } + ++ /* Clear old status bits before start so we don't get confused */ ++ regmap_write(pdata->regmap, SN_AUX_CMD_STATUS_REG, ++ AUX_IRQ_STATUS_NAT_I2C_FAIL | ++ AUX_IRQ_STATUS_AUX_RPLY_TOUT | ++ AUX_IRQ_STATUS_AUX_SHORT); ++ + regmap_write(pdata->regmap, SN_AUX_CMD_REG, request_val | AUX_CMD_SEND); + + ret = regmap_read_poll_timeout(pdata->regmap, SN_AUX_CMD_REG, val, +-- +2.25.1 + diff --git a/queue-5.4/drm-debugfs-fix-plain-echo-to-connector-force-attrib.patch b/queue-5.4/drm-debugfs-fix-plain-echo-to-connector-force-attrib.patch new file mode 100644 index 00000000000..f61db09fffc --- /dev/null +++ b/queue-5.4/drm-debugfs-fix-plain-echo-to-connector-force-attrib.patch @@ -0,0 +1,51 @@ +From 6ea6ae263205fb6c9099bbf4d9c3889ad03c4fe6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 17 Aug 2017 12:43:07 +0200 +Subject: drm/debugfs: fix plain echo to connector "force" attribute + +From: Michael Tretter + +[ Upstream commit c704b17071c4dc571dca3af4e4151dac51de081a ] + +Using plain echo to set the "force" connector attribute fails with +-EINVAL, because echo appends a newline to the output. + +Replace strcmp with sysfs_streq to also accept strings that end with a +newline. + +v2: use sysfs_streq instead of stripping trailing whitespace + +Signed-off-by: Michael Tretter +Reviewed-by: Jani Nikula +Signed-off-by: Emil Velikov +Link: https://patchwork.freedesktop.org/patch/msgid/20170817104307.17124-1-m.tretter@pengutronix.de +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/drm_debugfs.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c +index eab0f2687cd6e..00debd02c3220 100644 +--- a/drivers/gpu/drm/drm_debugfs.c ++++ b/drivers/gpu/drm/drm_debugfs.c +@@ -337,13 +337,13 @@ static ssize_t connector_write(struct file *file, const char __user *ubuf, + + buf[len] = '\0'; + +- if (!strcmp(buf, "on")) ++ if (sysfs_streq(buf, "on")) + connector->force = DRM_FORCE_ON; +- else if (!strcmp(buf, "digital")) ++ else if (sysfs_streq(buf, "digital")) + connector->force = DRM_FORCE_ON_DIGITAL; +- else if (!strcmp(buf, "off")) ++ else if (sysfs_streq(buf, "off")) + connector->force = DRM_FORCE_OFF; +- else if (!strcmp(buf, "unspecified")) ++ else if (sysfs_streq(buf, "unspecified")) + connector->force = DRM_FORCE_UNSPECIFIED; + else + return -EINVAL; +-- +2.25.1 + diff --git a/queue-5.4/drm-etnaviv-fix-error-path-on-failure-to-enable-bus-.patch b/queue-5.4/drm-etnaviv-fix-error-path-on-failure-to-enable-bus-.patch new file mode 100644 index 00000000000..e5e64c9bf64 --- /dev/null +++ b/queue-5.4/drm-etnaviv-fix-error-path-on-failure-to-enable-bus-.patch @@ -0,0 +1,47 @@ +From d5f846dac8b67c203a4c3100ec6b93bca5de5351 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 16 Jun 2020 23:21:24 +0200 +Subject: drm/etnaviv: Fix error path on failure to enable bus clk + +From: Lubomir Rintel + +[ Upstream commit f8794feaf65cdc97767604cf864775d20b97f397 ] + +Since commit 65f037e8e908 ("drm/etnaviv: add support for slave interface +clock") the reg clock is enabled before the bus clock and we need to undo +its enablement on error. + +Fixes: 65f037e8e908 ("drm/etnaviv: add support for slave interface clock") +Signed-off-by: Lubomir Rintel +Signed-off-by: Lucas Stach +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +index 8a26ea2a53348..85de8551ce866 100644 +--- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c ++++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +@@ -1463,7 +1463,7 @@ static int etnaviv_gpu_clk_enable(struct etnaviv_gpu *gpu) + if (gpu->clk_bus) { + ret = clk_prepare_enable(gpu->clk_bus); + if (ret) +- return ret; ++ goto disable_clk_reg; + } + + if (gpu->clk_core) { +@@ -1486,6 +1486,9 @@ static int etnaviv_gpu_clk_enable(struct etnaviv_gpu *gpu) + disable_clk_bus: + if (gpu->clk_bus) + clk_disable_unprepare(gpu->clk_bus); ++disable_clk_reg: ++ if (gpu->clk_reg) ++ clk_disable_unprepare(gpu->clk_reg); + + return ret; + } +-- +2.25.1 + diff --git a/queue-5.4/drm-etnaviv-fix-ref-count-leak-via-pm_runtime_get_sy.patch b/queue-5.4/drm-etnaviv-fix-ref-count-leak-via-pm_runtime_get_sy.patch new file mode 100644 index 00000000000..c357a6e75c8 --- /dev/null +++ b/queue-5.4/drm-etnaviv-fix-ref-count-leak-via-pm_runtime_get_sy.patch @@ -0,0 +1,99 @@ +From 2cc2a5e6cf23b692059105ddc5b485d167e63934 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 15 Jun 2020 01:12:20 -0500 +Subject: drm/etnaviv: fix ref count leak via pm_runtime_get_sync + +From: Navid Emamdoost + +[ Upstream commit c5d5a32ead1e3a61a07a1e59eb52a53e4a6b2a7f ] + +in etnaviv_gpu_submit, etnaviv_gpu_recover_hang, etnaviv_gpu_debugfs, +and etnaviv_gpu_init the call to pm_runtime_get_sync increments the +counter even in case of failure, leading to incorrect ref count. +In case of failure, decrement the ref count before returning. + +Signed-off-by: Navid Emamdoost +Signed-off-by: Lucas Stach +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +index d47d1a8e02198..8a26ea2a53348 100644 +--- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c ++++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +@@ -713,7 +713,7 @@ int etnaviv_gpu_init(struct etnaviv_gpu *gpu) + ret = pm_runtime_get_sync(gpu->dev); + if (ret < 0) { + dev_err(gpu->dev, "Failed to enable GPU power domain\n"); +- return ret; ++ goto pm_put; + } + + etnaviv_hw_identify(gpu); +@@ -802,6 +802,7 @@ int etnaviv_gpu_init(struct etnaviv_gpu *gpu) + + fail: + pm_runtime_mark_last_busy(gpu->dev); ++pm_put: + pm_runtime_put_autosuspend(gpu->dev); + + return ret; +@@ -842,7 +843,7 @@ int etnaviv_gpu_debugfs(struct etnaviv_gpu *gpu, struct seq_file *m) + + ret = pm_runtime_get_sync(gpu->dev); + if (ret < 0) +- return ret; ++ goto pm_put; + + dma_lo = gpu_read(gpu, VIVS_FE_DMA_LOW); + dma_hi = gpu_read(gpu, VIVS_FE_DMA_HIGH); +@@ -965,6 +966,7 @@ int etnaviv_gpu_debugfs(struct etnaviv_gpu *gpu, struct seq_file *m) + ret = 0; + + pm_runtime_mark_last_busy(gpu->dev); ++pm_put: + pm_runtime_put_autosuspend(gpu->dev); + + return ret; +@@ -978,7 +980,7 @@ void etnaviv_gpu_recover_hang(struct etnaviv_gpu *gpu) + dev_err(gpu->dev, "recover hung GPU!\n"); + + if (pm_runtime_get_sync(gpu->dev) < 0) +- return; ++ goto pm_put; + + mutex_lock(&gpu->lock); + +@@ -997,6 +999,7 @@ void etnaviv_gpu_recover_hang(struct etnaviv_gpu *gpu) + + mutex_unlock(&gpu->lock); + pm_runtime_mark_last_busy(gpu->dev); ++pm_put: + pm_runtime_put_autosuspend(gpu->dev); + } + +@@ -1269,8 +1272,10 @@ struct dma_fence *etnaviv_gpu_submit(struct etnaviv_gem_submit *submit) + + if (!submit->runtime_resumed) { + ret = pm_runtime_get_sync(gpu->dev); +- if (ret < 0) ++ if (ret < 0) { ++ pm_runtime_put_noidle(gpu->dev); + return NULL; ++ } + submit->runtime_resumed = true; + } + +@@ -1287,6 +1292,7 @@ struct dma_fence *etnaviv_gpu_submit(struct etnaviv_gem_submit *submit) + ret = event_alloc(gpu, nr_events, event); + if (ret) { + DRM_ERROR("no free events\n"); ++ pm_runtime_put_noidle(gpu->dev); + return NULL; + } + +-- +2.25.1 + diff --git a/queue-5.4/drm-gem-fix-a-leak-in-drm_gem_objects_lookup.patch b/queue-5.4/drm-gem-fix-a-leak-in-drm_gem_objects_lookup.patch new file mode 100644 index 00000000000..4a08a6c29d3 --- /dev/null +++ b/queue-5.4/drm-gem-fix-a-leak-in-drm_gem_objects_lookup.patch @@ -0,0 +1,46 @@ +From 2311d448202a3ad64746ab26345e9157fa4ca68b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 20 Mar 2020 16:23:34 +0300 +Subject: drm/gem: Fix a leak in drm_gem_objects_lookup() + +From: Dan Carpenter + +[ Upstream commit ec0bb482de0ad5e4aba2a4537ea53eaeb77d11a6 ] + +If the "handles" allocation or the copy_from_user() fails then we leak +"objs". It's supposed to be freed in panfrost_job_cleanup(). + +Fixes: c117aa4d8701 ("drm: Add a drm_gem_objects_lookup helper") +Signed-off-by: Dan Carpenter +Signed-off-by: Emil Velikov +Link: https://patchwork.freedesktop.org/patch/msgid/20200320132334.GC95012@mwanda +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/drm_gem.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c +index 46ad14470d066..1fdc85a71cec4 100644 +--- a/drivers/gpu/drm/drm_gem.c ++++ b/drivers/gpu/drm/drm_gem.c +@@ -710,6 +710,8 @@ int drm_gem_objects_lookup(struct drm_file *filp, void __user *bo_handles, + if (!objs) + return -ENOMEM; + ++ *objs_out = objs; ++ + handles = kvmalloc_array(count, sizeof(u32), GFP_KERNEL); + if (!handles) { + ret = -ENOMEM; +@@ -723,8 +725,6 @@ int drm_gem_objects_lookup(struct drm_file *filp, void __user *bo_handles, + } + + ret = objects_lookup(filp, handles, count, objs); +- *objs_out = objs; +- + out: + kvfree(handles); + return ret; +-- +2.25.1 + diff --git a/queue-5.4/drm-imx-fix-use-after-free.patch b/queue-5.4/drm-imx-fix-use-after-free.patch new file mode 100644 index 00000000000..49edcb7eaf5 --- /dev/null +++ b/queue-5.4/drm-imx-fix-use-after-free.patch @@ -0,0 +1,273 @@ +From ee56c0878bd31b39c40d522f932e158262d8f08c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 11 Jun 2020 14:43:31 +0200 +Subject: drm/imx: fix use after free + +From: Philipp Zabel + +[ Upstream commit ba807c94f67fd64b3051199810d9e4dd209fdc00 ] + +Component driver structures allocated with devm_kmalloc() in bind() are +freed automatically after unbind(). Since the contained drm structures +are accessed afterwards in drm_mode_config_cleanup(), move the +allocation into probe() to extend the driver structure's lifetime to the +lifetime of the device. This should eventually be changed to use drm +resource managed allocations with lifetime of the drm device. + +We also need to ensure that all componets are available during the +unbind() so we need to call component_unbind_all() before we free +non-devres resources like planes. + +Note this patch fixes the the use after free bug but introduces a +possible boot loop issue. The issue is triggered if the HDMI support is +enabled and a component driver always return -EPROBE_DEFER, see +discussion [1] for more details. + +[1] https://lkml.org/lkml/2020/3/24/1467 + +Fixes: 17b5001b5143 ("imx-drm: convert to componentised device support") +Signed-off-by: Philipp Zabel +[m.felsch@pengutronix: fix imx_tve_probe()] +[m.felsch@pengutronix: resort component_unbind_all()) +[m.felsch@pengutronix: adapt commit message] +Signed-off-by: Marco Felsch +Signed-off-by: Philipp Zabel +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/imx/dw_hdmi-imx.c | 15 ++++++++++----- + drivers/gpu/drm/imx/imx-drm-core.c | 3 ++- + drivers/gpu/drm/imx/imx-ldb.c | 15 ++++++++++----- + drivers/gpu/drm/imx/imx-tve.c | 15 ++++++++++----- + drivers/gpu/drm/imx/ipuv3-crtc.c | 21 ++++++++++----------- + drivers/gpu/drm/imx/parallel-display.c | 15 ++++++++++----- + 6 files changed, 52 insertions(+), 32 deletions(-) + +diff --git a/drivers/gpu/drm/imx/dw_hdmi-imx.c b/drivers/gpu/drm/imx/dw_hdmi-imx.c +index f22cfbf9353ed..2e12a4a3bfa11 100644 +--- a/drivers/gpu/drm/imx/dw_hdmi-imx.c ++++ b/drivers/gpu/drm/imx/dw_hdmi-imx.c +@@ -212,9 +212,8 @@ static int dw_hdmi_imx_bind(struct device *dev, struct device *master, + if (!pdev->dev.of_node) + return -ENODEV; + +- hdmi = devm_kzalloc(&pdev->dev, sizeof(*hdmi), GFP_KERNEL); +- if (!hdmi) +- return -ENOMEM; ++ hdmi = dev_get_drvdata(dev); ++ memset(hdmi, 0, sizeof(*hdmi)); + + match = of_match_node(dw_hdmi_imx_dt_ids, pdev->dev.of_node); + plat_data = match->data; +@@ -239,8 +238,6 @@ static int dw_hdmi_imx_bind(struct device *dev, struct device *master, + drm_encoder_init(drm, encoder, &dw_hdmi_imx_encoder_funcs, + DRM_MODE_ENCODER_TMDS, NULL); + +- platform_set_drvdata(pdev, hdmi); +- + hdmi->hdmi = dw_hdmi_bind(pdev, encoder, plat_data); + + /* +@@ -270,6 +267,14 @@ static const struct component_ops dw_hdmi_imx_ops = { + + static int dw_hdmi_imx_probe(struct platform_device *pdev) + { ++ struct imx_hdmi *hdmi; ++ ++ hdmi = devm_kzalloc(&pdev->dev, sizeof(*hdmi), GFP_KERNEL); ++ if (!hdmi) ++ return -ENOMEM; ++ ++ platform_set_drvdata(pdev, hdmi); ++ + return component_add(&pdev->dev, &dw_hdmi_imx_ops); + } + +diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c +index da87c70e413b4..881c36d0f16bb 100644 +--- a/drivers/gpu/drm/imx/imx-drm-core.c ++++ b/drivers/gpu/drm/imx/imx-drm-core.c +@@ -281,9 +281,10 @@ static void imx_drm_unbind(struct device *dev) + + drm_kms_helper_poll_fini(drm); + ++ component_unbind_all(drm->dev, drm); ++ + drm_mode_config_cleanup(drm); + +- component_unbind_all(drm->dev, drm); + dev_set_drvdata(dev, NULL); + + drm_dev_put(drm); +diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c +index 695f307f36b28..9af5a08d5490f 100644 +--- a/drivers/gpu/drm/imx/imx-ldb.c ++++ b/drivers/gpu/drm/imx/imx-ldb.c +@@ -593,9 +593,8 @@ static int imx_ldb_bind(struct device *dev, struct device *master, void *data) + int ret; + int i; + +- imx_ldb = devm_kzalloc(dev, sizeof(*imx_ldb), GFP_KERNEL); +- if (!imx_ldb) +- return -ENOMEM; ++ imx_ldb = dev_get_drvdata(dev); ++ memset(imx_ldb, 0, sizeof(*imx_ldb)); + + imx_ldb->regmap = syscon_regmap_lookup_by_phandle(np, "gpr"); + if (IS_ERR(imx_ldb->regmap)) { +@@ -703,8 +702,6 @@ static int imx_ldb_bind(struct device *dev, struct device *master, void *data) + } + } + +- dev_set_drvdata(dev, imx_ldb); +- + return 0; + + free_child: +@@ -736,6 +733,14 @@ static const struct component_ops imx_ldb_ops = { + + static int imx_ldb_probe(struct platform_device *pdev) + { ++ struct imx_ldb *imx_ldb; ++ ++ imx_ldb = devm_kzalloc(&pdev->dev, sizeof(*imx_ldb), GFP_KERNEL); ++ if (!imx_ldb) ++ return -ENOMEM; ++ ++ platform_set_drvdata(pdev, imx_ldb); ++ + return component_add(&pdev->dev, &imx_ldb_ops); + } + +diff --git a/drivers/gpu/drm/imx/imx-tve.c b/drivers/gpu/drm/imx/imx-tve.c +index 5bbfaa2cd0f47..9fd4b464e829c 100644 +--- a/drivers/gpu/drm/imx/imx-tve.c ++++ b/drivers/gpu/drm/imx/imx-tve.c +@@ -546,9 +546,8 @@ static int imx_tve_bind(struct device *dev, struct device *master, void *data) + int irq; + int ret; + +- tve = devm_kzalloc(dev, sizeof(*tve), GFP_KERNEL); +- if (!tve) +- return -ENOMEM; ++ tve = dev_get_drvdata(dev); ++ memset(tve, 0, sizeof(*tve)); + + tve->dev = dev; + spin_lock_init(&tve->lock); +@@ -659,8 +658,6 @@ static int imx_tve_bind(struct device *dev, struct device *master, void *data) + if (ret) + return ret; + +- dev_set_drvdata(dev, tve); +- + return 0; + } + +@@ -680,6 +677,14 @@ static const struct component_ops imx_tve_ops = { + + static int imx_tve_probe(struct platform_device *pdev) + { ++ struct imx_tve *tve; ++ ++ tve = devm_kzalloc(&pdev->dev, sizeof(*tve), GFP_KERNEL); ++ if (!tve) ++ return -ENOMEM; ++ ++ platform_set_drvdata(pdev, tve); ++ + return component_add(&pdev->dev, &imx_tve_ops); + } + +diff --git a/drivers/gpu/drm/imx/ipuv3-crtc.c b/drivers/gpu/drm/imx/ipuv3-crtc.c +index 63c0284f8b3c0..2256c9789fc2c 100644 +--- a/drivers/gpu/drm/imx/ipuv3-crtc.c ++++ b/drivers/gpu/drm/imx/ipuv3-crtc.c +@@ -438,21 +438,13 @@ static int ipu_drm_bind(struct device *dev, struct device *master, void *data) + struct ipu_client_platformdata *pdata = dev->platform_data; + struct drm_device *drm = data; + struct ipu_crtc *ipu_crtc; +- int ret; + +- ipu_crtc = devm_kzalloc(dev, sizeof(*ipu_crtc), GFP_KERNEL); +- if (!ipu_crtc) +- return -ENOMEM; ++ ipu_crtc = dev_get_drvdata(dev); ++ memset(ipu_crtc, 0, sizeof(*ipu_crtc)); + + ipu_crtc->dev = dev; + +- ret = ipu_crtc_init(ipu_crtc, pdata, drm); +- if (ret) +- return ret; +- +- dev_set_drvdata(dev, ipu_crtc); +- +- return 0; ++ return ipu_crtc_init(ipu_crtc, pdata, drm); + } + + static void ipu_drm_unbind(struct device *dev, struct device *master, +@@ -474,6 +466,7 @@ static const struct component_ops ipu_crtc_ops = { + static int ipu_drm_probe(struct platform_device *pdev) + { + struct device *dev = &pdev->dev; ++ struct ipu_crtc *ipu_crtc; + int ret; + + if (!dev->platform_data) +@@ -483,6 +476,12 @@ static int ipu_drm_probe(struct platform_device *pdev) + if (ret) + return ret; + ++ ipu_crtc = devm_kzalloc(dev, sizeof(*ipu_crtc), GFP_KERNEL); ++ if (!ipu_crtc) ++ return -ENOMEM; ++ ++ dev_set_drvdata(dev, ipu_crtc); ++ + return component_add(dev, &ipu_crtc_ops); + } + +diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c +index e7ce17503ae17..be55548f352af 100644 +--- a/drivers/gpu/drm/imx/parallel-display.c ++++ b/drivers/gpu/drm/imx/parallel-display.c +@@ -204,9 +204,8 @@ static int imx_pd_bind(struct device *dev, struct device *master, void *data) + u32 bus_format = 0; + const char *fmt; + +- imxpd = devm_kzalloc(dev, sizeof(*imxpd), GFP_KERNEL); +- if (!imxpd) +- return -ENOMEM; ++ imxpd = dev_get_drvdata(dev); ++ memset(imxpd, 0, sizeof(*imxpd)); + + edidp = of_get_property(np, "edid", &imxpd->edid_len); + if (edidp) +@@ -236,8 +235,6 @@ static int imx_pd_bind(struct device *dev, struct device *master, void *data) + if (ret) + return ret; + +- dev_set_drvdata(dev, imxpd); +- + return 0; + } + +@@ -259,6 +256,14 @@ static const struct component_ops imx_pd_ops = { + + static int imx_pd_probe(struct platform_device *pdev) + { ++ struct imx_parallel_display *imxpd; ++ ++ imxpd = devm_kzalloc(&pdev->dev, sizeof(*imxpd), GFP_KERNEL); ++ if (!imxpd) ++ return -ENOMEM; ++ ++ platform_set_drvdata(pdev, imxpd); ++ + return component_add(&pdev->dev, &imx_pd_ops); + } + +-- +2.25.1 + diff --git a/queue-5.4/drm-imx-tve-fix-regulator_disable-error-path.patch b/queue-5.4/drm-imx-tve-fix-regulator_disable-error-path.patch new file mode 100644 index 00000000000..fd92a62417e --- /dev/null +++ b/queue-5.4/drm-imx-tve-fix-regulator_disable-error-path.patch @@ -0,0 +1,70 @@ +From a6756df103534e0afd8703cb5ba86ca72b7f2059 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 11 Jun 2020 14:43:32 +0200 +Subject: drm/imx: tve: fix regulator_disable error path + +From: Marco Felsch + +[ Upstream commit 7bb58b987fee26da2a1665c01033022624986b7c ] + +Add missing regulator_disable() as devm_action to avoid dedicated +unbind() callback and fix the missing error handling. + +Fixes: fcbc51e54d2a ("staging: drm/imx: Add support for Television Encoder (TVEv2)") +Signed-off-by: Marco Felsch +Signed-off-by: Philipp Zabel +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/imx/imx-tve.c | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/drivers/gpu/drm/imx/imx-tve.c b/drivers/gpu/drm/imx/imx-tve.c +index 9fd4b464e829c..f91c3eb7697bc 100644 +--- a/drivers/gpu/drm/imx/imx-tve.c ++++ b/drivers/gpu/drm/imx/imx-tve.c +@@ -494,6 +494,13 @@ static int imx_tve_register(struct drm_device *drm, struct imx_tve *tve) + return 0; + } + ++static void imx_tve_disable_regulator(void *data) ++{ ++ struct imx_tve *tve = data; ++ ++ regulator_disable(tve->dac_reg); ++} ++ + static bool imx_tve_readable_reg(struct device *dev, unsigned int reg) + { + return (reg % 4 == 0) && (reg <= 0xdc); +@@ -617,6 +624,9 @@ static int imx_tve_bind(struct device *dev, struct device *master, void *data) + ret = regulator_enable(tve->dac_reg); + if (ret) + return ret; ++ ret = devm_add_action_or_reset(dev, imx_tve_disable_regulator, tve); ++ if (ret) ++ return ret; + } + + tve->clk = devm_clk_get(dev, "tve"); +@@ -661,18 +671,8 @@ static int imx_tve_bind(struct device *dev, struct device *master, void *data) + return 0; + } + +-static void imx_tve_unbind(struct device *dev, struct device *master, +- void *data) +-{ +- struct imx_tve *tve = dev_get_drvdata(dev); +- +- if (!IS_ERR(tve->dac_reg)) +- regulator_disable(tve->dac_reg); +-} +- + static const struct component_ops imx_tve_ops = { + .bind = imx_tve_bind, +- .unbind = imx_tve_unbind, + }; + + static int imx_tve_probe(struct platform_device *pdev) +-- +2.25.1 + diff --git a/queue-5.4/drm-mipi-use-dcs-write-for-mipi_dsi_dcs_set_tear_sca.patch b/queue-5.4/drm-mipi-use-dcs-write-for-mipi_dsi_dcs_set_tear_sca.patch new file mode 100644 index 00000000000..6f401039024 --- /dev/null +++ b/queue-5.4/drm-mipi-use-dcs-write-for-mipi_dsi_dcs_set_tear_sca.patch @@ -0,0 +1,50 @@ +From 2d23ecf51cb66e4a66961b2c654c08267b35e126 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 5 May 2020 17:03:29 +0100 +Subject: drm/mipi: use dcs write for mipi_dsi_dcs_set_tear_scanline + +From: Emil Velikov + +[ Upstream commit 7a05c3b6d24b8460b3cec436cf1d33fac43c8450 ] + +The helper uses the MIPI_DCS_SET_TEAR_SCANLINE, although it's currently +using the generic write. This does not look right. + +Perhaps some platforms don't distinguish between the two writers? + +Cc: Robert Chiras +Cc: Vinay Simha BN +Cc: Jani Nikula +Cc: Thierry Reding +Fixes: e83950816367 ("drm/dsi: Implement set tear scanline") +Signed-off-by: Emil Velikov +Reviewed-by: Thierry Reding +Signed-off-by: Sam Ravnborg +Link: https://patchwork.freedesktop.org/patch/msgid/20200505160329.2976059-3-emil.l.velikov@gmail.com +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/drm_mipi_dsi.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/drm_mipi_dsi.c b/drivers/gpu/drm/drm_mipi_dsi.c +index bd2498bbd74ac..b99f96dcc6f1e 100644 +--- a/drivers/gpu/drm/drm_mipi_dsi.c ++++ b/drivers/gpu/drm/drm_mipi_dsi.c +@@ -1029,11 +1029,11 @@ EXPORT_SYMBOL(mipi_dsi_dcs_set_pixel_format); + */ + int mipi_dsi_dcs_set_tear_scanline(struct mipi_dsi_device *dsi, u16 scanline) + { +- u8 payload[3] = { MIPI_DCS_SET_TEAR_SCANLINE, scanline >> 8, +- scanline & 0xff }; ++ u8 payload[2] = { scanline >> 8, scanline & 0xff }; + ssize_t err; + +- err = mipi_dsi_generic_write(dsi, payload, sizeof(payload)); ++ err = mipi_dsi_dcs_write(dsi, MIPI_DCS_SET_TEAR_SCANLINE, payload, ++ sizeof(payload)); + if (err < 0) + return err; + +-- +2.25.1 + diff --git a/queue-5.4/drm-msm-a6xx-fix-gpu-failure-after-system-resume.patch b/queue-5.4/drm-msm-a6xx-fix-gpu-failure-after-system-resume.patch new file mode 100644 index 00000000000..166db92bcf5 --- /dev/null +++ b/queue-5.4/drm-msm-a6xx-fix-gpu-failure-after-system-resume.patch @@ -0,0 +1,73 @@ +From 6a68ddd6add3fc76ffa5f3b46090741480d68ce0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 17 Jul 2020 20:04:18 +0530 +Subject: drm: msm: a6xx: fix gpu failure after system resume + +From: Akhil P Oommen + +[ Upstream commit 57c0bd517c06b088106b0236ed604056c8e06da5 ] + +On targets where GMU is available, GMU takes over the ownership of GX GDSC +during its initialization. So, move the refcount-get on GX PD before we +initialize the GMU. This ensures that nobody can collapse the GX GDSC +once GMU owns the GX GDSC. This patch fixes some GMU OOB errors seen +during GPU wake up during a system resume. + +Reported-by: Matthias Kaehlcke +Signed-off-by: Akhil P Oommen +Tested-by: Matthias Kaehlcke +Reviewed-by: Jordan Crouse +Signed-off-by: Rob Clark +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) + +diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c +index e62b286947a7f..9ea748667fab0 100644 +--- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c ++++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c +@@ -713,10 +713,19 @@ int a6xx_gmu_resume(struct a6xx_gpu *a6xx_gpu) + /* Turn on the resources */ + pm_runtime_get_sync(gmu->dev); + ++ /* ++ * "enable" the GX power domain which won't actually do anything but it ++ * will make sure that the refcounting is correct in case we need to ++ * bring down the GX after a GMU failure ++ */ ++ if (!IS_ERR_OR_NULL(gmu->gxpd)) ++ pm_runtime_get_sync(gmu->gxpd); ++ + /* Use a known rate to bring up the GMU */ + clk_set_rate(gmu->core_clk, 200000000); + ret = clk_bulk_prepare_enable(gmu->nr_clocks, gmu->clocks); + if (ret) { ++ pm_runtime_put(gmu->gxpd); + pm_runtime_put(gmu->dev); + return ret; + } +@@ -752,19 +761,12 @@ int a6xx_gmu_resume(struct a6xx_gpu *a6xx_gpu) + /* Set the GPU to the highest power frequency */ + __a6xx_gmu_set_freq(gmu, gmu->nr_gpu_freqs - 1); + +- /* +- * "enable" the GX power domain which won't actually do anything but it +- * will make sure that the refcounting is correct in case we need to +- * bring down the GX after a GMU failure +- */ +- if (!IS_ERR_OR_NULL(gmu->gxpd)) +- pm_runtime_get(gmu->gxpd); +- + out: + /* On failure, shut down the GMU to leave it in a good state */ + if (ret) { + disable_irq(gmu->gmu_irq); + a6xx_rpmh_stop(gmu); ++ pm_runtime_put(gmu->gxpd); + pm_runtime_put(gmu->dev); + } + +-- +2.25.1 + diff --git a/queue-5.4/drm-msm-fix-a-null-pointer-access-in-msm_gem_shrinke.patch b/queue-5.4/drm-msm-fix-a-null-pointer-access-in-msm_gem_shrinke.patch new file mode 100644 index 00000000000..f0ad1e77563 --- /dev/null +++ b/queue-5.4/drm-msm-fix-a-null-pointer-access-in-msm_gem_shrinke.patch @@ -0,0 +1,173 @@ +From 66785168409ffe6f909e5696deae92081bdd8f08 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 10 Jul 2020 02:01:55 +0530 +Subject: drm/msm: Fix a null pointer access in msm_gem_shrinker_count() + +From: Akhil P Oommen + +[ Upstream commit 3cbdc8d8b7f39a7af3ea7b8dfa75caaebfda4e56 ] + +Adding an msm_gem_object object to the inactive_list before completing +its initialization is a bad idea because shrinker may pick it up from the +inactive_list. Fix this by making sure that the initialization is complete +before moving the msm_obj object to the inactive list. + +This patch fixes the below error: +[10027.553044] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000068 +[10027.573305] Mem abort info: +[10027.590160] ESR = 0x96000006 +[10027.597905] EC = 0x25: DABT (current EL), IL = 32 bits +[10027.614430] SET = 0, FnV = 0 +[10027.624427] EA = 0, S1PTW = 0 +[10027.632722] Data abort info: +[10027.638039] ISV = 0, ISS = 0x00000006 +[10027.647459] CM = 0, WnR = 0 +[10027.654345] user pgtable: 4k pages, 39-bit VAs, pgdp=00000001e3a6a000 +[10027.672681] [0000000000000068] pgd=0000000198c31003, pud=0000000198c31003, pmd=0000000000000000 +[10027.693900] Internal error: Oops: 96000006 [#1] PREEMPT SMP +[10027.738261] CPU: 3 PID: 214 Comm: kswapd0 Tainted: G S 5.4.40 #1 +[10027.745766] Hardware name: Qualcomm Technologies, Inc. SC7180 IDP (DT) +[10027.752472] pstate: 80c00009 (Nzcv daif +PAN +UAO) +[10027.757409] pc : mutex_is_locked+0x14/0x2c +[10027.761626] lr : msm_gem_shrinker_count+0x70/0xec +[10027.766454] sp : ffffffc011323ad0 +[10027.769867] x29: ffffffc011323ad0 x28: ffffffe677e4b878 +[10027.775324] x27: 0000000000000cc0 x26: 0000000000000000 +[10027.780783] x25: ffffff817114a708 x24: 0000000000000008 +[10027.786242] x23: ffffff8023ab7170 x22: 0000000000000001 +[10027.791701] x21: ffffff817114a080 x20: 0000000000000119 +[10027.797160] x19: 0000000000000068 x18: 00000000000003bc +[10027.802621] x17: 0000000004a34210 x16: 00000000000000c0 +[10027.808083] x15: 0000000000000000 x14: 0000000000000000 +[10027.813542] x13: ffffffe677e0a3c0 x12: 0000000000000000 +[10027.819000] x11: 0000000000000000 x10: ffffff8174b94340 +[10027.824461] x9 : 0000000000000000 x8 : 0000000000000000 +[10027.829919] x7 : 00000000000001fc x6 : ffffffc011323c88 +[10027.835373] x5 : 0000000000000001 x4 : ffffffc011323d80 +[10027.840832] x3 : ffffffff0477b348 x2 : 0000000000000000 +[10027.846290] x1 : ffffffc011323b68 x0 : 0000000000000068 +[10027.851748] Call trace: +[10027.854264] mutex_is_locked+0x14/0x2c +[10027.858121] msm_gem_shrinker_count+0x70/0xec +[10027.862603] shrink_slab+0xc0/0x4b4 +[10027.866187] shrink_node+0x4a8/0x818 +[10027.869860] kswapd+0x624/0x890 +[10027.873097] kthread+0x11c/0x12c +[10027.876424] ret_from_fork+0x10/0x18 +[10027.880102] Code: f9000bf3 910003fd aa0003f3 d503201f (f9400268) +[10027.886362] ---[ end trace df5849a1a3543251 ]--- +[10027.891518] Kernel panic - not syncing: Fatal exception + +Signed-off-by: Akhil P Oommen +Signed-off-by: Rob Clark +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/msm/msm_gem.c | 36 ++++++++++++++++++++--------------- + 1 file changed, 21 insertions(+), 15 deletions(-) + +diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c +index 5a6a79fbc9d6e..d92a0ffe2a767 100644 +--- a/drivers/gpu/drm/msm/msm_gem.c ++++ b/drivers/gpu/drm/msm/msm_gem.c +@@ -977,10 +977,8 @@ int msm_gem_new_handle(struct drm_device *dev, struct drm_file *file, + + static int msm_gem_new_impl(struct drm_device *dev, + uint32_t size, uint32_t flags, +- struct drm_gem_object **obj, +- bool struct_mutex_locked) ++ struct drm_gem_object **obj) + { +- struct msm_drm_private *priv = dev->dev_private; + struct msm_gem_object *msm_obj; + + switch (flags & MSM_BO_CACHE_MASK) { +@@ -1006,15 +1004,6 @@ static int msm_gem_new_impl(struct drm_device *dev, + INIT_LIST_HEAD(&msm_obj->submit_entry); + INIT_LIST_HEAD(&msm_obj->vmas); + +- if (struct_mutex_locked) { +- WARN_ON(!mutex_is_locked(&dev->struct_mutex)); +- list_add_tail(&msm_obj->mm_list, &priv->inactive_list); +- } else { +- mutex_lock(&dev->struct_mutex); +- list_add_tail(&msm_obj->mm_list, &priv->inactive_list); +- mutex_unlock(&dev->struct_mutex); +- } +- + *obj = &msm_obj->base; + + return 0; +@@ -1024,6 +1013,7 @@ static struct drm_gem_object *_msm_gem_new(struct drm_device *dev, + uint32_t size, uint32_t flags, bool struct_mutex_locked) + { + struct msm_drm_private *priv = dev->dev_private; ++ struct msm_gem_object *msm_obj; + struct drm_gem_object *obj = NULL; + bool use_vram = false; + int ret; +@@ -1044,14 +1034,15 @@ static struct drm_gem_object *_msm_gem_new(struct drm_device *dev, + if (size == 0) + return ERR_PTR(-EINVAL); + +- ret = msm_gem_new_impl(dev, size, flags, &obj, struct_mutex_locked); ++ ret = msm_gem_new_impl(dev, size, flags, &obj); + if (ret) + goto fail; + ++ msm_obj = to_msm_bo(obj); ++ + if (use_vram) { + struct msm_gem_vma *vma; + struct page **pages; +- struct msm_gem_object *msm_obj = to_msm_bo(obj); + + mutex_lock(&msm_obj->lock); + +@@ -1086,6 +1077,15 @@ static struct drm_gem_object *_msm_gem_new(struct drm_device *dev, + mapping_set_gfp_mask(obj->filp->f_mapping, GFP_HIGHUSER); + } + ++ if (struct_mutex_locked) { ++ WARN_ON(!mutex_is_locked(&dev->struct_mutex)); ++ list_add_tail(&msm_obj->mm_list, &priv->inactive_list); ++ } else { ++ mutex_lock(&dev->struct_mutex); ++ list_add_tail(&msm_obj->mm_list, &priv->inactive_list); ++ mutex_unlock(&dev->struct_mutex); ++ } ++ + return obj; + + fail: +@@ -1108,6 +1108,7 @@ struct drm_gem_object *msm_gem_new(struct drm_device *dev, + struct drm_gem_object *msm_gem_import(struct drm_device *dev, + struct dma_buf *dmabuf, struct sg_table *sgt) + { ++ struct msm_drm_private *priv = dev->dev_private; + struct msm_gem_object *msm_obj; + struct drm_gem_object *obj; + uint32_t size; +@@ -1121,7 +1122,7 @@ struct drm_gem_object *msm_gem_import(struct drm_device *dev, + + size = PAGE_ALIGN(dmabuf->size); + +- ret = msm_gem_new_impl(dev, size, MSM_BO_WC, &obj, false); ++ ret = msm_gem_new_impl(dev, size, MSM_BO_WC, &obj); + if (ret) + goto fail; + +@@ -1146,6 +1147,11 @@ struct drm_gem_object *msm_gem_import(struct drm_device *dev, + } + + mutex_unlock(&msm_obj->lock); ++ ++ mutex_lock(&dev->struct_mutex); ++ list_add_tail(&msm_obj->mm_list, &priv->inactive_list); ++ mutex_unlock(&dev->struct_mutex); ++ + return obj; + + fail: +-- +2.25.1 + diff --git a/queue-5.4/drm-msm-ratelimit-crtc-event-overflow-error.patch b/queue-5.4/drm-msm-ratelimit-crtc-event-overflow-error.patch new file mode 100644 index 00000000000..ec3a697f372 --- /dev/null +++ b/queue-5.4/drm-msm-ratelimit-crtc-event-overflow-error.patch @@ -0,0 +1,36 @@ +From 2891dc7dc02ef2718f60478d327f770b63cfca1e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 1 Jul 2020 13:36:00 -0700 +Subject: drm/msm: ratelimit crtc event overflow error + +From: Rob Clark + +[ Upstream commit 5e16372b5940b1fecc3cc887fc02a50ba148d373 ] + +This can happen a lot when things go pear shaped. Lets not flood dmesg +when this happens. + +Signed-off-by: Rob Clark +Reviewed-by: Abhinav Kumar +Signed-off-by: Rob Clark +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +index ce59adff06aa1..36c85c05b7cf7 100644 +--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c ++++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +@@ -381,7 +381,7 @@ static void dpu_crtc_frame_event_cb(void *data, u32 event) + spin_unlock_irqrestore(&dpu_crtc->spin_lock, flags); + + if (!fevent) { +- DRM_ERROR("crtc%d event %d overflow\n", crtc->base.id, event); ++ DRM_ERROR_RATELIMITED("crtc%d event %d overflow\n", crtc->base.id, event); + return; + } + +-- +2.25.1 + diff --git a/queue-5.4/drm-nouveau-fix-multiple-instances-of-reference-coun.patch b/queue-5.4/drm-nouveau-fix-multiple-instances-of-reference-coun.patch new file mode 100644 index 00000000000..dcf023e91f7 --- /dev/null +++ b/queue-5.4/drm-nouveau-fix-multiple-instances-of-reference-coun.patch @@ -0,0 +1,68 @@ +From 212a8ed52d36ed333f2dcfec9ef91eb042d8eea4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 13 Jun 2020 20:41:56 -0500 +Subject: drm/nouveau: fix multiple instances of reference count leaks + +From: Aditya Pakki + +[ Upstream commit 659fb5f154c3434c90a34586f3b7aa1c39cf6062 ] + +On calling pm_runtime_get_sync() the reference count of the device +is incremented. In case of failure, decrement the +ref count before returning the error. + +Signed-off-by: Aditya Pakki +Signed-off-by: Ben Skeggs +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/nouveau/nouveau_drm.c | 8 ++++++-- + drivers/gpu/drm/nouveau/nouveau_gem.c | 4 +++- + 2 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c +index b1beed40e746a..5347e5bdee8cc 100644 +--- a/drivers/gpu/drm/nouveau/nouveau_drm.c ++++ b/drivers/gpu/drm/nouveau/nouveau_drm.c +@@ -1052,8 +1052,10 @@ nouveau_drm_open(struct drm_device *dev, struct drm_file *fpriv) + + /* need to bring up power immediately if opening device */ + ret = pm_runtime_get_sync(dev->dev); +- if (ret < 0 && ret != -EACCES) ++ if (ret < 0 && ret != -EACCES) { ++ pm_runtime_put_autosuspend(dev->dev); + return ret; ++ } + + get_task_comm(tmpname, current); + snprintf(name, sizeof(name), "%s[%d]", tmpname, pid_nr(fpriv->pid)); +@@ -1135,8 +1137,10 @@ nouveau_drm_ioctl(struct file *file, unsigned int cmd, unsigned long arg) + long ret; + + ret = pm_runtime_get_sync(dev->dev); +- if (ret < 0 && ret != -EACCES) ++ if (ret < 0 && ret != -EACCES) { ++ pm_runtime_put_autosuspend(dev->dev); + return ret; ++ } + + switch (_IOC_NR(cmd) - DRM_COMMAND_BASE) { + case DRM_NOUVEAU_NVIF: +diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c +index 1324c19f4e5cf..fbfe254227740 100644 +--- a/drivers/gpu/drm/nouveau/nouveau_gem.c ++++ b/drivers/gpu/drm/nouveau/nouveau_gem.c +@@ -45,8 +45,10 @@ nouveau_gem_object_del(struct drm_gem_object *gem) + int ret; + + ret = pm_runtime_get_sync(dev); +- if (WARN_ON(ret < 0 && ret != -EACCES)) ++ if (WARN_ON(ret < 0 && ret != -EACCES)) { ++ pm_runtime_put_autosuspend(dev); + return; ++ } + + if (gem->import_attach) + drm_prime_gem_destroy(gem, nvbo->bo.sg); +-- +2.25.1 + diff --git a/queue-5.4/drm-nouveau-fix-reference-count-leak-in-nouveau_debu.patch b/queue-5.4/drm-nouveau-fix-reference-count-leak-in-nouveau_debu.patch new file mode 100644 index 00000000000..63bba355e1c --- /dev/null +++ b/queue-5.4/drm-nouveau-fix-reference-count-leak-in-nouveau_debu.patch @@ -0,0 +1,39 @@ +From 40def6f3d390a9d74a419e09024adf5483b0e01f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 13 Jun 2020 20:48:37 -0500 +Subject: drm/nouveau: fix reference count leak in nouveau_debugfs_strap_peek + +From: Aditya Pakki + +[ Upstream commit 8f29432417b11039ef960ab18987c7d61b2b5396 ] + +nouveau_debugfs_strap_peek() calls pm_runtime_get_sync() that +increments the reference count. In case of failure, decrement the +ref count before returning the error. + +Signed-off-by: Aditya Pakki +Signed-off-by: Ben Skeggs +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/nouveau/nouveau_debugfs.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.c b/drivers/gpu/drm/nouveau/nouveau_debugfs.c +index 7dfbbbc1beea6..5c314f135dd10 100644 +--- a/drivers/gpu/drm/nouveau/nouveau_debugfs.c ++++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.c +@@ -54,8 +54,10 @@ nouveau_debugfs_strap_peek(struct seq_file *m, void *data) + int ret; + + ret = pm_runtime_get_sync(drm->dev->dev); +- if (ret < 0 && ret != -EACCES) ++ if (ret < 0 && ret != -EACCES) { ++ pm_runtime_put_autosuspend(drm->dev->dev); + return ret; ++ } + + seq_printf(m, "0x%08x\n", + nvif_rd32(&drm->client.device.object, 0x101000)); +-- +2.25.1 + diff --git a/queue-5.4/drm-nouveau-kms-nv50-fix-disabling-dithering.patch b/queue-5.4/drm-nouveau-kms-nv50-fix-disabling-dithering.patch new file mode 100644 index 00000000000..f0667411b3e --- /dev/null +++ b/queue-5.4/drm-nouveau-kms-nv50-fix-disabling-dithering.patch @@ -0,0 +1,64 @@ +From 807ed7f2505d5964b0502a138a523c48432825b6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 17 Mar 2020 14:54:06 -0400 +Subject: drm/nouveau/kms/nv50-: Fix disabling dithering + +From: Lyude Paul + +[ Upstream commit fb2420b701edbf96c2b6d557f0139902f455dc2b ] + +While we expose the ability to turn off hardware dithering for nouveau, +we actually make the mistake of turning it on anyway, due to +dithering_depth containing a non-zero value if our dithering depth isn't +also set to 6 bpc. + +So, fix it by never enabling dithering when it's disabled. + +Signed-off-by: Lyude Paul +Reviewed-by: Ben Skeggs +Acked-by: Dave Airlie +Link: https://patchwork.freedesktop.org/patch/msgid/20200627194657.156514-6-lyude@redhat.com +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/nouveau/dispnv50/head.c | 24 +++++++++++++----------- + 1 file changed, 13 insertions(+), 11 deletions(-) + +diff --git a/drivers/gpu/drm/nouveau/dispnv50/head.c b/drivers/gpu/drm/nouveau/dispnv50/head.c +index c9692df2b76cc..46578108a4305 100644 +--- a/drivers/gpu/drm/nouveau/dispnv50/head.c ++++ b/drivers/gpu/drm/nouveau/dispnv50/head.c +@@ -83,18 +83,20 @@ nv50_head_atomic_check_dither(struct nv50_head_atom *armh, + { + u32 mode = 0x00; + +- if (asyc->dither.mode == DITHERING_MODE_AUTO) { +- if (asyh->base.depth > asyh->or.bpc * 3) +- mode = DITHERING_MODE_DYNAMIC2X2; +- } else { +- mode = asyc->dither.mode; +- } ++ if (asyc->dither.mode) { ++ if (asyc->dither.mode == DITHERING_MODE_AUTO) { ++ if (asyh->base.depth > asyh->or.bpc * 3) ++ mode = DITHERING_MODE_DYNAMIC2X2; ++ } else { ++ mode = asyc->dither.mode; ++ } + +- if (asyc->dither.depth == DITHERING_DEPTH_AUTO) { +- if (asyh->or.bpc >= 8) +- mode |= DITHERING_DEPTH_8BPC; +- } else { +- mode |= asyc->dither.depth; ++ if (asyc->dither.depth == DITHERING_DEPTH_AUTO) { ++ if (asyh->or.bpc >= 8) ++ mode |= DITHERING_DEPTH_8BPC; ++ } else { ++ mode |= asyc->dither.depth; ++ } + } + + asyh->dither.enable = mode; +-- +2.25.1 + diff --git a/queue-5.4/drm-panel-simple-fix-bpc-for-lg-lb070wv8-panel.patch b/queue-5.4/drm-panel-simple-fix-bpc-for-lg-lb070wv8-panel.patch new file mode 100644 index 00000000000..0ece75e6982 --- /dev/null +++ b/queue-5.4/drm-panel-simple-fix-bpc-for-lg-lb070wv8-panel.patch @@ -0,0 +1,37 @@ +From a6794200c0a56cf761ca8bd08b3018b873ba6cc0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 12 Jul 2020 01:53:17 +0300 +Subject: drm: panel: simple: Fix bpc for LG LB070WV8 panel + +From: Laurent Pinchart + +[ Upstream commit a6ae2fe5c9f9fd355a48fb7d21c863e5b20d6c9c ] + +The LG LB070WV8 panel incorrectly reports a 16 bits per component value, +while the panel uses 8 bits per component. Fix it. + +Fixes: dd0150026901 ("drm/panel: simple: Add support for LG LB070WV8 800x480 7" panel") +Signed-off-by: Laurent Pinchart +Signed-off-by: Sam Ravnborg +Link: https://patchwork.freedesktop.org/patch/msgid/20200711225317.28476-1-laurent.pinchart+renesas@ideasonboard.com +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/panel/panel-simple.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c +index 8abb31f83ffc7..6d9656323a3f4 100644 +--- a/drivers/gpu/drm/panel/panel-simple.c ++++ b/drivers/gpu/drm/panel/panel-simple.c +@@ -1935,7 +1935,7 @@ static const struct drm_display_mode lg_lb070wv8_mode = { + static const struct panel_desc lg_lb070wv8 = { + .modes = &lg_lb070wv8_mode, + .num_modes = 1, +- .bpc = 16, ++ .bpc = 8, + .size = { + .width = 151, + .height = 91, +-- +2.25.1 + diff --git a/queue-5.4/drm-radeon-disable-agp-by-default.patch b/queue-5.4/drm-radeon-disable-agp-by-default.patch new file mode 100644 index 00000000000..4dec50918b5 --- /dev/null +++ b/queue-5.4/drm-radeon-disable-agp-by-default.patch @@ -0,0 +1,44 @@ +From 9584d75b60a6289ed27f2da06c3363a006607ca8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 12 May 2020 10:55:58 +0200 +Subject: drm/radeon: disable AGP by default +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Christian König + +[ Upstream commit ba806f98f868ce107aa9c453fef751de9980e4af ] + +Always use the PCI GART instead. We just have to many cases +where AGP still causes problems. This means a performance +regression for some GPUs, but also a bug fix for some others. + +Signed-off-by: Christian König +Reviewed-by: Alex Deucher +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/radeon/radeon_drv.c | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c +index 7d417b9a52501..c2573096d43c0 100644 +--- a/drivers/gpu/drm/radeon/radeon_drv.c ++++ b/drivers/gpu/drm/radeon/radeon_drv.c +@@ -174,12 +174,7 @@ int radeon_no_wb; + int radeon_modeset = -1; + int radeon_dynclks = -1; + int radeon_r4xx_atom = 0; +-#ifdef __powerpc__ +-/* Default to PCI on PowerPC (fdo #95017) */ + int radeon_agpmode = -1; +-#else +-int radeon_agpmode = 0; +-#endif + int radeon_vram_limit = 0; + int radeon_gart_size = -1; /* auto */ + int radeon_benchmarking = 0; +-- +2.25.1 + diff --git a/queue-5.4/drm-radeon-fix-array-out-of-bounds-read-and-write-is.patch b/queue-5.4/drm-radeon-fix-array-out-of-bounds-read-and-write-is.patch new file mode 100644 index 00000000000..9b570428eaf --- /dev/null +++ b/queue-5.4/drm-radeon-fix-array-out-of-bounds-read-and-write-is.patch @@ -0,0 +1,39 @@ +From 4f7a57aa26c225ffee5ce39f3d8615c18efb458e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 24 Jun 2020 13:07:10 +0100 +Subject: drm/radeon: fix array out-of-bounds read and write issues + +From: Colin Ian King + +[ Upstream commit 7ee78aff9de13d5dccba133f4a0de5367194b243 ] + +There is an off-by-one bounds check on the index into arrays +table->mc_reg_address and table->mc_reg_table_entry[k].mc_data[j] that +can lead to reads and writes outside of arrays. Fix the bound checking +off-by-one error. + +Addresses-Coverity: ("Out-of-bounds read/write") +Fixes: cc8dbbb4f62a ("drm/radeon: add dpm support for CI dGPUs (v2)") +Signed-off-by: Colin Ian King +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/radeon/ci_dpm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/radeon/ci_dpm.c b/drivers/gpu/drm/radeon/ci_dpm.c +index f9685cce16520..1e62e7bbf1b1d 100644 +--- a/drivers/gpu/drm/radeon/ci_dpm.c ++++ b/drivers/gpu/drm/radeon/ci_dpm.c +@@ -4366,7 +4366,7 @@ static int ci_set_mc_special_registers(struct radeon_device *rdev, + table->mc_reg_table_entry[k].mc_data[j] |= 0x100; + } + j++; +- if (j > SMU7_DISCRETE_MC_REGISTER_ARRAY_SIZE) ++ if (j >= SMU7_DISCRETE_MC_REGISTER_ARRAY_SIZE) + return -EINVAL; + + if (!pi->mem_gddr5) { +-- +2.25.1 + diff --git a/queue-5.4/drm-radeon-fix-reference-count-leaks-caused-by-pm_ru.patch b/queue-5.4/drm-radeon-fix-reference-count-leaks-caused-by-pm_ru.patch new file mode 100644 index 00000000000..714490b880e --- /dev/null +++ b/queue-5.4/drm-radeon-fix-reference-count-leaks-caused-by-pm_ru.patch @@ -0,0 +1,74 @@ +From c58920cb0af9c397d6de3b591ca8d22e27f060b7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 13 Jun 2020 21:21:22 -0500 +Subject: drm/radeon: Fix reference count leaks caused by pm_runtime_get_sync + +From: Aditya Pakki + +[ Upstream commit 9fb10671011143d15b6b40d6d5fa9c52c57e9d63 ] + +On calling pm_runtime_get_sync() the reference count of the device +is incremented. In case of failure, decrement the +reference count before returning the error. + +Acked-by: Evan Quan +Signed-off-by: Aditya Pakki +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/radeon/radeon_display.c | 4 +++- + drivers/gpu/drm/radeon/radeon_drv.c | 4 +++- + drivers/gpu/drm/radeon/radeon_kms.c | 4 +++- + 3 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c +index 0826efd9b5f51..f9f74150d0d73 100644 +--- a/drivers/gpu/drm/radeon/radeon_display.c ++++ b/drivers/gpu/drm/radeon/radeon_display.c +@@ -631,8 +631,10 @@ radeon_crtc_set_config(struct drm_mode_set *set, + dev = set->crtc->dev; + + ret = pm_runtime_get_sync(dev->dev); +- if (ret < 0) ++ if (ret < 0) { ++ pm_runtime_put_autosuspend(dev->dev); + return ret; ++ } + + ret = drm_crtc_helper_set_config(set, ctx); + +diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c +index 6128792ab8836..7d417b9a52501 100644 +--- a/drivers/gpu/drm/radeon/radeon_drv.c ++++ b/drivers/gpu/drm/radeon/radeon_drv.c +@@ -555,8 +555,10 @@ long radeon_drm_ioctl(struct file *filp, + long ret; + dev = file_priv->minor->dev; + ret = pm_runtime_get_sync(dev->dev); +- if (ret < 0) ++ if (ret < 0) { ++ pm_runtime_put_autosuspend(dev->dev); + return ret; ++ } + + ret = drm_ioctl(filp, cmd, arg); + +diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c +index 2bb0187c5bc78..709c4ef5e7d59 100644 +--- a/drivers/gpu/drm/radeon/radeon_kms.c ++++ b/drivers/gpu/drm/radeon/radeon_kms.c +@@ -638,8 +638,10 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) + file_priv->driver_priv = NULL; + + r = pm_runtime_get_sync(dev->dev); +- if (r < 0) ++ if (r < 0) { ++ pm_runtime_put_autosuspend(dev->dev); + return r; ++ } + + /* new gpu have virtual address space support */ + if (rdev->family >= CHIP_CAYMAN) { +-- +2.25.1 + diff --git a/queue-5.4/drm-stm-repair-runtime-power-management.patch b/queue-5.4/drm-stm-repair-runtime-power-management.patch new file mode 100644 index 00000000000..0aa147c7504 --- /dev/null +++ b/queue-5.4/drm-stm-repair-runtime-power-management.patch @@ -0,0 +1,62 @@ +From 7e3d4d3421be66ce2982d62e1beb3af8c1835798 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 29 Feb 2020 23:16:49 +0100 +Subject: drm/stm: repair runtime power management +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Marek Vasut + +[ Upstream commit ebd267b2e3c25d5f93a08528b47c036569eb8744 ] + +Add missing pm_runtime_get_sync() into ltdc_crtc_atomic_enable() to +match pm_runtime_put_sync() in ltdc_crtc_atomic_disable(), otherwise +the LTDC might suspend via runtime PM, disable clock, and then fail +to resume later on. + +The test which triggers it is roughly -- run qt5 application which +uses eglfs platform and etnaviv, stop the application, sleep for 15 +minutes, run the application again. This leads to a timeout waiting +for vsync, because the LTDC has suspended, but did not resume. + +Fixes: 35ab6cfbf211 ("drm/stm: support runtime power management") +Signed-off-by: Marek Vasut +Cc: Yannick Fertré +Cc: Philippe Cornu +Cc: Benjamin Gaignard +Cc: Vincent Abriou +Cc: Maxime Coquelin +Cc: Alexandre Torgue +To: dri-devel@lists.freedesktop.org +Cc: linux-stm32@st-md-mailman.stormreply.com +Cc: linux-arm-kernel@lists.infradead.org +Acked-by: Philippe Cornu +Tested-by: Yannick Fertre +Signed-off-by: Benjamin Gaignard +Link: https://patchwork.freedesktop.org/patch/msgid/20200229221649.90813-1-marex@denx.de +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/stm/ltdc.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c +index 3ab4fbf8eb0d1..51571f7246abf 100644 +--- a/drivers/gpu/drm/stm/ltdc.c ++++ b/drivers/gpu/drm/stm/ltdc.c +@@ -424,9 +424,12 @@ static void ltdc_crtc_atomic_enable(struct drm_crtc *crtc, + struct drm_crtc_state *old_state) + { + struct ltdc_device *ldev = crtc_to_ltdc(crtc); ++ struct drm_device *ddev = crtc->dev; + + DRM_DEBUG_DRIVER("\n"); + ++ pm_runtime_get_sync(ddev->dev); ++ + /* Sets the background color value */ + reg_write(ldev->regs, LTDC_BCCR, BCCR_BCBLACK); + +-- +2.25.1 + diff --git a/queue-5.4/drm-tilcdc-fix-leak-null-ref-in-panel_connector_get_.patch b/queue-5.4/drm-tilcdc-fix-leak-null-ref-in-panel_connector_get_.patch new file mode 100644 index 00000000000..6a7a182c106 --- /dev/null +++ b/queue-5.4/drm-tilcdc-fix-leak-null-ref-in-panel_connector_get_.patch @@ -0,0 +1,51 @@ +From 4dcf17141e4d5b3c0847c1e930270b6895f1f0c9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 29 Apr 2020 13:42:32 +0300 +Subject: drm/tilcdc: fix leak & null ref in panel_connector_get_modes + +From: Tomi Valkeinen + +[ Upstream commit 3f9c1c872cc97875ddc8d63bc9fe6ee13652b933 ] + +If videomode_from_timings() returns true, the mode allocated with +drm_mode_create will be leaked. + +Also, the return value of drm_mode_create() is never checked, and thus +could cause NULL deref. + +Fix these two issues. + +Signed-off-by: Tomi Valkeinen +Link: https://patchwork.freedesktop.org/patch/msgid/20200429104234.18910-1-tomi.valkeinen@ti.com +Reviewed-by: Jyri Sarha +Acked-by: Sam Ravnborg +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/tilcdc/tilcdc_panel.c b/drivers/gpu/drm/tilcdc/tilcdc_panel.c +index 5584e656b8575..8c4fd1aa4c2db 100644 +--- a/drivers/gpu/drm/tilcdc/tilcdc_panel.c ++++ b/drivers/gpu/drm/tilcdc/tilcdc_panel.c +@@ -143,12 +143,16 @@ static int panel_connector_get_modes(struct drm_connector *connector) + int i; + + for (i = 0; i < timings->num_timings; i++) { +- struct drm_display_mode *mode = drm_mode_create(dev); ++ struct drm_display_mode *mode; + struct videomode vm; + + if (videomode_from_timings(timings, &vm, i)) + break; + ++ mode = drm_mode_create(dev); ++ if (!mode) ++ break; ++ + drm_display_mode_from_videomode(&vm, mode); + + mode->type = DRM_MODE_TYPE_DRIVER; +-- +2.25.1 + diff --git a/queue-5.4/dyndbg-fix-a-bug_on-in-ddebug_describe_flags.patch b/queue-5.4/dyndbg-fix-a-bug_on-in-ddebug_describe_flags.patch new file mode 100644 index 00000000000..a729bb72aa5 --- /dev/null +++ b/queue-5.4/dyndbg-fix-a-bug_on-in-ddebug_describe_flags.patch @@ -0,0 +1,101 @@ +From f7b737e70dfa18f79930e4aaca80662a30dc452d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 19 Jul 2020 17:10:47 -0600 +Subject: dyndbg: fix a BUG_ON in ddebug_describe_flags + +From: Jim Cromie + +[ Upstream commit f678ce8cc3cb2ad29df75d8824c74f36398ba871 ] + +ddebug_describe_flags() currently fills a caller provided string buffer, +after testing its size (also passed) in a BUG_ON. Fix this by +replacing them with a known-big-enough string buffer wrapped in a +struct, and passing that instead. + +Also simplify ddebug_describe_flags() flags parameter from a struct to +a member in that struct, and hoist the member deref up to the caller. +This makes the function reusable (soon) where flags are unpacked. + +Acked-by: +Signed-off-by: Jim Cromie +Link: https://lore.kernel.org/r/20200719231058.1586423-8-jim.cromie@gmail.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + lib/dynamic_debug.c | 23 +++++++++++------------ + 1 file changed, 11 insertions(+), 12 deletions(-) + +diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c +index c60409138e136..ccf05719b1ad6 100644 +--- a/lib/dynamic_debug.c ++++ b/lib/dynamic_debug.c +@@ -87,22 +87,22 @@ static struct { unsigned flag:8; char opt_char; } opt_array[] = { + { _DPRINTK_FLAGS_NONE, '_' }, + }; + ++struct flagsbuf { char buf[ARRAY_SIZE(opt_array)+1]; }; ++ + /* format a string into buf[] which describes the _ddebug's flags */ +-static char *ddebug_describe_flags(struct _ddebug *dp, char *buf, +- size_t maxlen) ++static char *ddebug_describe_flags(unsigned int flags, struct flagsbuf *fb) + { +- char *p = buf; ++ char *p = fb->buf; + int i; + +- BUG_ON(maxlen < 6); + for (i = 0; i < ARRAY_SIZE(opt_array); ++i) +- if (dp->flags & opt_array[i].flag) ++ if (flags & opt_array[i].flag) + *p++ = opt_array[i].opt_char; +- if (p == buf) ++ if (p == fb->buf) + *p++ = '_'; + *p = '\0'; + +- return buf; ++ return fb->buf; + } + + #define vpr_info(fmt, ...) \ +@@ -144,7 +144,7 @@ static int ddebug_change(const struct ddebug_query *query, + struct ddebug_table *dt; + unsigned int newflags; + unsigned int nfound = 0; +- char flagbuf[10]; ++ struct flagsbuf fbuf; + + /* search for matching ddebugs */ + mutex_lock(&ddebug_lock); +@@ -201,8 +201,7 @@ static int ddebug_change(const struct ddebug_query *query, + vpr_info("changed %s:%d [%s]%s =%s\n", + trim_prefix(dp->filename), dp->lineno, + dt->mod_name, dp->function, +- ddebug_describe_flags(dp, flagbuf, +- sizeof(flagbuf))); ++ ddebug_describe_flags(dp->flags, &fbuf)); + } + } + mutex_unlock(&ddebug_lock); +@@ -816,7 +815,7 @@ static int ddebug_proc_show(struct seq_file *m, void *p) + { + struct ddebug_iter *iter = m->private; + struct _ddebug *dp = p; +- char flagsbuf[10]; ++ struct flagsbuf flags; + + vpr_info("called m=%p p=%p\n", m, p); + +@@ -829,7 +828,7 @@ static int ddebug_proc_show(struct seq_file *m, void *p) + seq_printf(m, "%s:%u [%s]%s =%s \"", + trim_prefix(dp->filename), dp->lineno, + iter->table->mod_name, dp->function, +- ddebug_describe_flags(dp, flagsbuf, sizeof(flagsbuf))); ++ ddebug_describe_flags(dp->flags, &flags)); + seq_escape(m, dp->format, "\t\r\n\""); + seq_puts(m, "\"\n"); + +-- +2.25.1 + diff --git a/queue-5.4/edac-fix-reference-count-leaks.patch b/queue-5.4/edac-fix-reference-count-leaks.patch new file mode 100644 index 00000000000..c4cafdb981e --- /dev/null +++ b/queue-5.4/edac-fix-reference-count-leaks.patch @@ -0,0 +1,59 @@ +From 1c7b63ef8c44bed3d9cdd48a97278a3d4d2ac18e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 28 May 2020 15:22:37 -0500 +Subject: EDAC: Fix reference count leaks + +From: Qiushi Wu + +[ Upstream commit 17ed808ad243192fb923e4e653c1338d3ba06207 ] + +When kobject_init_and_add() returns an error, it should be handled +because kobject_init_and_add() takes a reference even when it fails. If +this function returns an error, kobject_put() must be called to properly +clean up the memory associated with the object. + +Therefore, replace calling kfree() and call kobject_put() and add a +missing kobject_put() in the edac_device_register_sysfs_main_kobj() +error path. + + [ bp: Massage and merge into a single patch. ] + +Fixes: b2ed215a3338 ("Kobject: change drivers/edac to use kobject_init_and_add") +Signed-off-by: Qiushi Wu +Signed-off-by: Borislav Petkov +Link: https://lkml.kernel.org/r/20200528202238.18078-1-wu000273@umn.edu +Link: https://lkml.kernel.org/r/20200528203526.20908-1-wu000273@umn.edu +Signed-off-by: Sasha Levin +--- + drivers/edac/edac_device_sysfs.c | 1 + + drivers/edac/edac_pci_sysfs.c | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/edac/edac_device_sysfs.c b/drivers/edac/edac_device_sysfs.c +index 0e7ea3591b781..5e75937537997 100644 +--- a/drivers/edac/edac_device_sysfs.c ++++ b/drivers/edac/edac_device_sysfs.c +@@ -275,6 +275,7 @@ int edac_device_register_sysfs_main_kobj(struct edac_device_ctl_info *edac_dev) + + /* Error exit stack */ + err_kobj_reg: ++ kobject_put(&edac_dev->kobj); + module_put(edac_dev->owner); + + err_out: +diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c +index 72c9eb9fdffbe..53042af7262e2 100644 +--- a/drivers/edac/edac_pci_sysfs.c ++++ b/drivers/edac/edac_pci_sysfs.c +@@ -386,7 +386,7 @@ static int edac_pci_main_kobj_setup(void) + + /* Error unwind statck */ + kobject_init_and_add_fail: +- kfree(edac_pci_top_main_kobj); ++ kobject_put(edac_pci_top_main_kobj); + + kzalloc_fail: + module_put(THIS_MODULE); +-- +2.25.1 + diff --git a/queue-5.4/firmware-arm_scmi-fix-scmi-genpd-domain-probing.patch b/queue-5.4/firmware-arm_scmi-fix-scmi-genpd-domain-probing.patch new file mode 100644 index 00000000000..830a60e240f --- /dev/null +++ b/queue-5.4/firmware-arm_scmi-fix-scmi-genpd-domain-probing.patch @@ -0,0 +1,101 @@ +From 654af16629ea833dae5bafc80a8b2a6fca410d17 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 19 Jun 2020 23:03:30 +0100 +Subject: firmware: arm_scmi: Fix SCMI genpd domain probing + +From: Cristian Marussi + +[ Upstream commit e0f1a30cf184821499eeb67daedd7a3f21bbcb0b ] + +When, at probe time, an SCMI communication failure inhibits the capacity +to query power domains states, such domains should be skipped. + +Registering partially initialized SCMI power domains with genpd will +causes kernel panic. + + arm-scmi timed out in resp(caller: scmi_power_state_get+0xa4/0xd0) + scmi-power-domain scmi_dev.2: failed to get state for domain 9 + Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000 + Mem abort info: + ESR = 0x96000006 + EC = 0x25: DABT (current EL), IL = 32 bits + SET = 0, FnV = 0 + EA = 0, S1PTW = 0 + Data abort info: + ISV = 0, ISS = 0x00000006 + CM = 0, WnR = 0 + user pgtable: 4k pages, 48-bit VAs, pgdp=00000009f3691000 + [0000000000000000] pgd=00000009f1ca0003, p4d=00000009f1ca0003, pud=00000009f35ea003, pmd=0000000000000000 + Internal error: Oops: 96000006 [#1] PREEMPT SMP + CPU: 2 PID: 381 Comm: bash Not tainted 5.8.0-rc1-00011-gebd118c2cca8 #2 + Hardware name: ARM LTD ARM Juno Development Platform/ARM Juno Development Platform, BIOS EDK II Jan 3 2020 + Internal error: Oops: 96000006 [#1] PREEMPT SMP + pstate: 80000005 (Nzcv daif -PAN -UAO BTYPE=--) + pc : of_genpd_add_provider_onecell+0x98/0x1f8 + lr : of_genpd_add_provider_onecell+0x48/0x1f8 + Call trace: + of_genpd_add_provider_onecell+0x98/0x1f8 + scmi_pm_domain_probe+0x174/0x1e8 + scmi_dev_probe+0x90/0xe0 + really_probe+0xe4/0x448 + driver_probe_device+0xfc/0x168 + device_driver_attach+0x7c/0x88 + bind_store+0xe8/0x128 + drv_attr_store+0x2c/0x40 + sysfs_kf_write+0x4c/0x60 + kernfs_fop_write+0x114/0x230 + __vfs_write+0x24/0x50 + vfs_write+0xbc/0x1e0 + ksys_write+0x70/0xf8 + __arm64_sys_write+0x24/0x30 + el0_svc_common.constprop.3+0x94/0x160 + do_el0_svc+0x2c/0x98 + el0_sync_handler+0x148/0x1a8 + el0_sync+0x158/0x180 + +Do not register any power domain that failed to be queried with genpd. + +Fixes: 898216c97ed2 ("firmware: arm_scmi: add device power domain support using genpd") +Link: https://lore.kernel.org/r/20200619220330.12217-1-cristian.marussi@arm.com +Signed-off-by: Cristian Marussi +Signed-off-by: Sudeep Holla +Signed-off-by: Sasha Levin +--- + drivers/firmware/arm_scmi/scmi_pm_domain.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/drivers/firmware/arm_scmi/scmi_pm_domain.c b/drivers/firmware/arm_scmi/scmi_pm_domain.c +index 87f737e01473c..041f8152272bf 100644 +--- a/drivers/firmware/arm_scmi/scmi_pm_domain.c ++++ b/drivers/firmware/arm_scmi/scmi_pm_domain.c +@@ -85,7 +85,10 @@ static int scmi_pm_domain_probe(struct scmi_device *sdev) + for (i = 0; i < num_domains; i++, scmi_pd++) { + u32 state; + +- domains[i] = &scmi_pd->genpd; ++ if (handle->power_ops->state_get(handle, i, &state)) { ++ dev_warn(dev, "failed to get state for domain %d\n", i); ++ continue; ++ } + + scmi_pd->domain = i; + scmi_pd->handle = handle; +@@ -94,13 +97,10 @@ static int scmi_pm_domain_probe(struct scmi_device *sdev) + scmi_pd->genpd.power_off = scmi_pd_power_off; + scmi_pd->genpd.power_on = scmi_pd_power_on; + +- if (handle->power_ops->state_get(handle, i, &state)) { +- dev_warn(dev, "failed to get state for domain %d\n", i); +- continue; +- } +- + pm_genpd_init(&scmi_pd->genpd, NULL, + state == SCMI_POWER_STATE_GENERIC_OFF); ++ ++ domains[i] = &scmi_pd->genpd; + } + + scmi_pd_data->domains = domains; +-- +2.25.1 + diff --git a/queue-5.4/fs-btrfs-add-cond_resched-for-try_release_extent_map.patch b/queue-5.4/fs-btrfs-add-cond_resched-for-try_release_extent_map.patch new file mode 100644 index 00000000000..a43d522718e --- /dev/null +++ b/queue-5.4/fs-btrfs-add-cond_resched-for-try_release_extent_map.patch @@ -0,0 +1,62 @@ +From 253cdd0d7a6f71cc9b5440d6a525d179c4e17656 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 8 May 2020 14:15:37 -0700 +Subject: fs/btrfs: Add cond_resched() for try_release_extent_mapping() stalls + +From: Paul E. McKenney + +[ Upstream commit 9f47eb5461aaeb6cb8696f9d11503ae90e4d5cb0 ] + +Very large I/Os can cause the following RCU CPU stall warning: + +RIP: 0010:rb_prev+0x8/0x50 +Code: 49 89 c0 49 89 d1 48 89 c2 48 89 f8 e9 e5 fd ff ff 4c 89 48 10 c3 4c = +89 06 c3 4c 89 40 10 c3 0f 1f 00 48 8b 0f 48 39 cf 74 38 <48> 8b 47 10 48 85 c0 74 22 48 8b 50 08 48 85 d2 74 0c 48 89 d0 48 +RSP: 0018:ffffc9002212bab0 EFLAGS: 00000287 ORIG_RAX: ffffffffffffff13 +RAX: ffff888821f93630 RBX: ffff888821f93630 RCX: ffff888821f937e0 +RDX: 0000000000000000 RSI: 0000000000102000 RDI: ffff888821f93630 +RBP: 0000000000103000 R08: 000000000006c000 R09: 0000000000000238 +R10: 0000000000102fff R11: ffffc9002212bac8 R12: 0000000000000001 +R13: ffffffffffffffff R14: 0000000000102000 R15: ffff888821f937e0 + __lookup_extent_mapping+0xa0/0x110 + try_release_extent_mapping+0xdc/0x220 + btrfs_releasepage+0x45/0x70 + shrink_page_list+0xa39/0xb30 + shrink_inactive_list+0x18f/0x3b0 + shrink_lruvec+0x38e/0x6b0 + shrink_node+0x14d/0x690 + do_try_to_free_pages+0xc6/0x3e0 + try_to_free_mem_cgroup_pages+0xe6/0x1e0 + reclaim_high.constprop.73+0x87/0xc0 + mem_cgroup_handle_over_high+0x66/0x150 + exit_to_usermode_loop+0x82/0xd0 + do_syscall_64+0xd4/0x100 + entry_SYSCALL_64_after_hwframe+0x44/0xa9 + +On a PREEMPT=n kernel, the try_release_extent_mapping() function's +"while" loop might run for a very long time on a large I/O. This commit +therefore adds a cond_resched() to this loop, providing RCU any needed +quiescent states. + +Signed-off-by: Paul E. McKenney +Signed-off-by: Sasha Levin +--- + fs/btrfs/extent_io.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c +index 1a089a6424221..99dcb38976592 100644 +--- a/fs/btrfs/extent_io.c ++++ b/fs/btrfs/extent_io.c +@@ -4481,6 +4481,8 @@ int try_release_extent_mapping(struct page *page, gfp_t mask) + + /* once for us */ + free_extent_map(em); ++ ++ cond_resched(); /* Allow large-extent preemption. */ + } + } + return try_release_extent_state(tree, page, mask); +-- +2.25.1 + diff --git a/queue-5.4/fsl-fman-check-dereferencing-null-pointer.patch b/queue-5.4/fsl-fman-check-dereferencing-null-pointer.patch new file mode 100644 index 00000000000..3714177ba5b --- /dev/null +++ b/queue-5.4/fsl-fman-check-dereferencing-null-pointer.patch @@ -0,0 +1,72 @@ +From 82132a554526b43fdb53673ee5787de28033dfa9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 3 Aug 2020 10:07:33 +0300 +Subject: fsl/fman: check dereferencing null pointer + +From: Florinel Iordache + +[ Upstream commit cc5d229a122106733a85c279d89d7703f21e4d4f ] + +Add a safe check to avoid dereferencing null pointer + +Fixes: 57ba4c9b56d8 ("fsl/fman: Add FMan MAC support") +Signed-off-by: Florinel Iordache +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/freescale/fman/fman_dtsec.c | 4 ++-- + drivers/net/ethernet/freescale/fman/fman_memac.c | 2 +- + drivers/net/ethernet/freescale/fman/fman_tgec.c | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/net/ethernet/freescale/fman/fman_dtsec.c b/drivers/net/ethernet/freescale/fman/fman_dtsec.c +index 1ca543ac8f2cd..d2de9ea80c43f 100644 +--- a/drivers/net/ethernet/freescale/fman/fman_dtsec.c ++++ b/drivers/net/ethernet/freescale/fman/fman_dtsec.c +@@ -1205,7 +1205,7 @@ int dtsec_del_hash_mac_address(struct fman_mac *dtsec, enet_addr_t *eth_addr) + list_for_each(pos, + &dtsec->multicast_addr_hash->lsts[bucket]) { + hash_entry = ETH_HASH_ENTRY_OBJ(pos); +- if (hash_entry->addr == addr) { ++ if (hash_entry && hash_entry->addr == addr) { + list_del_init(&hash_entry->node); + kfree(hash_entry); + break; +@@ -1218,7 +1218,7 @@ int dtsec_del_hash_mac_address(struct fman_mac *dtsec, enet_addr_t *eth_addr) + list_for_each(pos, + &dtsec->unicast_addr_hash->lsts[bucket]) { + hash_entry = ETH_HASH_ENTRY_OBJ(pos); +- if (hash_entry->addr == addr) { ++ if (hash_entry && hash_entry->addr == addr) { + list_del_init(&hash_entry->node); + kfree(hash_entry); + break; +diff --git a/drivers/net/ethernet/freescale/fman/fman_memac.c b/drivers/net/ethernet/freescale/fman/fman_memac.c +index 08f8b36779ea4..9088b4f4b4b87 100644 +--- a/drivers/net/ethernet/freescale/fman/fman_memac.c ++++ b/drivers/net/ethernet/freescale/fman/fman_memac.c +@@ -985,7 +985,7 @@ int memac_del_hash_mac_address(struct fman_mac *memac, enet_addr_t *eth_addr) + + list_for_each(pos, &memac->multicast_addr_hash->lsts[hash]) { + hash_entry = ETH_HASH_ENTRY_OBJ(pos); +- if (hash_entry->addr == addr) { ++ if (hash_entry && hash_entry->addr == addr) { + list_del_init(&hash_entry->node); + kfree(hash_entry); + break; +diff --git a/drivers/net/ethernet/freescale/fman/fman_tgec.c b/drivers/net/ethernet/freescale/fman/fman_tgec.c +index f75b9c11b2d29..ac5a281e0ec3b 100644 +--- a/drivers/net/ethernet/freescale/fman/fman_tgec.c ++++ b/drivers/net/ethernet/freescale/fman/fman_tgec.c +@@ -630,7 +630,7 @@ int tgec_del_hash_mac_address(struct fman_mac *tgec, enet_addr_t *eth_addr) + + list_for_each(pos, &tgec->multicast_addr_hash->lsts[hash]) { + hash_entry = ETH_HASH_ENTRY_OBJ(pos); +- if (hash_entry->addr == addr) { ++ if (hash_entry && hash_entry->addr == addr) { + list_del_init(&hash_entry->node); + kfree(hash_entry); + break; +-- +2.25.1 + diff --git a/queue-5.4/fsl-fman-fix-dereference-null-return-value.patch b/queue-5.4/fsl-fman-fix-dereference-null-return-value.patch new file mode 100644 index 00000000000..b6c5579bda0 --- /dev/null +++ b/queue-5.4/fsl-fman-fix-dereference-null-return-value.patch @@ -0,0 +1,50 @@ +From c26f5ed6dd0dfb6261c0533890c624b3214c0eeb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 3 Aug 2020 10:07:31 +0300 +Subject: fsl/fman: fix dereference null return value + +From: Florinel Iordache + +[ Upstream commit 0572054617f32670abab4b4e89a876954d54b704 ] + +Check before using returned value to avoid dereferencing null pointer. + +Fixes: 18a6c85fcc78 ("fsl/fman: Add FMan Port Support") +Signed-off-by: Florinel Iordache +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/freescale/fman/fman_port.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/freescale/fman/fman_port.c b/drivers/net/ethernet/freescale/fman/fman_port.c +index ee82ee1384eb3..47f6fee1f3964 100644 +--- a/drivers/net/ethernet/freescale/fman/fman_port.c ++++ b/drivers/net/ethernet/freescale/fman/fman_port.c +@@ -1756,6 +1756,7 @@ static int fman_port_probe(struct platform_device *of_dev) + struct fman_port *port; + struct fman *fman; + struct device_node *fm_node, *port_node; ++ struct platform_device *fm_pdev; + struct resource res; + struct resource *dev_res; + u32 val; +@@ -1780,8 +1781,14 @@ static int fman_port_probe(struct platform_device *of_dev) + goto return_err; + } + +- fman = dev_get_drvdata(&of_find_device_by_node(fm_node)->dev); ++ fm_pdev = of_find_device_by_node(fm_node); + of_node_put(fm_node); ++ if (!fm_pdev) { ++ err = -EINVAL; ++ goto return_err; ++ } ++ ++ fman = dev_get_drvdata(&fm_pdev->dev); + if (!fman) { + err = -EINVAL; + goto return_err; +-- +2.25.1 + diff --git a/queue-5.4/fsl-fman-fix-eth-hash-table-allocation.patch b/queue-5.4/fsl-fman-fix-eth-hash-table-allocation.patch new file mode 100644 index 00000000000..3b7bba80e1e --- /dev/null +++ b/queue-5.4/fsl-fman-fix-eth-hash-table-allocation.patch @@ -0,0 +1,38 @@ +From 113050787c4ff6c5040159cb2c18c392d74467ba Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 3 Aug 2020 10:07:34 +0300 +Subject: fsl/fman: fix eth hash table allocation + +From: Florinel Iordache + +[ Upstream commit 3207f715c34317d08e798e11a10ce816feb53c0f ] + +Fix memory allocation for ethernet address hash table. +The code was wrongly allocating an array for eth hash table which +is incorrect because this is the main structure for eth hash table +(struct eth_hash_t) that contains inside a number of elements. + +Fixes: 57ba4c9b56d8 ("fsl/fman: Add FMan MAC support") +Signed-off-by: Florinel Iordache +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/freescale/fman/fman_mac.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/freescale/fman/fman_mac.h b/drivers/net/ethernet/freescale/fman/fman_mac.h +index dd6d0526f6c1f..19f327efdaff3 100644 +--- a/drivers/net/ethernet/freescale/fman/fman_mac.h ++++ b/drivers/net/ethernet/freescale/fman/fman_mac.h +@@ -252,7 +252,7 @@ static inline struct eth_hash_t *alloc_hash_table(u16 size) + struct eth_hash_t *hash; + + /* Allocate address hash table */ +- hash = kmalloc_array(size, sizeof(struct eth_hash_t *), GFP_KERNEL); ++ hash = kmalloc(sizeof(*hash), GFP_KERNEL); + if (!hash) + return NULL; + +-- +2.25.1 + diff --git a/queue-5.4/fsl-fman-fix-unreachable-code.patch b/queue-5.4/fsl-fman-fix-unreachable-code.patch new file mode 100644 index 00000000000..25de10934cd --- /dev/null +++ b/queue-5.4/fsl-fman-fix-unreachable-code.patch @@ -0,0 +1,35 @@ +From ee23f9351e8558561dd4e42da117a39cfc227eba Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 3 Aug 2020 10:07:32 +0300 +Subject: fsl/fman: fix unreachable code + +From: Florinel Iordache + +[ Upstream commit cc79fd8f557767de90ff199d3b6fb911df43160a ] + +The parameter 'priority' is incorrectly forced to zero which ultimately +induces logically dead code in the subsequent lines. + +Fixes: 57ba4c9b56d8 ("fsl/fman: Add FMan MAC support") +Signed-off-by: Florinel Iordache +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/freescale/fman/fman_memac.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/drivers/net/ethernet/freescale/fman/fman_memac.c b/drivers/net/ethernet/freescale/fman/fman_memac.c +index e1901874c19f0..08f8b36779ea4 100644 +--- a/drivers/net/ethernet/freescale/fman/fman_memac.c ++++ b/drivers/net/ethernet/freescale/fman/fman_memac.c +@@ -856,7 +856,6 @@ int memac_set_tx_pause_frames(struct fman_mac *memac, u8 priority, + + tmp = ioread32be(®s->command_config); + tmp &= ~CMD_CFG_PFC_MODE; +- priority = 0; + + iowrite32be(tmp, ®s->command_config); + +-- +2.25.1 + diff --git a/queue-5.4/fsl-fman-use-32-bit-unsigned-integer.patch b/queue-5.4/fsl-fman-use-32-bit-unsigned-integer.patch new file mode 100644 index 00000000000..cfbf8a3f601 --- /dev/null +++ b/queue-5.4/fsl-fman-use-32-bit-unsigned-integer.patch @@ -0,0 +1,41 @@ +From d9a37bf32099830c3ec96d8ff1a16079bf10ade5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 3 Aug 2020 10:07:30 +0300 +Subject: fsl/fman: use 32-bit unsigned integer + +From: Florinel Iordache + +[ Upstream commit 99f47abd9f7bf6e365820d355dc98f6955a562df ] + +Potentially overflowing expression (ts_freq << 16 and intgr << 16) +declared as type u32 (32-bit unsigned) is evaluated using 32-bit +arithmetic and then used in a context that expects an expression of +type u64 (64-bit unsigned) which ultimately is used as 16-bit +unsigned by typecasting to u16. Fixed by using an unsigned 32-bit +integer since the value is truncated anyway in the end. + +Fixes: 414fd46e7762 ("fsl/fman: Add FMan support") +Signed-off-by: Florinel Iordache +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/freescale/fman/fman.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/drivers/net/ethernet/freescale/fman/fman.c b/drivers/net/ethernet/freescale/fman/fman.c +index 4c2fa13a7dd7b..c8e434c8ab983 100644 +--- a/drivers/net/ethernet/freescale/fman/fman.c ++++ b/drivers/net/ethernet/freescale/fman/fman.c +@@ -1396,8 +1396,7 @@ static void enable_time_stamp(struct fman *fman) + { + struct fman_fpm_regs __iomem *fpm_rg = fman->fpm_regs; + u16 fm_clk_freq = fman->state->fm_clk_freq; +- u32 tmp, intgr, ts_freq; +- u64 frac; ++ u32 tmp, intgr, ts_freq, frac; + + ts_freq = (u32)(1 << fman->state->count1_micro_bit); + /* configure timestamp so that bit 8 will count 1 microsecond +-- +2.25.1 + diff --git a/queue-5.4/gpu-host1x-debug-fix-multiple-channels-emitting-mess.patch b/queue-5.4/gpu-host1x-debug-fix-multiple-channels-emitting-mess.patch new file mode 100644 index 00000000000..d77f45241ed --- /dev/null +++ b/queue-5.4/gpu-host1x-debug-fix-multiple-channels-emitting-mess.patch @@ -0,0 +1,54 @@ +From 65c412943811d3af0f7ae9ab36e95206106757ab Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 29 Jun 2020 06:18:41 +0300 +Subject: gpu: host1x: debug: Fix multiple channels emitting messages + simultaneously + +From: Dmitry Osipenko + +[ Upstream commit 35681862808472a0a4b9a8817ae2789c0b5b3edc ] + +Once channel's job is hung, it dumps the channel's state into KMSG before +tearing down the offending job. If multiple channels hang at once, then +they dump messages simultaneously, making the debug info unreadable, and +thus, useless. This patch adds mutex which allows only one channel to emit +debug messages at a time. + +Signed-off-by: Dmitry Osipenko +Signed-off-by: Thierry Reding +Signed-off-by: Sasha Levin +--- + drivers/gpu/host1x/debug.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/gpu/host1x/debug.c b/drivers/gpu/host1x/debug.c +index c0392672a8421..1b4997bda1c79 100644 +--- a/drivers/gpu/host1x/debug.c ++++ b/drivers/gpu/host1x/debug.c +@@ -16,6 +16,8 @@ + #include "debug.h" + #include "channel.h" + ++static DEFINE_MUTEX(debug_lock); ++ + unsigned int host1x_debug_trace_cmdbuf; + + static pid_t host1x_debug_force_timeout_pid; +@@ -52,12 +54,14 @@ static int show_channel(struct host1x_channel *ch, void *data, bool show_fifo) + struct output *o = data; + + mutex_lock(&ch->cdma.lock); ++ mutex_lock(&debug_lock); + + if (show_fifo) + host1x_hw_show_channel_fifo(m, ch, o); + + host1x_hw_show_channel_cdma(m, ch, o); + ++ mutex_unlock(&debug_lock); + mutex_unlock(&ch->cdma.lock); + + return 0; +-- +2.25.1 + diff --git a/queue-5.4/gpu-ipu-v3-restore-rgb32-bgr32.patch b/queue-5.4/gpu-ipu-v3-restore-rgb32-bgr32.patch new file mode 100644 index 00000000000..13fc673f8e4 --- /dev/null +++ b/queue-5.4/gpu-ipu-v3-restore-rgb32-bgr32.patch @@ -0,0 +1,36 @@ +From e068708a41cd62a94d17b5700b13ab1a9d4ba85d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 17 Jun 2020 15:40:36 -0700 +Subject: gpu: ipu-v3: Restore RGB32, BGR32 + +From: Steve Longerbeam + +[ Upstream commit 22b2cfad752d4b278ea7c38c0ee961ca50198ce8 ] + +RGB32 and BGR32 formats were inadvertently removed from the switch +statement in ipu_pixelformat_to_colorspace(). Restore them. + +Fixes: a59957172b0c ("gpu: ipu-v3: enable remaining 32-bit RGB V4L2 pixel formats") +Signed-off-by: Steve Longerbeam +Signed-off-by: Philipp Zabel +Signed-off-by: Sasha Levin +--- + drivers/gpu/ipu-v3/ipu-common.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/gpu/ipu-v3/ipu-common.c b/drivers/gpu/ipu-v3/ipu-common.c +index ee2a025e54cfe..b3dae9ec1a38b 100644 +--- a/drivers/gpu/ipu-v3/ipu-common.c ++++ b/drivers/gpu/ipu-v3/ipu-common.c +@@ -124,6 +124,8 @@ enum ipu_color_space ipu_pixelformat_to_colorspace(u32 pixelformat) + case V4L2_PIX_FMT_RGBX32: + case V4L2_PIX_FMT_ARGB32: + case V4L2_PIX_FMT_XRGB32: ++ case V4L2_PIX_FMT_RGB32: ++ case V4L2_PIX_FMT_BGR32: + return IPUV3_COLORSPACE_RGB; + default: + return IPUV3_COLORSPACE_UNKNOWN; +-- +2.25.1 + diff --git a/queue-5.4/iavf-fix-error-return-code-in-iavf_init_get_resource.patch b/queue-5.4/iavf-fix-error-return-code-in-iavf_init_get_resource.patch new file mode 100644 index 00000000000..70e17b02bf6 --- /dev/null +++ b/queue-5.4/iavf-fix-error-return-code-in-iavf_init_get_resource.patch @@ -0,0 +1,40 @@ +From b526406066d82c751675d6372e30cef079e82c8f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 18 Jun 2020 14:19:53 +0000 +Subject: iavf: fix error return code in iavf_init_get_resources() + +From: Wei Yongjun + +[ Upstream commit 753f3884f253de6b6d3a516e6651bda0baf4aede ] + +Fix to return negative error code -ENOMEM from the error handling +case instead of 0, as done elsewhere in this function. + +Fixes: b66c7bc1cd4d ("iavf: Refactor init state machine") +Signed-off-by: Wei Yongjun +Tested-by: Andrew Bowers +Signed-off-by: Tony Nguyen +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/intel/iavf/iavf_main.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c +index bacc5fb7eba2c..905fc45b4a58f 100644 +--- a/drivers/net/ethernet/intel/iavf/iavf_main.c ++++ b/drivers/net/ethernet/intel/iavf/iavf_main.c +@@ -1863,8 +1863,10 @@ static int iavf_init_get_resources(struct iavf_adapter *adapter) + + adapter->rss_key = kzalloc(adapter->rss_key_size, GFP_KERNEL); + adapter->rss_lut = kzalloc(adapter->rss_lut_size, GFP_KERNEL); +- if (!adapter->rss_key || !adapter->rss_lut) ++ if (!adapter->rss_key || !adapter->rss_lut) { ++ err = -ENOMEM; + goto err_mem; ++ } + if (RSS_AQ(adapter)) + adapter->aq_required |= IAVF_FLAG_AQ_CONFIGURE_RSS; + else +-- +2.25.1 + diff --git a/queue-5.4/iavf-fix-updating-statistics.patch b/queue-5.4/iavf-fix-updating-statistics.patch new file mode 100644 index 00000000000..2e388977e39 --- /dev/null +++ b/queue-5.4/iavf-fix-updating-statistics.patch @@ -0,0 +1,43 @@ +From fe0ed0910ea0bfbf682cc53ffff3c14d380d82fb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 24 Jun 2020 09:04:22 -0700 +Subject: iavf: Fix updating statistics + +From: Tony Nguyen + +[ Upstream commit 9358076642f14cec8c414850d5a909cafca3a9d6 ] + +Commit bac8486116b0 ("iavf: Refactor the watchdog state machine") inverted +the logic for when to update statistics. Statistics should be updated when +no other commands are pending, instead they were only requested when a +command was processed. iavf_request_stats() would see a pending request +and not request statistics to be updated. This caused statistics to never +be updated; fix the logic. + +Fixes: bac8486116b0 ("iavf: Refactor the watchdog state machine") +Signed-off-by: Tony Nguyen +Tested-by: Andrew Bowers +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/intel/iavf/iavf_main.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c +index 905fc45b4a58f..34124c213d27c 100644 +--- a/drivers/net/ethernet/intel/iavf/iavf_main.c ++++ b/drivers/net/ethernet/intel/iavf/iavf_main.c +@@ -1948,7 +1948,10 @@ static void iavf_watchdog_task(struct work_struct *work) + iavf_send_api_ver(adapter); + } + } else { +- if (!iavf_process_aq_command(adapter) && ++ /* An error will be returned if no commands were ++ * processed; use this opportunity to update stats ++ */ ++ if (iavf_process_aq_command(adapter) && + adapter->state == __IAVF_RUNNING) + iavf_request_stats(adapter); + } +-- +2.25.1 + diff --git a/queue-5.4/ice-graceful-error-handling-in-hw-table-calloc-failu.patch b/queue-5.4/ice-graceful-error-handling-in-hw-table-calloc-failu.patch new file mode 100644 index 00000000000..5db8683eea8 --- /dev/null +++ b/queue-5.4/ice-graceful-error-handling-in-hw-table-calloc-failu.patch @@ -0,0 +1,43 @@ +From 5a7c4da465a31e31eb86c3ea83a7e4d64180e143 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 29 Jul 2020 17:19:18 -0700 +Subject: ice: Graceful error handling in HW table calloc failure + +From: Surabhi Boob + +[ Upstream commit bcc46cb8a077c6189b44f1555b8659837f748eb2 ] + +In the ice_init_hw_tbls, if the devm_kcalloc for es->written fails, catch +that error and bail out gracefully, instead of continuing with a NULL +pointer. + +Fixes: 32d63fa1e9f3 ("ice: Initialize DDP package structures") +Signed-off-by: Surabhi Boob +Tested-by: Andrew Bowers +Signed-off-by: Tony Nguyen +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/intel/ice/ice_flex_pipe.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/intel/ice/ice_flex_pipe.c b/drivers/net/ethernet/intel/ice/ice_flex_pipe.c +index cbd53b586c36f..6cfe8eb7f47dc 100644 +--- a/drivers/net/ethernet/intel/ice/ice_flex_pipe.c ++++ b/drivers/net/ethernet/intel/ice/ice_flex_pipe.c +@@ -1535,10 +1535,12 @@ enum ice_status ice_init_hw_tbls(struct ice_hw *hw) + es->ref_count = devm_kcalloc(ice_hw_to_dev(hw), es->count, + sizeof(*es->ref_count), + GFP_KERNEL); ++ if (!es->ref_count) ++ goto err; + + es->written = devm_kcalloc(ice_hw_to_dev(hw), es->count, + sizeof(*es->written), GFP_KERNEL); +- if (!es->ref_count) ++ if (!es->written) + goto err; + } + return 0; +-- +2.25.1 + diff --git a/queue-5.4/iio-improve-iio_concentration-channel-type-descripti.patch b/queue-5.4/iio-improve-iio_concentration-channel-type-descripti.patch new file mode 100644 index 00000000000..661e4f40d2a --- /dev/null +++ b/queue-5.4/iio-improve-iio_concentration-channel-type-descripti.patch @@ -0,0 +1,43 @@ +From d51826eaca8f8f84218c358a321f3d1ee0054ad5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 1 Jun 2020 18:15:52 +0200 +Subject: iio: improve IIO_CONCENTRATION channel type description + +From: Tomasz Duszynski + +[ Upstream commit df16c33a4028159d1ba8a7061c9fa950b58d1a61 ] + +IIO_CONCENTRATION together with INFO_RAW specifier is used for reporting +raw concentrations of pollutants. Raw value should be meaningless +before being properly scaled. Because of that description shouldn't +mention raw value unit whatsoever. + +Fix this by rephrasing existing description so it follows conventions +used throughout IIO ABI docs. + +Fixes: 8ff6b3bc94930 ("iio: chemical: Add IIO_CONCENTRATION channel type") +Signed-off-by: Tomasz Duszynski +Acked-by: Matt Ranostay +Signed-off-by: Jonathan Cameron +Signed-off-by: Sasha Levin +--- + Documentation/ABI/testing/sysfs-bus-iio | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio +index 680451695422a..c3767d4d01a6f 100644 +--- a/Documentation/ABI/testing/sysfs-bus-iio ++++ b/Documentation/ABI/testing/sysfs-bus-iio +@@ -1566,7 +1566,8 @@ What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_voc_raw + KernelVersion: 4.3 + Contact: linux-iio@vger.kernel.org + Description: +- Raw (unscaled no offset etc.) percentage reading of a substance. ++ Raw (unscaled no offset etc.) reading of a substance. Units ++ after application of scale and offset are percents. + + What: /sys/bus/iio/devices/iio:deviceX/in_resistance_raw + What: /sys/bus/iio/devices/iio:deviceX/in_resistanceX_raw +-- +2.25.1 + diff --git a/queue-5.4/ima-have-the-lsm-free-its-audit-rule.patch b/queue-5.4/ima-have-the-lsm-free-its-audit-rule.patch new file mode 100644 index 00000000000..00c83381ead --- /dev/null +++ b/queue-5.4/ima-have-the-lsm-free-its-audit-rule.patch @@ -0,0 +1,64 @@ +From 7b5b1b8519172052e16a8eadf468b22dc10463ba Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 9 Jul 2020 01:19:00 -0500 +Subject: ima: Have the LSM free its audit rule + +From: Tyler Hicks + +[ Upstream commit 9ff8a616dfab96a4fa0ddd36190907dc68886d9b ] + +Ask the LSM to free its audit rule rather than directly calling kfree(). +Both AppArmor and SELinux do additional work in their audit_rule_free() +hooks. Fix memory leaks by allowing the LSMs to perform necessary work. + +Fixes: b16942455193 ("ima: use the lsm policy update notifier") +Signed-off-by: Tyler Hicks +Cc: Janne Karhunen +Cc: Casey Schaufler +Reviewed-by: Mimi Zohar +Signed-off-by: Mimi Zohar +Signed-off-by: Sasha Levin +--- + security/integrity/ima/ima.h | 5 +++++ + security/integrity/ima/ima_policy.c | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h +index be469fce19e12..8173982e00ab5 100644 +--- a/security/integrity/ima/ima.h ++++ b/security/integrity/ima/ima.h +@@ -362,6 +362,7 @@ static inline void ima_free_modsig(struct modsig *modsig) + #ifdef CONFIG_IMA_LSM_RULES + + #define security_filter_rule_init security_audit_rule_init ++#define security_filter_rule_free security_audit_rule_free + #define security_filter_rule_match security_audit_rule_match + + #else +@@ -372,6 +373,10 @@ static inline int security_filter_rule_init(u32 field, u32 op, char *rulestr, + return -EINVAL; + } + ++static inline void security_filter_rule_free(void *lsmrule) ++{ ++} ++ + static inline int security_filter_rule_match(u32 secid, u32 field, u32 op, + void *lsmrule) + { +diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c +index 558a7607bf93a..e725d41872713 100644 +--- a/security/integrity/ima/ima_policy.c ++++ b/security/integrity/ima/ima_policy.c +@@ -254,7 +254,7 @@ static void ima_lsm_free_rule(struct ima_rule_entry *entry) + int i; + + for (i = 0; i < MAX_LSM_RULES; i++) { +- kfree(entry->lsm[i].rule); ++ security_filter_rule_free(entry->lsm[i].rule); + kfree(entry->lsm[i].args_p); + } + kfree(entry); +-- +2.25.1 + diff --git a/queue-5.4/io_uring-fix-sq-array-offset-calculation.patch b/queue-5.4/io_uring-fix-sq-array-offset-calculation.patch new file mode 100644 index 00000000000..27c7d176f78 --- /dev/null +++ b/queue-5.4/io_uring-fix-sq-array-offset-calculation.patch @@ -0,0 +1,51 @@ +From 81f894c402689c056b93a37bbe20075109c091aa Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 11 Jul 2020 11:31:11 +0200 +Subject: io_uring: fix sq array offset calculation + +From: Dmitry Vyukov + +[ Upstream commit b36200f543ff07a1cb346aa582349141df2c8068 ] + +rings_size() sets sq_offset to the total size of the rings (the returned +value which is used for memory allocation). This is wrong: sq array should +be located within the rings, not after them. Set sq_offset to where it +should be. + +Fixes: 75b28affdd6a ("io_uring: allocate the two rings together") +Signed-off-by: Dmitry Vyukov +Acked-by: Hristo Venev +Cc: io-uring@vger.kernel.org +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + fs/io_uring.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/fs/io_uring.c b/fs/io_uring.c +index c1aaee061dae5..0460420250255 100644 +--- a/fs/io_uring.c ++++ b/fs/io_uring.c +@@ -3391,6 +3391,9 @@ static unsigned long rings_size(unsigned sq_entries, unsigned cq_entries, + return SIZE_MAX; + #endif + ++ if (sq_offset) ++ *sq_offset = off; ++ + sq_array_size = array_size(sizeof(u32), sq_entries); + if (sq_array_size == SIZE_MAX) + return SIZE_MAX; +@@ -3398,9 +3401,6 @@ static unsigned long rings_size(unsigned sq_entries, unsigned cq_entries, + if (check_add_overflow(off, sq_array_size, &off)) + return SIZE_MAX; + +- if (sq_offset) +- *sq_offset = off; +- + return off; + } + +-- +2.25.1 + diff --git a/queue-5.4/iocost-fix-check-condition-of-iocg-abs_vdebt.patch b/queue-5.4/iocost-fix-check-condition-of-iocg-abs_vdebt.patch new file mode 100644 index 00000000000..199359da73b --- /dev/null +++ b/queue-5.4/iocost-fix-check-condition-of-iocg-abs_vdebt.patch @@ -0,0 +1,36 @@ +From 1d78171df75f521037276f0c317f054fad72e698 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 30 Jul 2020 17:03:21 +0800 +Subject: iocost: Fix check condition of iocg abs_vdebt + +From: Chengming Zhou + +[ Upstream commit d9012a59db54442d5b2fcfdfcded35cf566397d3 ] + +We shouldn't skip iocg when its abs_vdebt is not zero. + +Fixes: 0b80f9866e6b ("iocost: protect iocg->abs_vdebt with iocg->waitq.lock") +Signed-off-by: Chengming Zhou +Acked-by: Tejun Heo +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + block/blk-iocost.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/block/blk-iocost.c b/block/blk-iocost.c +index 4d2bda812d9b4..dcc6685d5becc 100644 +--- a/block/blk-iocost.c ++++ b/block/blk-iocost.c +@@ -1377,7 +1377,7 @@ static void ioc_timer_fn(struct timer_list *timer) + * should have woken up in the last period and expire idle iocgs. + */ + list_for_each_entry_safe(iocg, tiocg, &ioc->active_iocgs, active_list) { +- if (!waitqueue_active(&iocg->waitq) && iocg->abs_vdebt && ++ if (!waitqueue_active(&iocg->waitq) && !iocg->abs_vdebt && + !iocg_is_idle(iocg)) + continue; + +-- +2.25.1 + diff --git a/queue-5.4/iomap-make-sure-iomap_end-is-called-after-iomap_begi.patch b/queue-5.4/iomap-make-sure-iomap_end-is-called-after-iomap_begi.patch new file mode 100644 index 00000000000..f7f8b9cbcb4 --- /dev/null +++ b/queue-5.4/iomap-make-sure-iomap_end-is-called-after-iomap_begi.patch @@ -0,0 +1,64 @@ +From 64646dec0521e045f129009e2fd8dfb212be4282 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 6 Jul 2020 10:49:27 -0700 +Subject: iomap: Make sure iomap_end is called after iomap_begin + +From: Andreas Gruenbacher + +[ Upstream commit 856473cd5d17dbbf3055710857c67a4af6d9fcc0 ] + +Make sure iomap_end is always called when iomap_begin succeeds. + +Without this fix, iomap_end won't be called when a filesystem's +iomap_begin operation returns an invalid mapping, bypassing any +unlocking done in iomap_end. With this fix, the unlocking will still +happen. + +This bug was found by Bob Peterson during code review. It's unlikely +that such iomap_begin bugs will survive to affect users, so backporting +this fix seems unnecessary. + +Fixes: ae259a9c8593 ("fs: introduce iomap infrastructure") +Signed-off-by: Andreas Gruenbacher +Reviewed-by: Christoph Hellwig +Reviewed-by: Darrick J. Wong +Signed-off-by: Darrick J. Wong +Signed-off-by: Sasha Levin +--- + fs/iomap/apply.c | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +diff --git a/fs/iomap/apply.c b/fs/iomap/apply.c +index 54c02aecf3cd8..c2281a6a7f320 100644 +--- a/fs/iomap/apply.c ++++ b/fs/iomap/apply.c +@@ -41,10 +41,14 @@ iomap_apply(struct inode *inode, loff_t pos, loff_t length, unsigned flags, + ret = ops->iomap_begin(inode, pos, length, flags, &iomap); + if (ret) + return ret; +- if (WARN_ON(iomap.offset > pos)) +- return -EIO; +- if (WARN_ON(iomap.length == 0)) +- return -EIO; ++ if (WARN_ON(iomap.offset > pos)) { ++ written = -EIO; ++ goto out; ++ } ++ if (WARN_ON(iomap.length == 0)) { ++ written = -EIO; ++ goto out; ++ } + + /* + * Cut down the length to the one actually provided by the filesystem, +@@ -60,6 +64,7 @@ iomap_apply(struct inode *inode, loff_t pos, loff_t length, unsigned flags, + */ + written = actor(inode, pos, length, data, &iomap); + ++out: + /* + * Now the data has been copied, commit the range we've copied. This + * should not fail unless the filesystem has had a fatal error. +-- +2.25.1 + diff --git a/queue-5.4/ionic-update-eid-test-for-overflow.patch b/queue-5.4/ionic-update-eid-test-for-overflow.patch new file mode 100644 index 00000000000..4a74e41290f --- /dev/null +++ b/queue-5.4/ionic-update-eid-test-for-overflow.patch @@ -0,0 +1,35 @@ +From 31318f38ca009819088e3526bab256661d811813 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 21 Jul 2020 13:34:07 -0700 +Subject: ionic: update eid test for overflow + +From: Shannon Nelson + +[ Upstream commit 3fbc9bb6ca32d12d4d32a7ae32abef67ac95f889 ] + +Fix up our comparison to better handle a potential (but largely +unlikely) wrap around. + +Signed-off-by: Shannon Nelson +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c +index c00ec9a020973..e66002251596b 100644 +--- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c ++++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c +@@ -666,7 +666,7 @@ static bool ionic_notifyq_service(struct ionic_cq *cq, + eid = le64_to_cpu(comp->event.eid); + + /* Have we run out of new completions to process? */ +- if (eid <= lif->last_eid) ++ if ((s64)(eid - lif->last_eid) <= 0) + return false; + + lif->last_eid = eid; +-- +2.25.1 + diff --git a/queue-5.4/ipvs-allow-connection-reuse-for-unconfirmed-conntrac.patch b/queue-5.4/ipvs-allow-connection-reuse-for-unconfirmed-conntrac.patch new file mode 100644 index 00000000000..dda046d03c9 --- /dev/null +++ b/queue-5.4/ipvs-allow-connection-reuse-for-unconfirmed-conntrac.patch @@ -0,0 +1,130 @@ +From c9822b13e7794578edcfcc837fb0dfead0f5386c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 1 Jul 2020 18:17:19 +0300 +Subject: ipvs: allow connection reuse for unconfirmed conntrack +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Julian Anastasov + +[ Upstream commit f0a5e4d7a594e0fe237d3dfafb069bb82f80f42f ] + +YangYuxi is reporting that connection reuse +is causing one-second delay when SYN hits +existing connection in TIME_WAIT state. +Such delay was added to give time to expire +both the IPVS connection and the corresponding +conntrack. This was considered a rare case +at that time but it is causing problem for +some environments such as Kubernetes. + +As nf_conntrack_tcp_packet() can decide to +release the conntrack in TIME_WAIT state and +to replace it with a fresh NEW conntrack, we +can use this to allow rescheduling just by +tuning our check: if the conntrack is +confirmed we can not schedule it to different +real server and the one-second delay still +applies but if new conntrack was created, +we are free to select new real server without +any delays. + +YangYuxi lists some of the problem reports: + +- One second connection delay in masquerading mode: +https://marc.info/?t=151683118100004&r=1&w=2 + +- IPVS low throughput #70747 +https://github.com/kubernetes/kubernetes/issues/70747 + +- Apache Bench can fill up ipvs service proxy in seconds #544 +https://github.com/cloudnativelabs/kube-router/issues/544 + +- Additional 1s latency in `host -> service IP -> pod` +https://github.com/kubernetes/kubernetes/issues/90854 + +Fixes: f719e3754ee2 ("ipvs: drop first packet to redirect conntrack") +Co-developed-by: YangYuxi +Signed-off-by: YangYuxi +Signed-off-by: Julian Anastasov +Reviewed-by: Simon Horman +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Sasha Levin +--- + include/net/ip_vs.h | 10 ++++------ + net/netfilter/ipvs/ip_vs_core.c | 12 +++++++----- + 2 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h +index 078887c8c586a..7c37e3c3b1c79 100644 +--- a/include/net/ip_vs.h ++++ b/include/net/ip_vs.h +@@ -1624,18 +1624,16 @@ static inline void ip_vs_conn_drop_conntrack(struct ip_vs_conn *cp) + } + #endif /* CONFIG_IP_VS_NFCT */ + +-/* Really using conntrack? */ +-static inline bool ip_vs_conn_uses_conntrack(struct ip_vs_conn *cp, +- struct sk_buff *skb) ++/* Using old conntrack that can not be redirected to another real server? */ ++static inline bool ip_vs_conn_uses_old_conntrack(struct ip_vs_conn *cp, ++ struct sk_buff *skb) + { + #ifdef CONFIG_IP_VS_NFCT + enum ip_conntrack_info ctinfo; + struct nf_conn *ct; + +- if (!(cp->flags & IP_VS_CONN_F_NFCT)) +- return false; + ct = nf_ct_get(skb, &ctinfo); +- if (ct) ++ if (ct && nf_ct_is_confirmed(ct)) + return true; + #endif + return false; +diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c +index 8b80ab794a92b..64a05906cc0e6 100644 +--- a/net/netfilter/ipvs/ip_vs_core.c ++++ b/net/netfilter/ipvs/ip_vs_core.c +@@ -2061,14 +2061,14 @@ ip_vs_in(struct netns_ipvs *ipvs, unsigned int hooknum, struct sk_buff *skb, int + + conn_reuse_mode = sysctl_conn_reuse_mode(ipvs); + if (conn_reuse_mode && !iph.fragoffs && is_new_conn(skb, &iph) && cp) { +- bool uses_ct = false, resched = false; ++ bool old_ct = false, resched = false; + + if (unlikely(sysctl_expire_nodest_conn(ipvs)) && cp->dest && + unlikely(!atomic_read(&cp->dest->weight))) { + resched = true; +- uses_ct = ip_vs_conn_uses_conntrack(cp, skb); ++ old_ct = ip_vs_conn_uses_old_conntrack(cp, skb); + } else if (is_new_conn_expected(cp, conn_reuse_mode)) { +- uses_ct = ip_vs_conn_uses_conntrack(cp, skb); ++ old_ct = ip_vs_conn_uses_old_conntrack(cp, skb); + if (!atomic_read(&cp->n_control)) { + resched = true; + } else { +@@ -2076,15 +2076,17 @@ ip_vs_in(struct netns_ipvs *ipvs, unsigned int hooknum, struct sk_buff *skb, int + * that uses conntrack while it is still + * referenced by controlled connection(s). + */ +- resched = !uses_ct; ++ resched = !old_ct; + } + } + + if (resched) { ++ if (!old_ct) ++ cp->flags &= ~IP_VS_CONN_F_NFCT; + if (!atomic_read(&cp->n_control)) + ip_vs_conn_expire_now(cp); + __ip_vs_conn_put(cp); +- if (uses_ct) ++ if (old_ct) + return NF_DROP; + cp = NULL; + } +-- +2.25.1 + diff --git a/queue-5.4/irqchip-irq-mtk-sysirq-replace-spinlock-with-raw_spi.patch b/queue-5.4/irqchip-irq-mtk-sysirq-replace-spinlock-with-raw_spi.patch new file mode 100644 index 00000000000..0d94091ac3c --- /dev/null +++ b/queue-5.4/irqchip-irq-mtk-sysirq-replace-spinlock-with-raw_spi.patch @@ -0,0 +1,97 @@ +From bdaf250d99f4723505d979f58321224219d23584 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 15 Jun 2020 09:44:45 +0200 +Subject: irqchip/irq-mtk-sysirq: Replace spinlock with raw_spinlock + +From: Bartosz Golaszewski + +[ Upstream commit 6eeb997ab5075e770a002c51351fa4ec2c6b5c39 ] + +This driver may take a regular spinlock when a raw spinlock +(irq_desc->lock) is already taken which results in the following +lockdep splat: + +============================= +[ BUG: Invalid wait context ] +5.7.0-rc7 #1 Not tainted +----------------------------- +swapper/0/0 is trying to lock: +ffffff800303b798 (&chip_data->lock){....}-{3:3}, at: mtk_sysirq_set_type+0x48/0xc0 +other info that might help us debug this: +context-{5:5} +2 locks held by swapper/0/0: + #0: ffffff800302ee68 (&desc->request_mutex){....}-{4:4}, at: __setup_irq+0xc4/0x8a0 + #1: ffffff800302ecf0 (&irq_desc_lock_class){....}-{2:2}, at: __setup_irq+0xe4/0x8a0 +stack backtrace: +CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.7.0-rc7 #1 +Hardware name: Pumpkin MT8516 (DT) +Call trace: + dump_backtrace+0x0/0x180 + show_stack+0x14/0x20 + dump_stack+0xd0/0x118 + __lock_acquire+0x8c8/0x2270 + lock_acquire+0xf8/0x470 + _raw_spin_lock_irqsave+0x50/0x78 + mtk_sysirq_set_type+0x48/0xc0 + __irq_set_trigger+0x58/0x170 + __setup_irq+0x420/0x8a0 + request_threaded_irq+0xd8/0x190 + timer_of_init+0x1e8/0x2c4 + mtk_gpt_init+0x5c/0x1dc + timer_probe+0x74/0xf4 + time_init+0x14/0x44 + start_kernel+0x394/0x4f0 + +Replace the spinlock_t with raw_spinlock_t to avoid this warning. + +Signed-off-by: Bartosz Golaszewski +Signed-off-by: Marc Zyngier +Link: https://lore.kernel.org/r/20200615074445.3579-1-brgl@bgdev.pl +Signed-off-by: Sasha Levin +--- + drivers/irqchip/irq-mtk-sysirq.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/irqchip/irq-mtk-sysirq.c b/drivers/irqchip/irq-mtk-sysirq.c +index 73eae5966a403..6ff98b87e5c04 100644 +--- a/drivers/irqchip/irq-mtk-sysirq.c ++++ b/drivers/irqchip/irq-mtk-sysirq.c +@@ -15,7 +15,7 @@ + #include + + struct mtk_sysirq_chip_data { +- spinlock_t lock; ++ raw_spinlock_t lock; + u32 nr_intpol_bases; + void __iomem **intpol_bases; + u32 *intpol_words; +@@ -37,7 +37,7 @@ static int mtk_sysirq_set_type(struct irq_data *data, unsigned int type) + reg_index = chip_data->which_word[hwirq]; + offset = hwirq & 0x1f; + +- spin_lock_irqsave(&chip_data->lock, flags); ++ raw_spin_lock_irqsave(&chip_data->lock, flags); + value = readl_relaxed(base + reg_index * 4); + if (type == IRQ_TYPE_LEVEL_LOW || type == IRQ_TYPE_EDGE_FALLING) { + if (type == IRQ_TYPE_LEVEL_LOW) +@@ -53,7 +53,7 @@ static int mtk_sysirq_set_type(struct irq_data *data, unsigned int type) + + data = data->parent_data; + ret = data->chip->irq_set_type(data, type); +- spin_unlock_irqrestore(&chip_data->lock, flags); ++ raw_spin_unlock_irqrestore(&chip_data->lock, flags); + return ret; + } + +@@ -212,7 +212,7 @@ static int __init mtk_sysirq_of_init(struct device_node *node, + ret = -ENOMEM; + goto out_free_which_word; + } +- spin_lock_init(&chip_data->lock); ++ raw_spin_lock_init(&chip_data->lock); + + return 0; + +-- +2.25.1 + diff --git a/queue-5.4/irqchip-ti-sci-inta-fix-return-value-about-devm_iore.patch b/queue-5.4/irqchip-ti-sci-inta-fix-return-value-about-devm_iore.patch new file mode 100644 index 00000000000..45dc2032389 --- /dev/null +++ b/queue-5.4/irqchip-ti-sci-inta-fix-return-value-about-devm_iore.patch @@ -0,0 +1,38 @@ +From 8e8ac37501c46bf12e8e818c29aa9fb6d972d87e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 6 Jun 2020 17:50:16 +0800 +Subject: irqchip/ti-sci-inta: Fix return value about devm_ioremap_resource() + +From: Tiezhu Yang + +[ Upstream commit 4b127a14cb1385dd355c7673d975258d5d668922 ] + +When call function devm_ioremap_resource(), we should use IS_ERR() +to check the return value and return PTR_ERR() if failed. + +Fixes: 9f1463b86c13 ("irqchip/ti-sci-inta: Add support for Interrupt Aggregator driver") +Signed-off-by: Tiezhu Yang +Signed-off-by: Marc Zyngier +Reviewed-by: Grygorii Strashko +Link: https://lore.kernel.org/r/1591437017-5295-2-git-send-email-yangtiezhu@loongson.cn +Signed-off-by: Sasha Levin +--- + drivers/irqchip/irq-ti-sci-inta.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/irqchip/irq-ti-sci-inta.c b/drivers/irqchip/irq-ti-sci-inta.c +index fa7488863bd0a..0a35499c46728 100644 +--- a/drivers/irqchip/irq-ti-sci-inta.c ++++ b/drivers/irqchip/irq-ti-sci-inta.c +@@ -571,7 +571,7 @@ static int ti_sci_inta_irq_domain_probe(struct platform_device *pdev) + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + inta->base = devm_ioremap_resource(dev, res); + if (IS_ERR(inta->base)) +- return -ENODEV; ++ return PTR_ERR(inta->base); + + domain = irq_domain_add_linear(dev_of_node(dev), + ti_sci_get_num_resources(inta->vint), +-- +2.25.1 + diff --git a/queue-5.4/iwlegacy-check-the-return-value-of-pcie_capability_r.patch b/queue-5.4/iwlegacy-check-the-return-value-of-pcie_capability_r.patch new file mode 100644 index 00000000000..d17cd8ec534 --- /dev/null +++ b/queue-5.4/iwlegacy-check-the-return-value-of-pcie_capability_r.patch @@ -0,0 +1,45 @@ +From 52a1c47bc679899e79ded974a856f0881990a8cb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 13 Jul 2020 19:55:27 +0200 +Subject: iwlegacy: Check the return value of pcie_capability_read_*() + +From: Bolarinwa Olayemi Saheed + +[ Upstream commit 9018fd7f2a73e9b290f48a56b421558fa31e8b75 ] + +On failure pcie_capability_read_dword() sets it's last parameter, val +to 0. However, with Patch 14/14, it is possible that val is set to ~0 on +failure. This would introduce a bug because (x & x) == (~0 & x). + +This bug can be avoided without changing the function's behaviour if the +return value of pcie_capability_read_dword is checked to confirm success. + +Check the return value of pcie_capability_read_dword() to ensure success. + +Suggested-by: Bjorn Helgaas +Signed-off-by: Bolarinwa Olayemi Saheed +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/20200713175529.29715-3-refactormyself@gmail.com +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/intel/iwlegacy/common.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/wireless/intel/iwlegacy/common.c b/drivers/net/wireless/intel/iwlegacy/common.c +index 746749f379964..1107b96a8a880 100644 +--- a/drivers/net/wireless/intel/iwlegacy/common.c ++++ b/drivers/net/wireless/intel/iwlegacy/common.c +@@ -4286,8 +4286,8 @@ il_apm_init(struct il_priv *il) + * power savings, even without L1. + */ + if (il->cfg->set_l0s) { +- pcie_capability_read_word(il->pci_dev, PCI_EXP_LNKCTL, &lctl); +- if (lctl & PCI_EXP_LNKCTL_ASPM_L1) { ++ ret = pcie_capability_read_word(il->pci_dev, PCI_EXP_LNKCTL, &lctl); ++ if (!ret && (lctl & PCI_EXP_LNKCTL_ASPM_L1)) { + /* L1-ASPM enabled; disable(!) L0S */ + il_set_bit(il, CSR_GIO_REG, + CSR_GIO_REG_VAL_L0S_ENABLED); +-- +2.25.1 + diff --git a/queue-5.4/kernfs-do-not-call-fsnotify-with-name-without-a-pare.patch b/queue-5.4/kernfs-do-not-call-fsnotify-with-name-without-a-pare.patch new file mode 100644 index 00000000000..8a3095b2434 --- /dev/null +++ b/queue-5.4/kernfs-do-not-call-fsnotify-with-name-without-a-pare.patch @@ -0,0 +1,48 @@ +From 86141d716df924a4862f6297f38cb47f9a517128 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 8 Jul 2020 14:11:40 +0300 +Subject: kernfs: do not call fsnotify() with name without a parent + +From: Amir Goldstein + +[ Upstream commit 9991bb84b27a2594187898f261866cfc50255454 ] + +When creating an FS_MODIFY event on inode itself (not on parent) +the file_name argument should be NULL. + +The change to send a non NULL name to inode itself was done on purpuse +as part of another commit, as Tejun writes: "...While at it, supply the +target file name to fsnotify() from kernfs_node->name.". + +But this is wrong practice and inconsistent with inotify behavior when +watching a single file. When a child is being watched (as opposed to the +parent directory) the inotify event should contain the watch descriptor, +but not the file name. + +Fixes: df6a58c5c5aa ("kernfs: don't depend on d_find_any_alias()...") +Link: https://lore.kernel.org/r/20200708111156.24659-5-amir73il@gmail.com +Acked-by: Tejun Heo +Acked-by: Greg Kroah-Hartman +Signed-off-by: Amir Goldstein +Signed-off-by: Jan Kara +Signed-off-by: Sasha Levin +--- + fs/kernfs/file.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c +index e8c792b496166..c35bbaa194862 100644 +--- a/fs/kernfs/file.c ++++ b/fs/kernfs/file.c +@@ -912,7 +912,7 @@ static void kernfs_notify_workfn(struct work_struct *work) + } + + fsnotify(inode, FS_MODIFY, inode, FSNOTIFY_EVENT_INODE, +- &name, 0); ++ NULL, 0); + iput(inode); + } + +-- +2.25.1 + diff --git a/queue-5.4/kobject-avoid-premature-parent-object-freeing-in-kob.patch b/queue-5.4/kobject-avoid-premature-parent-object-freeing-in-kob.patch new file mode 100644 index 00000000000..b01f2c42e13 --- /dev/null +++ b/queue-5.4/kobject-avoid-premature-parent-object-freeing-in-kob.patch @@ -0,0 +1,116 @@ +From a1c6b54fcf4aa4d3593f5c69d10bcb172dadb57e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 4 Jun 2020 19:46:46 +0200 +Subject: kobject: Avoid premature parent object freeing in kobject_cleanup() + +From: Heikki Krogerus + +[ Upstream commit 079ad2fb4bf9eba8a0aaab014b49705cd7f07c66 ] + +If kobject_del() is invoked by kobject_cleanup() to delete the +target kobject, it may cause its parent kobject to be freed +before invoking the target kobject's ->release() method, which +effectively means freeing the parent before dealing with the +child entirely. + +That is confusing at best and it may also lead to functional +issues if the callers of kobject_cleanup() are not careful enough +about the order in which these calls are made, so avoid the +problem by making kobject_cleanup() drop the last reference to +the target kobject's parent at the end, after invoking the target +kobject's ->release() method. + +[ rjw: Rewrite the subject and changelog, make kobject_cleanup() + drop the parent reference only when __kobject_del() has been + called. ] + +Reported-by: Naresh Kamboju +Reported-by: kernel test robot +Fixes: 7589238a8cf3 ("Revert "software node: Simplify software_node_release() function"") +Suggested-by: Rafael J. Wysocki +Signed-off-by: Heikki Krogerus +Signed-off-by: Rafael J. Wysocki +Link: https://lore.kernel.org/r/1908555.IiAGLGrh1Z@kreacher +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + lib/kobject.c | 33 +++++++++++++++++++++++---------- + 1 file changed, 23 insertions(+), 10 deletions(-) + +diff --git a/lib/kobject.c b/lib/kobject.c +index 83198cb37d8d9..386873bdd51c9 100644 +--- a/lib/kobject.c ++++ b/lib/kobject.c +@@ -599,14 +599,7 @@ int kobject_move(struct kobject *kobj, struct kobject *new_parent) + } + EXPORT_SYMBOL_GPL(kobject_move); + +-/** +- * kobject_del() - Unlink kobject from hierarchy. +- * @kobj: object. +- * +- * This is the function that should be called to delete an object +- * successfully added via kobject_add(). +- */ +-void kobject_del(struct kobject *kobj) ++static void __kobject_del(struct kobject *kobj) + { + struct kernfs_node *sd; + const struct kobj_type *ktype; +@@ -625,9 +618,23 @@ void kobject_del(struct kobject *kobj) + + kobj->state_in_sysfs = 0; + kobj_kset_leave(kobj); +- kobject_put(kobj->parent); + kobj->parent = NULL; + } ++ ++/** ++ * kobject_del() - Unlink kobject from hierarchy. ++ * @kobj: object. ++ * ++ * This is the function that should be called to delete an object ++ * successfully added via kobject_add(). ++ */ ++void kobject_del(struct kobject *kobj) ++{ ++ struct kobject *parent = kobj->parent; ++ ++ __kobject_del(kobj); ++ kobject_put(parent); ++} + EXPORT_SYMBOL(kobject_del); + + /** +@@ -663,6 +670,7 @@ EXPORT_SYMBOL(kobject_get_unless_zero); + */ + static void kobject_cleanup(struct kobject *kobj) + { ++ struct kobject *parent = kobj->parent; + struct kobj_type *t = get_ktype(kobj); + const char *name = kobj->name; + +@@ -684,7 +692,10 @@ static void kobject_cleanup(struct kobject *kobj) + if (kobj->state_in_sysfs) { + pr_debug("kobject: '%s' (%p): auto cleanup kobject_del\n", + kobject_name(kobj), kobj); +- kobject_del(kobj); ++ __kobject_del(kobj); ++ } else { ++ /* avoid dropping the parent reference unnecessarily */ ++ parent = NULL; + } + + if (t && t->release) { +@@ -698,6 +709,8 @@ static void kobject_cleanup(struct kobject *kobj) + pr_debug("kobject: '%s': free name\n", name); + kfree_const(name); + } ++ ++ kobject_put(parent); + } + + #ifdef CONFIG_DEBUG_KOBJECT_RELEASE +-- +2.25.1 + diff --git a/queue-5.4/leds-core-flush-scheduled-work-for-system-suspend.patch b/queue-5.4/leds-core-flush-scheduled-work-for-system-suspend.patch new file mode 100644 index 00000000000..51f30fe1704 --- /dev/null +++ b/queue-5.4/leds-core-flush-scheduled-work-for-system-suspend.patch @@ -0,0 +1,42 @@ +From 913ba4ccdc4c25e4abf2f5c9eb16302122565a7e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 2 Jul 2020 13:45:00 +0800 +Subject: leds: core: Flush scheduled work for system suspend + +From: Kai-Heng Feng + +[ Upstream commit 302a085c20194bfa7df52e0fe684ee0c41da02e6 ] + +Sometimes LED won't be turned off by LED_CORE_SUSPENDRESUME flag upon +system suspend. + +led_set_brightness_nopm() uses schedule_work() to set LED brightness. +However, there's no guarantee that the scheduled work gets executed +because no one flushes the work. + +So flush the scheduled work to make sure LED gets turned off. + +Signed-off-by: Kai-Heng Feng +Acked-by: Jacek Anaszewski +Fixes: 81fe8e5b73e3 ("leds: core: Add led_set_brightness_nosleep{nopm} functions") +Signed-off-by: Pavel Machek +Signed-off-by: Sasha Levin +--- + drivers/leds/led-class.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c +index d3e83c33783e5..0a4823d9797ae 100644 +--- a/drivers/leds/led-class.c ++++ b/drivers/leds/led-class.c +@@ -172,6 +172,7 @@ void led_classdev_suspend(struct led_classdev *led_cdev) + { + led_cdev->flags |= LED_SUSPENDED; + led_set_brightness_nopm(led_cdev, 0); ++ flush_work(&led_cdev->set_brightness_work); + } + EXPORT_SYMBOL_GPL(led_classdev_suspend); + +-- +2.25.1 + diff --git a/queue-5.4/leds-lm355x-avoid-enum-conversion-warning.patch b/queue-5.4/leds-lm355x-avoid-enum-conversion-warning.patch new file mode 100644 index 00000000000..baeb5ab9959 --- /dev/null +++ b/queue-5.4/leds-lm355x-avoid-enum-conversion-warning.patch @@ -0,0 +1,60 @@ +From 2c9f9c0afcd6df351d2dd03da917667a03794128 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 5 May 2020 16:19:17 +0200 +Subject: leds: lm355x: avoid enum conversion warning + +From: Arnd Bergmann + +[ Upstream commit 985b1f596f9ed56f42b8c2280005f943e1434c06 ] + +clang points out that doing arithmetic between diffent enums is usually +a mistake: + +drivers/leds/leds-lm355x.c:167:28: warning: bitwise operation between different enumeration types ('enum lm355x_tx2' and 'enum lm355x_ntc') [-Wenum-enum-conversion] + reg_val = pdata->pin_tx2 | pdata->ntc_pin; + ~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~ +drivers/leds/leds-lm355x.c:178:28: warning: bitwise operation between different enumeration types ('enum lm355x_tx2' and 'enum lm355x_ntc') [-Wenum-enum-conversion] + reg_val = pdata->pin_tx2 | pdata->ntc_pin | pdata->pass_mode; + ~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~ + +In this driver, it is intentional, so add a cast to hide the false-positive +warning. It appears to be the only instance of this warning at the moment. + +Fixes: b98d13c72592 ("leds: Add new LED driver for lm355x chips") +Signed-off-by: Arnd Bergmann +Signed-off-by: Pavel Machek +Signed-off-by: Sasha Levin +--- + drivers/leds/leds-lm355x.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/drivers/leds/leds-lm355x.c b/drivers/leds/leds-lm355x.c +index a5abb499574b8..129f475aebf29 100644 +--- a/drivers/leds/leds-lm355x.c ++++ b/drivers/leds/leds-lm355x.c +@@ -165,18 +165,19 @@ static int lm355x_chip_init(struct lm355x_chip_data *chip) + /* input and output pins configuration */ + switch (chip->type) { + case CHIP_LM3554: +- reg_val = pdata->pin_tx2 | pdata->ntc_pin; ++ reg_val = (u32)pdata->pin_tx2 | (u32)pdata->ntc_pin; + ret = regmap_update_bits(chip->regmap, 0xE0, 0x28, reg_val); + if (ret < 0) + goto out; +- reg_val = pdata->pass_mode; ++ reg_val = (u32)pdata->pass_mode; + ret = regmap_update_bits(chip->regmap, 0xA0, 0x04, reg_val); + if (ret < 0) + goto out; + break; + + case CHIP_LM3556: +- reg_val = pdata->pin_tx2 | pdata->ntc_pin | pdata->pass_mode; ++ reg_val = (u32)pdata->pin_tx2 | (u32)pdata->ntc_pin | ++ (u32)pdata->pass_mode; + ret = regmap_update_bits(chip->regmap, 0x0A, 0xC4, reg_val); + if (ret < 0) + goto out; +-- +2.25.1 + diff --git a/queue-5.4/liquidio-fix-wrong-return-value-in-cn23xx_get_pf_num.patch b/queue-5.4/liquidio-fix-wrong-return-value-in-cn23xx_get_pf_num.patch new file mode 100644 index 00000000000..88066965901 --- /dev/null +++ b/queue-5.4/liquidio-fix-wrong-return-value-in-cn23xx_get_pf_num.patch @@ -0,0 +1,37 @@ +From 1bb54023faa5bf842c0e63a2e5a13d88ce434aeb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 2 Aug 2020 19:15:44 +0800 +Subject: liquidio: Fix wrong return value in cn23xx_get_pf_num() + +From: Tianjia Zhang + +[ Upstream commit aa027850a292ea65524b8fab83eb91a124ad362c ] + +On an error exit path, a negative error code should be returned +instead of a positive return value. + +Fixes: 0c45d7fe12c7e ("liquidio: fix use of pf in pass-through mode in a virtual machine") +Cc: Rick Farrington +Signed-off-by: Tianjia Zhang +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c b/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c +index 43d11c38b38a9..4cddd628d41b2 100644 +--- a/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c ++++ b/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c +@@ -1167,7 +1167,7 @@ static int cn23xx_get_pf_num(struct octeon_device *oct) + oct->pf_num = ((fdl_bit >> CN23XX_PCIE_SRIOV_FDL_BIT_POS) & + CN23XX_PCIE_SRIOV_FDL_MASK); + } else { +- ret = EINVAL; ++ ret = -EINVAL; + + /* Under some virtual environments, extended PCI regs are + * inaccessible, in which case the above read will have failed. +-- +2.25.1 + diff --git a/queue-5.4/loop-be-paranoid-on-exit-and-prevent-new-additions-r.patch b/queue-5.4/loop-be-paranoid-on-exit-and-prevent-new-additions-r.patch new file mode 100644 index 00000000000..f946e5df8bc --- /dev/null +++ b/queue-5.4/loop-be-paranoid-on-exit-and-prevent-new-additions-r.patch @@ -0,0 +1,46 @@ +From f34f3572f62f27d4b106c396fb34fdbdc9b7477e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 19 Jun 2020 20:47:27 +0000 +Subject: loop: be paranoid on exit and prevent new additions / removals + +From: Luis Chamberlain + +[ Upstream commit 200f93377220504c5e56754823e7adfea6037f1a ] + +Be pedantic on removal as well and hold the mutex. +This should prevent uses of addition while we exit. + +Signed-off-by: Luis Chamberlain +Reviewed-by: Ming Lei +Reviewed-by: Christoph Hellwig +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + drivers/block/loop.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/block/loop.c b/drivers/block/loop.c +index 565e35e69f249..bddbbf5b3dda2 100644 +--- a/drivers/block/loop.c ++++ b/drivers/block/loop.c +@@ -2325,6 +2325,8 @@ static void __exit loop_exit(void) + + range = max_loop ? max_loop << part_shift : 1UL << MINORBITS; + ++ mutex_lock(&loop_ctl_mutex); ++ + idr_for_each(&loop_index_idr, &loop_exit_cb, NULL); + idr_destroy(&loop_index_idr); + +@@ -2332,6 +2334,8 @@ static void __exit loop_exit(void) + unregister_blkdev(LOOP_MAJOR, "loop"); + + misc_deregister(&loop_misc); ++ ++ mutex_unlock(&loop_ctl_mutex); + } + + module_init(loop_init); +-- +2.25.1 + diff --git a/queue-5.4/m68k-mac-don-t-send-iop-message-until-channel-is-idl.patch b/queue-5.4/m68k-mac-don-t-send-iop-message-until-channel-is-idl.patch new file mode 100644 index 00000000000..c45008276cf --- /dev/null +++ b/queue-5.4/m68k-mac-don-t-send-iop-message-until-channel-is-idl.patch @@ -0,0 +1,70 @@ +From 3d5f26df67df653bd803ad1035000c35eb4ea2e4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 31 May 2020 09:12:13 +1000 +Subject: m68k: mac: Don't send IOP message until channel is idle + +From: Finn Thain + +[ Upstream commit aeb445bf2194d83e12e85bf5c65baaf1f093bd8f ] + +In the following sequence of calls, iop_do_send() gets called when the +"send" channel is not in the IOP_MSG_IDLE state: + + iop_ism_irq() + iop_handle_send() + (msg->handler)() + iop_send_message() + iop_do_send() + +Avoid this by testing the channel state before calling iop_do_send(). + +When sending, and iop_send_queue is empty, call iop_do_send() because +the channel is idle. If iop_send_queue is not empty, iop_do_send() will +get called later by iop_handle_send(). + +Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") +Signed-off-by: Finn Thain +Tested-by: Stan Johnson +Cc: Joshua Thompson +Link: https://lore.kernel.org/r/6d667c39e53865661fa5a48f16829d18ed8abe54.1590880333.git.fthain@telegraphics.com.au +Signed-off-by: Geert Uytterhoeven +Signed-off-by: Sasha Levin +--- + arch/m68k/mac/iop.c | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +diff --git a/arch/m68k/mac/iop.c b/arch/m68k/mac/iop.c +index 9bfa170157688..d8f2282978f9c 100644 +--- a/arch/m68k/mac/iop.c ++++ b/arch/m68k/mac/iop.c +@@ -416,7 +416,8 @@ static void iop_handle_send(uint iop_num, uint chan) + msg->status = IOP_MSGSTATUS_UNUSED; + msg = msg->next; + iop_send_queue[iop_num][chan] = msg; +- if (msg) iop_do_send(msg); ++ if (msg && iop_readb(iop, IOP_ADDR_SEND_STATE + chan) == IOP_MSG_IDLE) ++ iop_do_send(msg); + } + + /* +@@ -490,16 +491,12 @@ int iop_send_message(uint iop_num, uint chan, void *privdata, + + if (!(q = iop_send_queue[iop_num][chan])) { + iop_send_queue[iop_num][chan] = msg; ++ iop_do_send(msg); + } else { + while (q->next) q = q->next; + q->next = msg; + } + +- if (iop_readb(iop_base[iop_num], +- IOP_ADDR_SEND_STATE + chan) == IOP_MSG_IDLE) { +- iop_do_send(msg); +- } +- + return 0; + } + +-- +2.25.1 + diff --git a/queue-5.4/m68k-mac-fix-iop-status-control-register-writes.patch b/queue-5.4/m68k-mac-fix-iop-status-control-register-writes.patch new file mode 100644 index 00000000000..b6192ed02f1 --- /dev/null +++ b/queue-5.4/m68k-mac-fix-iop-status-control-register-writes.patch @@ -0,0 +1,79 @@ +From 5ac71ba7fccb2e49831d976477d0ffcf09292639 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 31 May 2020 09:12:13 +1000 +Subject: m68k: mac: Fix IOP status/control register writes + +From: Finn Thain + +[ Upstream commit 931fc82a6aaf4e2e4a5490addaa6a090d78c24a7 ] + +When writing values to the IOP status/control register make sure those +values do not have any extraneous bits that will clear interrupt flags. + +To place the SCC IOP into bypass mode would be desirable but this is not +achieved by writing IOP_DMAINACTIVE | IOP_RUN | IOP_AUTOINC | IOP_BYPASS +to the control register. Drop this ineffective register write. + +Remove the flawed and unused iop_bypass() function. Make use of the +unused iop_stop() function. + +Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") +Signed-off-by: Finn Thain +Tested-by: Stan Johnson +Cc: Joshua Thompson +Link: https://lore.kernel.org/r/09bcb7359a1719a18b551ee515da3c4c3cf709e6.1590880333.git.fthain@telegraphics.com.au +Signed-off-by: Geert Uytterhoeven +Signed-off-by: Sasha Levin +--- + arch/m68k/mac/iop.c | 12 +++--------- + 1 file changed, 3 insertions(+), 9 deletions(-) + +diff --git a/arch/m68k/mac/iop.c b/arch/m68k/mac/iop.c +index d8f2282978f9c..c432bfafe63e2 100644 +--- a/arch/m68k/mac/iop.c ++++ b/arch/m68k/mac/iop.c +@@ -183,7 +183,7 @@ static __inline__ void iop_writeb(volatile struct mac_iop *iop, __u16 addr, __u8 + + static __inline__ void iop_stop(volatile struct mac_iop *iop) + { +- iop->status_ctrl &= ~IOP_RUN; ++ iop->status_ctrl = IOP_AUTOINC; + } + + static __inline__ void iop_start(volatile struct mac_iop *iop) +@@ -191,14 +191,9 @@ static __inline__ void iop_start(volatile struct mac_iop *iop) + iop->status_ctrl = IOP_RUN | IOP_AUTOINC; + } + +-static __inline__ void iop_bypass(volatile struct mac_iop *iop) +-{ +- iop->status_ctrl |= IOP_BYPASS; +-} +- + static __inline__ void iop_interrupt(volatile struct mac_iop *iop) + { +- iop->status_ctrl |= IOP_IRQ; ++ iop->status_ctrl = IOP_IRQ | IOP_RUN | IOP_AUTOINC; + } + + static int iop_alive(volatile struct mac_iop *iop) +@@ -244,7 +239,6 @@ void __init iop_preinit(void) + } else { + iop_base[IOP_NUM_SCC] = (struct mac_iop *) SCC_IOP_BASE_QUADRA; + } +- iop_base[IOP_NUM_SCC]->status_ctrl = 0x87; + iop_scc_present = 1; + } else { + iop_base[IOP_NUM_SCC] = NULL; +@@ -256,7 +250,7 @@ void __init iop_preinit(void) + } else { + iop_base[IOP_NUM_ISM] = (struct mac_iop *) ISM_IOP_BASE_QUADRA; + } +- iop_base[IOP_NUM_ISM]->status_ctrl = 0; ++ iop_stop(iop_base[IOP_NUM_ISM]); + iop_ism_present = 1; + } else { + iop_base[IOP_NUM_ISM] = NULL; +-- +2.25.1 + diff --git a/queue-5.4/macintosh-via-macii-access-autopoll_devs-when-inside.patch b/queue-5.4/macintosh-via-macii-access-autopoll_devs-when-inside.patch new file mode 100644 index 00000000000..7a1e54b386a --- /dev/null +++ b/queue-5.4/macintosh-via-macii-access-autopoll_devs-when-inside.patch @@ -0,0 +1,48 @@ +From fb3d6138e7de7fe0e3851f8165d0b356936b8be3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 28 Jun 2020 14:23:12 +1000 +Subject: macintosh/via-macii: Access autopoll_devs when inside lock + +From: Finn Thain + +[ Upstream commit 59ea38f6b3af5636edf541768a1ed721eeaca99e ] + +The interrupt handler should be excluded when accessing the autopoll_devs +variable. + +Fixes: d95fd5fce88f0 ("m68k: Mac II ADB fixes") # v5.0+ +Signed-off-by: Finn Thain +Tested-by: Stan Johnson +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/5952dd8a9bc9de90f1acc4790c51dd42b4c98065.1593318192.git.fthain@telegraphics.com.au +Signed-off-by: Sasha Levin +--- + drivers/macintosh/via-macii.c | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +diff --git a/drivers/macintosh/via-macii.c b/drivers/macintosh/via-macii.c +index ac824d7b2dcfc..6aa903529570d 100644 +--- a/drivers/macintosh/via-macii.c ++++ b/drivers/macintosh/via-macii.c +@@ -270,15 +270,12 @@ static int macii_autopoll(int devs) + unsigned long flags; + int err = 0; + ++ local_irq_save(flags); ++ + /* bit 1 == device 1, and so on. */ + autopoll_devs = devs & 0xFFFE; + +- if (!autopoll_devs) +- return 0; +- +- local_irq_save(flags); +- +- if (current_req == NULL) { ++ if (autopoll_devs && !current_req) { + /* Send a Talk Reg 0. The controller will repeatedly transmit + * this as long as it is idle. + */ +-- +2.25.1 + diff --git a/queue-5.4/md-cluster-fix-wild-pointer-of-unlock_all_bitmaps.patch b/queue-5.4/md-cluster-fix-wild-pointer-of-unlock_all_bitmaps.patch new file mode 100644 index 00000000000..111ebc06f24 --- /dev/null +++ b/queue-5.4/md-cluster-fix-wild-pointer-of-unlock_all_bitmaps.patch @@ -0,0 +1,72 @@ +From 95161979dbdbb482730d83ce3c184f5644c4ae8a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 9 Jul 2020 11:29:29 +0800 +Subject: md-cluster: fix wild pointer of unlock_all_bitmaps() + +From: Zhao Heming + +[ Upstream commit 60f80d6f2d07a6d8aee485a1d1252327eeee0c81 ] + +reproduction steps: +``` +node1 # mdadm -C /dev/md0 -b clustered -e 1.2 -n 2 -l mirror /dev/sda +/dev/sdb +node2 # mdadm -A /dev/md0 /dev/sda /dev/sdb +node1 # mdadm -G /dev/md0 -b none +mdadm: failed to remove clustered bitmap. +node1 # mdadm -S --scan +^C <==== mdadm hung & kernel crash +``` + +kernel stack: +``` +[ 335.230657] general protection fault: 0000 [#1] SMP NOPTI +[...] +[ 335.230848] Call Trace: +[ 335.230873] ? unlock_all_bitmaps+0x5/0x70 [md_cluster] +[ 335.230886] unlock_all_bitmaps+0x3d/0x70 [md_cluster] +[ 335.230899] leave+0x10f/0x190 [md_cluster] +[ 335.230932] ? md_super_wait+0x93/0xa0 [md_mod] +[ 335.230947] ? leave+0x5/0x190 [md_cluster] +[ 335.230973] md_cluster_stop+0x1a/0x30 [md_mod] +[ 335.230999] md_bitmap_free+0x142/0x150 [md_mod] +[ 335.231013] ? _cond_resched+0x15/0x40 +[ 335.231025] ? mutex_lock+0xe/0x30 +[ 335.231056] __md_stop+0x1c/0xa0 [md_mod] +[ 335.231083] do_md_stop+0x160/0x580 [md_mod] +[ 335.231119] ? 0xffffffffc05fb078 +[ 335.231148] md_ioctl+0xa04/0x1930 [md_mod] +[ 335.231165] ? filename_lookup+0xf2/0x190 +[ 335.231179] blkdev_ioctl+0x93c/0xa10 +[ 335.231205] ? _cond_resched+0x15/0x40 +[ 335.231214] ? __check_object_size+0xd4/0x1a0 +[ 335.231224] block_ioctl+0x39/0x40 +[ 335.231243] do_vfs_ioctl+0xa0/0x680 +[ 335.231253] ksys_ioctl+0x70/0x80 +[ 335.231261] __x64_sys_ioctl+0x16/0x20 +[ 335.231271] do_syscall_64+0x65/0x1f0 +[ 335.231278] entry_SYSCALL_64_after_hwframe+0x44/0xa9 +``` + +Signed-off-by: Zhao Heming +Signed-off-by: Song Liu +Signed-off-by: Sasha Levin +--- + drivers/md/md-cluster.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/md/md-cluster.c b/drivers/md/md-cluster.c +index 813a99ffa86f8..73fd50e779754 100644 +--- a/drivers/md/md-cluster.c ++++ b/drivers/md/md-cluster.c +@@ -1518,6 +1518,7 @@ static void unlock_all_bitmaps(struct mddev *mddev) + } + } + kfree(cinfo->other_bitmap_lockres); ++ cinfo->other_bitmap_lockres = NULL; + } + } + +-- +2.25.1 + diff --git a/queue-5.4/md-raid0-linear-fix-dereference-before-null-check-on.patch b/queue-5.4/md-raid0-linear-fix-dereference-before-null-check-on.patch new file mode 100644 index 00000000000..f54e8ab150f --- /dev/null +++ b/queue-5.4/md-raid0-linear-fix-dereference-before-null-check-on.patch @@ -0,0 +1,54 @@ +From d26ca855982f25bf44e09984e8d5e8aff3a38a5b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 2 Jul 2020 12:35:02 +0100 +Subject: md: raid0/linear: fix dereference before null check on pointer mddev + +From: Colin Ian King + +[ Upstream commit 9a5a85972c073f720d81a7ebd08bfe278e6e16db ] + +Pointer mddev is being dereferenced with a test_bit call before mddev +is being null checked, this may cause a null pointer dereference. Fix +this by moving the null pointer checks to sanity check mddev before +it is dereferenced. + +Addresses-Coverity: ("Dereference before null check") +Fixes: 62f7b1989c02 ("md raid0/linear: Mark array as 'broken' and fail BIOs if a member is gone") +Signed-off-by: Colin Ian King +Reviewed-by: Guilherme G. Piccoli +Signed-off-by: Song Liu +Signed-off-by: Sasha Levin +--- + drivers/md/md.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/drivers/md/md.c b/drivers/md/md.c +index 5a378a453a2d4..acef01e519d06 100644 +--- a/drivers/md/md.c ++++ b/drivers/md/md.c +@@ -376,17 +376,18 @@ static blk_qc_t md_make_request(struct request_queue *q, struct bio *bio) + struct mddev *mddev = q->queuedata; + unsigned int sectors; + +- if (unlikely(test_bit(MD_BROKEN, &mddev->flags)) && (rw == WRITE)) { ++ if (mddev == NULL || mddev->pers == NULL) { + bio_io_error(bio); + return BLK_QC_T_NONE; + } + +- blk_queue_split(q, &bio); +- +- if (mddev == NULL || mddev->pers == NULL) { ++ if (unlikely(test_bit(MD_BROKEN, &mddev->flags)) && (rw == WRITE)) { + bio_io_error(bio); + return BLK_QC_T_NONE; + } ++ ++ blk_queue_split(q, &bio); ++ + if (mddev->ro == 1 && unlikely(rw == WRITE)) { + if (bio_sectors(bio) != 0) + bio->bi_status = BLK_STS_IOERR; +-- +2.25.1 + diff --git a/queue-5.4/media-cros-ec-cec-do-not-bail-on-device_init_wakeup-.patch b/queue-5.4/media-cros-ec-cec-do-not-bail-on-device_init_wakeup-.patch new file mode 100644 index 00000000000..005268d9f3a --- /dev/null +++ b/queue-5.4/media-cros-ec-cec-do-not-bail-on-device_init_wakeup-.patch @@ -0,0 +1,50 @@ +From 51962786a49a4db414a07622939f0afce2f3ee9a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 22 Jun 2020 13:46:36 +0200 +Subject: media: cros-ec-cec: do not bail on device_init_wakeup failure + +From: Dariusz Marcinkiewicz + +[ Upstream commit 6f01dfb760c027d5dd6199d91ee9599f2676b5c6 ] + +Do not fail probing when device_init_wakeup fails. + +device_init_wakeup fails when the device is already enabled as wakeup +device. Hence, the driver fails to probe the device if: +- The device has already been enabled for wakeup (by e.g. sysfs) +- The driver has been unloaded and is being loaded again. + +This goal of the patch is to fix the above cases. + +Overwhelming majority of the drivers do not check device_init_wakeup +return code. + +Fixes: cd70de2d356ee ("media: platform: Add ChromeOS EC CEC driver") +Signed-off-by: Dariusz Marcinkiewicz +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/platform/cros-ec-cec/cros-ec-cec.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/drivers/media/platform/cros-ec-cec/cros-ec-cec.c b/drivers/media/platform/cros-ec-cec/cros-ec-cec.c +index 4a3b3810fd895..31390ce2dbf2d 100644 +--- a/drivers/media/platform/cros-ec-cec/cros-ec-cec.c ++++ b/drivers/media/platform/cros-ec-cec/cros-ec-cec.c +@@ -278,11 +278,7 @@ static int cros_ec_cec_probe(struct platform_device *pdev) + platform_set_drvdata(pdev, cros_ec_cec); + cros_ec_cec->cros_ec = cros_ec; + +- ret = device_init_wakeup(&pdev->dev, 1); +- if (ret) { +- dev_err(&pdev->dev, "failed to initialize wakeup\n"); +- return ret; +- } ++ device_init_wakeup(&pdev->dev, 1); + + cros_ec_cec->adap = cec_allocate_adapter(&cros_ec_cec_ops, cros_ec_cec, + DRV_NAME, +-- +2.25.1 + diff --git a/queue-5.4/media-cxusb-analog-fix-v4l2-dependency.patch b/queue-5.4/media-cxusb-analog-fix-v4l2-dependency.patch new file mode 100644 index 00000000000..ee3d8c6a18c --- /dev/null +++ b/queue-5.4/media-cxusb-analog-fix-v4l2-dependency.patch @@ -0,0 +1,48 @@ +From 5fb96eed5f4afeda2dcb6166b7e57c868b5b7be1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 7 May 2020 23:33:14 +0200 +Subject: media: cxusb-analog: fix V4L2 dependency + +From: Arnd Bergmann + +[ Upstream commit 1a55caf010c46d4f2073f9e92e97ef65358c16bf ] + +CONFIG_DVB_USB_CXUSB_ANALOG is a 'bool' symbol with a dependency on the +tristate CONFIG_VIDEO_V4L2, which means it can be enabled as =y even +when its dependency is =m. This leads to a link failure: + +drivers/media/usb/dvb-usb/cxusb-analog.o: In function `cxusb_medion_analog_init': +cxusb-analog.c:(.text+0x92): undefined reference to `v4l2_subdev_call_wrappers' +drivers/media/usb/dvb-usb/cxusb-analog.o: In function `cxusb_medion_register_analog': +cxusb-analog.c:(.text+0x466): undefined reference to `v4l2_device_register' +cxusb-analog.c:(.text+0x4c3): undefined reference to `v4l2_i2c_new_subdev' +cxusb-analog.c:(.text+0x4fb): undefined reference to `v4l2_subdev_call_wrappers' +... + +Change the dependency only disallow the analog portion of the driver +in that configuration. + +Fixes: e478d4054054 ("media: cxusb: add analog mode support for Medion MD95700") +Signed-off-by: Arnd Bergmann +Signed-off-by: Sean Young +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/usb/dvb-usb/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/media/usb/dvb-usb/Kconfig b/drivers/media/usb/dvb-usb/Kconfig +index 1a3e5f965ae40..2d7a5c1c84af6 100644 +--- a/drivers/media/usb/dvb-usb/Kconfig ++++ b/drivers/media/usb/dvb-usb/Kconfig +@@ -150,6 +150,7 @@ config DVB_USB_CXUSB + config DVB_USB_CXUSB_ANALOG + bool "Analog support for the Conexant USB2.0 hybrid reference design" + depends on DVB_USB_CXUSB && VIDEO_V4L2 ++ depends on VIDEO_V4L2=y || VIDEO_V4L2=DVB_USB_CXUSB + select VIDEO_CX25840 + select VIDEOBUF2_VMALLOC + help +-- +2.25.1 + diff --git a/queue-5.4/media-exynos4-is-add-missed-check-for-pinctrl_lookup.patch b/queue-5.4/media-exynos4-is-add-missed-check-for-pinctrl_lookup.patch new file mode 100644 index 00000000000..55d9d24bf52 --- /dev/null +++ b/queue-5.4/media-exynos4-is-add-missed-check-for-pinctrl_lookup.patch @@ -0,0 +1,38 @@ +From f9155ecf1f19bdb0614149b7b6aed2f0ffd626b9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 28 May 2020 08:41:47 +0200 +Subject: media: exynos4-is: Add missed check for pinctrl_lookup_state() + +From: Chuhong Yuan + +[ Upstream commit 18ffec750578f7447c288647d7282c7d12b1d969 ] + +fimc_md_get_pinctrl() misses a check for pinctrl_lookup_state(). +Add the missed check to fix it. + +Fixes: 4163851f7b99 ("[media] s5p-fimc: Use pinctrl API for camera ports configuration]") +Signed-off-by: Chuhong Yuan +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/platform/exynos4-is/media-dev.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/media/platform/exynos4-is/media-dev.c b/drivers/media/platform/exynos4-is/media-dev.c +index 9aaf3b8060d50..9c31d950cddf7 100644 +--- a/drivers/media/platform/exynos4-is/media-dev.c ++++ b/drivers/media/platform/exynos4-is/media-dev.c +@@ -1270,6 +1270,9 @@ static int fimc_md_get_pinctrl(struct fimc_md *fmd) + + pctl->state_idle = pinctrl_lookup_state(pctl->pinctrl, + PINCTRL_STATE_IDLE); ++ if (IS_ERR(pctl->state_idle)) ++ return PTR_ERR(pctl->state_idle); ++ + return 0; + } + +-- +2.25.1 + diff --git a/queue-5.4/media-firewire-using-uninitialized-values-in-node_pr.patch b/queue-5.4/media-firewire-using-uninitialized-values-in-node_pr.patch new file mode 100644 index 00000000000..e084b9618ec --- /dev/null +++ b/queue-5.4/media-firewire-using-uninitialized-values-in-node_pr.patch @@ -0,0 +1,40 @@ +From fe251f913f98fd2cd989a66168c0e515ffc32125 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 8 May 2020 16:40:22 +0200 +Subject: media: firewire: Using uninitialized values in node_probe() + +From: Dan Carpenter + +[ Upstream commit 2505a210fc126599013aec2be741df20aaacc490 ] + +If fw_csr_string() returns -ENOENT, then "name" is uninitialized. So +then the "strlen(model_names[i]) <= name_len" is true because strlen() +is unsigned and -ENOENT is type promoted to a very high positive value. +Then the "strncmp(name, model_names[i], name_len)" uses uninitialized +data because "name" is uninitialized. + +Fixes: 92374e886c75 ("[media] firedtv: drop obsolete backend abstraction") +Signed-off-by: Dan Carpenter +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/firewire/firedtv-fw.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/media/firewire/firedtv-fw.c b/drivers/media/firewire/firedtv-fw.c +index 97144734eb052..3f1ca40b9b987 100644 +--- a/drivers/media/firewire/firedtv-fw.c ++++ b/drivers/media/firewire/firedtv-fw.c +@@ -272,6 +272,8 @@ static int node_probe(struct fw_unit *unit, const struct ieee1394_device_id *id) + + name_len = fw_csr_string(unit->directory, CSR_MODEL, + name, sizeof(name)); ++ if (name_len < 0) ++ return name_len; + for (i = ARRAY_SIZE(model_names); --i; ) + if (strlen(model_names[i]) <= name_len && + strncmp(name, model_names[i], name_len) == 0) +-- +2.25.1 + diff --git a/queue-5.4/media-marvell-ccic-add-missed-v4l2_async_notifier_cl.patch b/queue-5.4/media-marvell-ccic-add-missed-v4l2_async_notifier_cl.patch new file mode 100644 index 00000000000..a3110f0a3e5 --- /dev/null +++ b/queue-5.4/media-marvell-ccic-add-missed-v4l2_async_notifier_cl.patch @@ -0,0 +1,45 @@ +From 39bc7532629046225999114a9444b4fa1bb2fc99 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 3 Jun 2020 18:40:48 +0200 +Subject: media: marvell-ccic: Add missed v4l2_async_notifier_cleanup() + +From: Chuhong Yuan + +[ Upstream commit 4603a5b4a87ccd6fb90cbfa10195291cfcf6ba34 ] + +mccic_register() forgets to cleanup the notifier in its error handler. +mccic_shutdown() also misses calling v4l2_async_notifier_cleanup(). +Add the missed calls to fix them. + +Fixes: 3eefe36cc00c ("media: marvell-ccic: use async notifier to get the sensor") +Signed-off-by: Chuhong Yuan +Signed-off-by: Sakari Ailus +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/platform/marvell-ccic/mcam-core.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell-ccic/mcam-core.c +index 803baf97f06e4..6de8b3d99fb9e 100644 +--- a/drivers/media/platform/marvell-ccic/mcam-core.c ++++ b/drivers/media/platform/marvell-ccic/mcam-core.c +@@ -1940,6 +1940,7 @@ int mccic_register(struct mcam_camera *cam) + out: + v4l2_async_notifier_unregister(&cam->notifier); + v4l2_device_unregister(&cam->v4l2_dev); ++ v4l2_async_notifier_cleanup(&cam->notifier); + return ret; + } + EXPORT_SYMBOL_GPL(mccic_register); +@@ -1961,6 +1962,7 @@ void mccic_shutdown(struct mcam_camera *cam) + v4l2_ctrl_handler_free(&cam->ctrl_handler); + v4l2_async_notifier_unregister(&cam->notifier); + v4l2_device_unregister(&cam->v4l2_dev); ++ v4l2_async_notifier_cleanup(&cam->notifier); + } + EXPORT_SYMBOL_GPL(mccic_shutdown); + +-- +2.25.1 + diff --git a/queue-5.4/media-omap3isp-add-missed-v4l2_ctrl_handler_free-for.patch b/queue-5.4/media-omap3isp-add-missed-v4l2_ctrl_handler_free-for.patch new file mode 100644 index 00000000000..715ea9e1a89 --- /dev/null +++ b/queue-5.4/media-omap3isp-add-missed-v4l2_ctrl_handler_free-for.patch @@ -0,0 +1,49 @@ +From 225b12cde020974291ae63bc8a50cfc293685d92 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 3 Jun 2020 18:41:22 +0200 +Subject: media: omap3isp: Add missed v4l2_ctrl_handler_free() for + preview_init_entities() + +From: Chuhong Yuan + +[ Upstream commit dc7690a73017e1236202022e26a6aa133f239c8c ] + +preview_init_entities() does not call v4l2_ctrl_handler_free() when +it fails. +Add the missed function to fix it. + +Fixes: de1135d44f4f ("[media] omap3isp: CCDC, preview engine and resizer") +Signed-off-by: Chuhong Yuan +Reviewed-by: Laurent Pinchart +Signed-off-by: Sakari Ailus +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/platform/omap3isp/isppreview.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/media/platform/omap3isp/isppreview.c b/drivers/media/platform/omap3isp/isppreview.c +index 97d660606d984..b8c2b8bba826e 100644 +--- a/drivers/media/platform/omap3isp/isppreview.c ++++ b/drivers/media/platform/omap3isp/isppreview.c +@@ -2287,7 +2287,7 @@ static int preview_init_entities(struct isp_prev_device *prev) + me->ops = &preview_media_ops; + ret = media_entity_pads_init(me, PREV_PADS_NUM, pads); + if (ret < 0) +- return ret; ++ goto error_handler_free; + + preview_init_formats(sd, NULL); + +@@ -2320,6 +2320,8 @@ static int preview_init_entities(struct isp_prev_device *prev) + omap3isp_video_cleanup(&prev->video_in); + error_video_in: + media_entity_cleanup(&prev->subdev.entity); ++error_handler_free: ++ v4l2_ctrl_handler_free(&prev->ctrls); + return ret; + } + +-- +2.25.1 + diff --git a/queue-5.4/mips-octeon-add-missing-put_device-call-in-dwc3_octe.patch b/queue-5.4/mips-octeon-add-missing-put_device-call-in-dwc3_octe.patch new file mode 100644 index 00000000000..74e3664530f --- /dev/null +++ b/queue-5.4/mips-octeon-add-missing-put_device-call-in-dwc3_octe.patch @@ -0,0 +1,49 @@ +From 15d621f93148ef9ebbc104a9b56725d58778e51f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 21 Jul 2020 21:47:18 +0800 +Subject: MIPS: OCTEON: add missing put_device() call in + dwc3_octeon_device_init() + +From: Yu Kuai + +[ Upstream commit e8b9fc10f2615b9a525fce56981e40b489528355 ] + +if of_find_device_by_node() succeed, dwc3_octeon_device_init() doesn't have +a corresponding put_device(). Thus add put_device() to fix the exception +handling for this function implementation. + +Fixes: 93e502b3c2d4 ("MIPS: OCTEON: Platform support for OCTEON III USB controller") +Signed-off-by: Yu Kuai +Signed-off-by: Thomas Bogendoerfer +Signed-off-by: Sasha Levin +--- + arch/mips/cavium-octeon/octeon-usb.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/arch/mips/cavium-octeon/octeon-usb.c b/arch/mips/cavium-octeon/octeon-usb.c +index cc88a08bc1f73..4017398519cf9 100644 +--- a/arch/mips/cavium-octeon/octeon-usb.c ++++ b/arch/mips/cavium-octeon/octeon-usb.c +@@ -518,6 +518,7 @@ static int __init dwc3_octeon_device_init(void) + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (res == NULL) { ++ put_device(&pdev->dev); + dev_err(&pdev->dev, "No memory resources\n"); + return -ENXIO; + } +@@ -529,8 +530,10 @@ static int __init dwc3_octeon_device_init(void) + * know the difference. + */ + base = devm_ioremap_resource(&pdev->dev, res); +- if (IS_ERR(base)) ++ if (IS_ERR(base)) { ++ put_device(&pdev->dev); + return PTR_ERR(base); ++ } + + mutex_lock(&dwc3_octeon_clocks_mutex); + dwc3_octeon_clocks_start(&pdev->dev, (u64)base); +-- +2.25.1 + diff --git a/queue-5.4/mm-mmap.c-add-cond_resched-for-exit_mmap-cpu-stalls.patch b/queue-5.4/mm-mmap.c-add-cond_resched-for-exit_mmap-cpu-stalls.patch new file mode 100644 index 00000000000..7e2ee2907df --- /dev/null +++ b/queue-5.4/mm-mmap.c-add-cond_resched-for-exit_mmap-cpu-stalls.patch @@ -0,0 +1,83 @@ +From 3e3fabdef4b09e09f9d3e16e565311023ed3d887 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 16 Apr 2020 16:46:10 -0700 +Subject: mm/mmap.c: Add cond_resched() for exit_mmap() CPU stalls + +From: Paul E. McKenney + +[ Upstream commit 0a3b3c253a1eb2c7fe7f34086d46660c909abeb3 ] + +A large process running on a heavily loaded system can encounter the +following RCU CPU stall warning: + + rcu: INFO: rcu_sched self-detected stall on CPU + rcu: 3-....: (20998 ticks this GP) idle=4ea/1/0x4000000000000002 softirq=556558/556558 fqs=5190 + (t=21013 jiffies g=1005461 q=132576) + NMI backtrace for cpu 3 + CPU: 3 PID: 501900 Comm: aio-free-ring-w Kdump: loaded Not tainted 5.2.9-108_fbk12_rc3_3858_gb83b75af7909 #1 + Hardware name: Wiwynn HoneyBadger/PantherPlus, BIOS HBM6.71 02/03/2016 + Call Trace: + + dump_stack+0x46/0x60 + nmi_cpu_backtrace.cold.3+0x13/0x50 + ? lapic_can_unplug_cpu.cold.27+0x34/0x34 + nmi_trigger_cpumask_backtrace+0xba/0xca + rcu_dump_cpu_stacks+0x99/0xc7 + rcu_sched_clock_irq.cold.87+0x1aa/0x397 + ? tick_sched_do_timer+0x60/0x60 + update_process_times+0x28/0x60 + tick_sched_timer+0x37/0x70 + __hrtimer_run_queues+0xfe/0x270 + hrtimer_interrupt+0xf4/0x210 + smp_apic_timer_interrupt+0x5e/0x120 + apic_timer_interrupt+0xf/0x20 + + RIP: 0010:kmem_cache_free+0x223/0x300 + Code: 88 00 00 00 0f 85 ca 00 00 00 41 8b 55 18 31 f6 f7 da 41 f6 45 0a 02 40 0f 94 c6 83 c6 05 9c 41 5e fa e8 a0 a7 01 00 41 56 9d <49> 8b 47 08 a8 03 0f 85 87 00 00 00 65 48 ff 08 e9 3d fe ff ff 65 + RSP: 0018:ffffc9000e8e3da8 EFLAGS: 00000206 ORIG_RAX: ffffffffffffff13 + RAX: 0000000000020000 RBX: ffff88861b9de960 RCX: 0000000000000030 + RDX: fffffffffffe41e8 RSI: 000060777fe3a100 RDI: 000000000001be18 + RBP: ffffea00186e7780 R08: ffffffffffffffff R09: ffffffffffffffff + R10: ffff88861b9dea28 R11: ffff88887ffde000 R12: ffffffff81230a1f + R13: ffff888854684dc0 R14: 0000000000000206 R15: ffff8888547dbc00 + ? remove_vma+0x4f/0x60 + remove_vma+0x4f/0x60 + exit_mmap+0xd6/0x160 + mmput+0x4a/0x110 + do_exit+0x278/0xae0 + ? syscall_trace_enter+0x1d3/0x2b0 + ? handle_mm_fault+0xaa/0x1c0 + do_group_exit+0x3a/0xa0 + __x64_sys_exit_group+0x14/0x20 + do_syscall_64+0x42/0x100 + entry_SYSCALL_64_after_hwframe+0x44/0xa9 + +And on a PREEMPT=n kernel, the "while (vma)" loop in exit_mmap() can run +for a very long time given a large process. This commit therefore adds +a cond_resched() to this loop, providing RCU any needed quiescent states. + +Cc: Andrew Morton +Cc: +Reviewed-by: Shakeel Butt +Reviewed-by: Joel Fernandes (Google) +Signed-off-by: Paul E. McKenney +Signed-off-by: Sasha Levin +--- + mm/mmap.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/mm/mmap.c b/mm/mmap.c +index ea1ba2db4f4fe..a3584a90c55c2 100644 +--- a/mm/mmap.c ++++ b/mm/mmap.c +@@ -3172,6 +3172,7 @@ void exit_mmap(struct mm_struct *mm) + if (vma->vm_flags & VM_ACCOUNT) + nr_accounted += vma_pages(vma); + vma = remove_vma(vma); ++ cond_resched(); + } + vm_unacct_memory(nr_accounted); + } +-- +2.25.1 + diff --git a/queue-5.4/mmc-sdhci-cadence-do-not-use-hardware-tuning-for-sd-.patch b/queue-5.4/mmc-sdhci-cadence-do-not-use-hardware-tuning-for-sd-.patch new file mode 100644 index 00000000000..a841dd2aeeb --- /dev/null +++ b/queue-5.4/mmc-sdhci-cadence-do-not-use-hardware-tuning-for-sd-.patch @@ -0,0 +1,195 @@ +From 56ca63272f687f5e1a590fda8267a81a6b3a094a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 20 Jul 2020 15:11:41 +0900 +Subject: mmc: sdhci-cadence: do not use hardware tuning for SD mode + +From: Masahiro Yamada + +[ Upstream commit adc40a5179df30421a5537bfeb4545100ab97d5e ] + +As commit ef6b75671b5f ("mmc: sdhci-cadence: send tune request twice to +work around errata") stated, this IP has an errata. This commit applies +the second workaround for the SD mode. + +Due to the errata, it is not possible to use the hardware tuning provided +by SDHCI_HOST_CONTROL2. + +Use the software-controlled tuning like the eMMC mode. + +Set sdhci_host_ops::platform_execute_tuning instead of overriding +mmc_host_ops::execute_tuning. + +Signed-off-by: Masahiro Yamada +Link: https://lore.kernel.org/r/20200720061141.172944-1-yamada.masahiro@socionext.com +Signed-off-by: Ulf Hansson +Signed-off-by: Sasha Levin +--- + drivers/mmc/host/sdhci-cadence.c | 123 ++++++++++++++++--------------- + 1 file changed, 62 insertions(+), 61 deletions(-) + +diff --git a/drivers/mmc/host/sdhci-cadence.c b/drivers/mmc/host/sdhci-cadence.c +index 5f2e9696ee4de..0c2489446bd73 100644 +--- a/drivers/mmc/host/sdhci-cadence.c ++++ b/drivers/mmc/host/sdhci-cadence.c +@@ -194,57 +194,6 @@ static u32 sdhci_cdns_get_emmc_mode(struct sdhci_cdns_priv *priv) + return FIELD_GET(SDHCI_CDNS_HRS06_MODE, tmp); + } + +-static void sdhci_cdns_set_uhs_signaling(struct sdhci_host *host, +- unsigned int timing) +-{ +- struct sdhci_cdns_priv *priv = sdhci_cdns_priv(host); +- u32 mode; +- +- switch (timing) { +- case MMC_TIMING_MMC_HS: +- mode = SDHCI_CDNS_HRS06_MODE_MMC_SDR; +- break; +- case MMC_TIMING_MMC_DDR52: +- mode = SDHCI_CDNS_HRS06_MODE_MMC_DDR; +- break; +- case MMC_TIMING_MMC_HS200: +- mode = SDHCI_CDNS_HRS06_MODE_MMC_HS200; +- break; +- case MMC_TIMING_MMC_HS400: +- if (priv->enhanced_strobe) +- mode = SDHCI_CDNS_HRS06_MODE_MMC_HS400ES; +- else +- mode = SDHCI_CDNS_HRS06_MODE_MMC_HS400; +- break; +- default: +- mode = SDHCI_CDNS_HRS06_MODE_SD; +- break; +- } +- +- sdhci_cdns_set_emmc_mode(priv, mode); +- +- /* For SD, fall back to the default handler */ +- if (mode == SDHCI_CDNS_HRS06_MODE_SD) +- sdhci_set_uhs_signaling(host, timing); +-} +- +-static const struct sdhci_ops sdhci_cdns_ops = { +- .set_clock = sdhci_set_clock, +- .get_timeout_clock = sdhci_cdns_get_timeout_clock, +- .set_bus_width = sdhci_set_bus_width, +- .reset = sdhci_reset, +- .set_uhs_signaling = sdhci_cdns_set_uhs_signaling, +-}; +- +-static const struct sdhci_pltfm_data sdhci_cdns_uniphier_pltfm_data = { +- .ops = &sdhci_cdns_ops, +- .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN, +-}; +- +-static const struct sdhci_pltfm_data sdhci_cdns_pltfm_data = { +- .ops = &sdhci_cdns_ops, +-}; +- + static int sdhci_cdns_set_tune_val(struct sdhci_host *host, unsigned int val) + { + struct sdhci_cdns_priv *priv = sdhci_cdns_priv(host); +@@ -278,23 +227,24 @@ static int sdhci_cdns_set_tune_val(struct sdhci_host *host, unsigned int val) + return 0; + } + +-static int sdhci_cdns_execute_tuning(struct mmc_host *mmc, u32 opcode) ++/* ++ * In SD mode, software must not use the hardware tuning and instead perform ++ * an almost identical procedure to eMMC. ++ */ ++static int sdhci_cdns_execute_tuning(struct sdhci_host *host, u32 opcode) + { +- struct sdhci_host *host = mmc_priv(mmc); + int cur_streak = 0; + int max_streak = 0; + int end_of_streak = 0; + int i; + + /* +- * This handler only implements the eMMC tuning that is specific to +- * this controller. Fall back to the standard method for SD timing. ++ * Do not execute tuning for UHS_SDR50 or UHS_DDR50. ++ * The delay is set by probe, based on the DT properties. + */ +- if (host->timing != MMC_TIMING_MMC_HS200) +- return sdhci_execute_tuning(mmc, opcode); +- +- if (WARN_ON(opcode != MMC_SEND_TUNING_BLOCK_HS200)) +- return -EINVAL; ++ if (host->timing != MMC_TIMING_MMC_HS200 && ++ host->timing != MMC_TIMING_UHS_SDR104) ++ return 0; + + for (i = 0; i < SDHCI_CDNS_MAX_TUNING_LOOP; i++) { + if (sdhci_cdns_set_tune_val(host, i) || +@@ -317,6 +267,58 @@ static int sdhci_cdns_execute_tuning(struct mmc_host *mmc, u32 opcode) + return sdhci_cdns_set_tune_val(host, end_of_streak - max_streak / 2); + } + ++static void sdhci_cdns_set_uhs_signaling(struct sdhci_host *host, ++ unsigned int timing) ++{ ++ struct sdhci_cdns_priv *priv = sdhci_cdns_priv(host); ++ u32 mode; ++ ++ switch (timing) { ++ case MMC_TIMING_MMC_HS: ++ mode = SDHCI_CDNS_HRS06_MODE_MMC_SDR; ++ break; ++ case MMC_TIMING_MMC_DDR52: ++ mode = SDHCI_CDNS_HRS06_MODE_MMC_DDR; ++ break; ++ case MMC_TIMING_MMC_HS200: ++ mode = SDHCI_CDNS_HRS06_MODE_MMC_HS200; ++ break; ++ case MMC_TIMING_MMC_HS400: ++ if (priv->enhanced_strobe) ++ mode = SDHCI_CDNS_HRS06_MODE_MMC_HS400ES; ++ else ++ mode = SDHCI_CDNS_HRS06_MODE_MMC_HS400; ++ break; ++ default: ++ mode = SDHCI_CDNS_HRS06_MODE_SD; ++ break; ++ } ++ ++ sdhci_cdns_set_emmc_mode(priv, mode); ++ ++ /* For SD, fall back to the default handler */ ++ if (mode == SDHCI_CDNS_HRS06_MODE_SD) ++ sdhci_set_uhs_signaling(host, timing); ++} ++ ++static const struct sdhci_ops sdhci_cdns_ops = { ++ .set_clock = sdhci_set_clock, ++ .get_timeout_clock = sdhci_cdns_get_timeout_clock, ++ .set_bus_width = sdhci_set_bus_width, ++ .reset = sdhci_reset, ++ .platform_execute_tuning = sdhci_cdns_execute_tuning, ++ .set_uhs_signaling = sdhci_cdns_set_uhs_signaling, ++}; ++ ++static const struct sdhci_pltfm_data sdhci_cdns_uniphier_pltfm_data = { ++ .ops = &sdhci_cdns_ops, ++ .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN, ++}; ++ ++static const struct sdhci_pltfm_data sdhci_cdns_pltfm_data = { ++ .ops = &sdhci_cdns_ops, ++}; ++ + static void sdhci_cdns_hs400_enhanced_strobe(struct mmc_host *mmc, + struct mmc_ios *ios) + { +@@ -377,7 +379,6 @@ static int sdhci_cdns_probe(struct platform_device *pdev) + priv->hrs_addr = host->ioaddr; + priv->enhanced_strobe = false; + host->ioaddr += SDHCI_CDNS_SRS_BASE; +- host->mmc_host_ops.execute_tuning = sdhci_cdns_execute_tuning; + host->mmc_host_ops.hs400_enhanced_strobe = + sdhci_cdns_hs400_enhanced_strobe; + sdhci_enable_v4_mode(host); +-- +2.25.1 + diff --git a/queue-5.4/mmc-sdhci-pci-o2micro-bug-fix-for-o2-host-controller.patch b/queue-5.4/mmc-sdhci-pci-o2micro-bug-fix-for-o2-host-controller.patch new file mode 100644 index 00000000000..b03f187df88 --- /dev/null +++ b/queue-5.4/mmc-sdhci-pci-o2micro-bug-fix-for-o2-host-controller.patch @@ -0,0 +1,42 @@ +From 00e0ee661787fe4b9239dc8b1a9b5f6f8775f2d0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 20 Jul 2020 18:17:33 -0700 +Subject: mmc: sdhci-pci-o2micro: Bug fix for O2 host controller Seabird1 + +From: shirley her + +[ Upstream commit cdd2b769789ae1a030e1a26f6c37c5833cabcb34 ] + +To fix support for the O2 host controller Seabird1, set the quirk +SDHCI_QUIRK2_PRESET_VALUE_BROKEN and the capability bit MMC_CAP2_NO_SDIO. +Moreover, assign the ->get_cd() callback. + +Signed-off-by: Shirley Her +Link: https://lore.kernel.org/r/20200721011733.8416-1-shirley.her@bayhubtech.com +[Ulf: Updated the commit message] +Signed-off-by: Ulf Hansson +Signed-off-by: Sasha Levin +--- + drivers/mmc/host/sdhci-pci-o2micro.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/mmc/host/sdhci-pci-o2micro.c b/drivers/mmc/host/sdhci-pci-o2micro.c +index fa8105087d684..41a2394313dd0 100644 +--- a/drivers/mmc/host/sdhci-pci-o2micro.c ++++ b/drivers/mmc/host/sdhci-pci-o2micro.c +@@ -561,6 +561,12 @@ int sdhci_pci_o2_probe_slot(struct sdhci_pci_slot *slot) + slot->host->mmc_host_ops.get_cd = sdhci_o2_get_cd; + } + ++ if (chip->pdev->device == PCI_DEVICE_ID_O2_SEABIRD1) { ++ slot->host->mmc_host_ops.get_cd = sdhci_o2_get_cd; ++ host->mmc->caps2 |= MMC_CAP2_NO_SDIO; ++ host->quirks2 |= SDHCI_QUIRK2_PRESET_VALUE_BROKEN; ++ } ++ + host->mmc_host_ops.execute_tuning = sdhci_o2_execute_tuning; + + if (chip->pdev->device != PCI_DEVICE_ID_O2_FUJIN2) +-- +2.25.1 + diff --git a/queue-5.4/mt76-mt7615-fix-potential-memory-leak-in-mcu-message.patch b/queue-5.4/mt76-mt7615-fix-potential-memory-leak-in-mcu-message.patch new file mode 100644 index 00000000000..d3a9465d453 --- /dev/null +++ b/queue-5.4/mt76-mt7615-fix-potential-memory-leak-in-mcu-message.patch @@ -0,0 +1,48 @@ +From b46f9993dc02eb99de2d80aecca4e3ab593db3b9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 8 Jul 2020 03:16:48 +0800 +Subject: mt76: mt7615: fix potential memory leak in mcu message handler + +From: Sean Wang + +[ Upstream commit 9248c08c3fc4ef816c82aa49d01123f4746d349f ] + +Fix potential memory leak in mcu message handler on error condition. + +Fixes: 0e6a29e477f3 ("mt76: mt7615: add support to read temperature from mcu") +Acked-by: Lorenzo Bianconi +Signed-off-by: Sean Wang +Signed-off-by: Felix Fietkau +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +index 842cd81704db6..b6867d93c0e34 100644 +--- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c ++++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +@@ -119,8 +119,10 @@ mt7615_mcu_parse_response(struct mt7615_dev *dev, int cmd, + struct mt7615_mcu_rxd *rxd = (struct mt7615_mcu_rxd *)skb->data; + int ret = 0; + +- if (seq != rxd->seq) +- return -EAGAIN; ++ if (seq != rxd->seq) { ++ ret = -EAGAIN; ++ goto out; ++ } + + switch (cmd) { + case -MCU_CMD_PATCH_SEM_CONTROL: +@@ -134,6 +136,7 @@ mt7615_mcu_parse_response(struct mt7615_dev *dev, int cmd, + default: + break; + } ++out: + dev_kfree_skb(skb); + + return ret; +-- +2.25.1 + diff --git a/queue-5.4/mwifiex-fix-firmware-filename-for-sd8977-chipset.patch b/queue-5.4/mwifiex-fix-firmware-filename-for-sd8977-chipset.patch new file mode 100644 index 00000000000..63be68e2ca6 --- /dev/null +++ b/queue-5.4/mwifiex-fix-firmware-filename-for-sd8977-chipset.patch @@ -0,0 +1,42 @@ +From 80983cb73504bfbbadafb68995417238f98aaeab Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 3 Jun 2020 10:22:26 +0200 +Subject: mwifiex: Fix firmware filename for sd8977 chipset +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Pali Rohár + +[ Upstream commit 47fd3ee25e13cc5add48ba2ed71f7ee964b9c3a4 ] + +Firmware for sd8977 chipset is distributed by Marvell package and also as +part of the linux-firmware repository in filename sdsd8977_combo_v2.bin. + +This patch fixes mwifiex driver to load correct firmware file for sd8977. + +Fixes: 1a0f547831dce ("mwifiex: add support for sd8977 chipset") +Signed-off-by: Pali Rohár +Acked-by: Ganapathi Bhat +Signed-off-by: Marcel Holtmann +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/marvell/mwifiex/sdio.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.h b/drivers/net/wireless/marvell/mwifiex/sdio.h +index f672bdf52cc17..9364e2c267f72 100644 +--- a/drivers/net/wireless/marvell/mwifiex/sdio.h ++++ b/drivers/net/wireless/marvell/mwifiex/sdio.h +@@ -36,7 +36,7 @@ + #define SD8897_DEFAULT_FW_NAME "mrvl/sd8897_uapsta.bin" + #define SD8887_DEFAULT_FW_NAME "mrvl/sd8887_uapsta.bin" + #define SD8801_DEFAULT_FW_NAME "mrvl/sd8801_uapsta.bin" +-#define SD8977_DEFAULT_FW_NAME "mrvl/sd8977_uapsta.bin" ++#define SD8977_DEFAULT_FW_NAME "mrvl/sdsd8977_combo_v2.bin" + #define SD8987_DEFAULT_FW_NAME "mrvl/sd8987_uapsta.bin" + #define SD8997_DEFAULT_FW_NAME "mrvl/sd8997_uapsta.bin" + +-- +2.25.1 + diff --git a/queue-5.4/mwifiex-fix-firmware-filename-for-sd8997-chipset.patch b/queue-5.4/mwifiex-fix-firmware-filename-for-sd8997-chipset.patch new file mode 100644 index 00000000000..b477a753a9a --- /dev/null +++ b/queue-5.4/mwifiex-fix-firmware-filename-for-sd8997-chipset.patch @@ -0,0 +1,42 @@ +From 1146d8e40a69f0bf7f0a5a5e5e21a41cbf27f3ec Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 3 Jun 2020 10:22:27 +0200 +Subject: mwifiex: Fix firmware filename for sd8997 chipset +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Pali Rohár + +[ Upstream commit 2e1fcac52a9ea53e5a13a585d48a29a0fb4a9daf ] + +Firmware for sd8997 chipset is distributed by Marvell package and also as +part of the linux-firmware repository in filename sdsd8997_combo_v4.bin. + +This patch fixes mwifiex driver to load correct firmware file for sd8997. + +Fixes: 6d85ef00d9dfe ("mwifiex: add support for 8997 chipset") +Signed-off-by: Pali Rohár +Acked-by: Ganapathi Bhat +Signed-off-by: Marcel Holtmann +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/marvell/mwifiex/sdio.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.h b/drivers/net/wireless/marvell/mwifiex/sdio.h +index 9364e2c267f72..2d9ec225aead9 100644 +--- a/drivers/net/wireless/marvell/mwifiex/sdio.h ++++ b/drivers/net/wireless/marvell/mwifiex/sdio.h +@@ -38,7 +38,7 @@ + #define SD8801_DEFAULT_FW_NAME "mrvl/sd8801_uapsta.bin" + #define SD8977_DEFAULT_FW_NAME "mrvl/sdsd8977_combo_v2.bin" + #define SD8987_DEFAULT_FW_NAME "mrvl/sd8987_uapsta.bin" +-#define SD8997_DEFAULT_FW_NAME "mrvl/sd8997_uapsta.bin" ++#define SD8997_DEFAULT_FW_NAME "mrvl/sdsd8997_combo_v4.bin" + + #define BLOCK_MODE 1 + #define BYTE_MODE 0 +-- +2.25.1 + diff --git a/queue-5.4/mwifiex-prevent-memory-corruption-handling-keys.patch b/queue-5.4/mwifiex-prevent-memory-corruption-handling-keys.patch new file mode 100644 index 00000000000..9d710444133 --- /dev/null +++ b/queue-5.4/mwifiex-prevent-memory-corruption-handling-keys.patch @@ -0,0 +1,82 @@ +From 9ffb7552b6193ad9d3f3d2aba027b7d94d996b4d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 8 Jul 2020 14:58:57 +0300 +Subject: mwifiex: Prevent memory corruption handling keys + +From: Dan Carpenter + +[ Upstream commit e18696786548244914f36ec3c46ac99c53df99c3 ] + +The length of the key comes from the network and it's a 16 bit number. It +needs to be capped to prevent a buffer overflow. + +Fixes: 5e6e3a92b9a4 ("wireless: mwifiex: initial commit for Marvell mwifiex driver") +Signed-off-by: Dan Carpenter +Acked-by: Ganapathi Bhat +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/20200708115857.GA13729@mwanda +Signed-off-by: Sasha Levin +--- + .../wireless/marvell/mwifiex/sta_cmdresp.c | 22 +++++++++++++------ + 1 file changed, 15 insertions(+), 7 deletions(-) + +diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c +index 20c206da06315..7ae2c34f65db2 100644 +--- a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c ++++ b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c +@@ -580,6 +580,11 @@ static int mwifiex_ret_802_11_key_material_v1(struct mwifiex_private *priv, + { + struct host_cmd_ds_802_11_key_material *key = + &resp->params.key_material; ++ int len; ++ ++ len = le16_to_cpu(key->key_param_set.key_len); ++ if (len > sizeof(key->key_param_set.key)) ++ return -EINVAL; + + if (le16_to_cpu(key->action) == HostCmd_ACT_GEN_SET) { + if ((le16_to_cpu(key->key_param_set.key_info) & KEY_MCAST)) { +@@ -593,9 +598,8 @@ static int mwifiex_ret_802_11_key_material_v1(struct mwifiex_private *priv, + + memset(priv->aes_key.key_param_set.key, 0, + sizeof(key->key_param_set.key)); +- priv->aes_key.key_param_set.key_len = key->key_param_set.key_len; +- memcpy(priv->aes_key.key_param_set.key, key->key_param_set.key, +- le16_to_cpu(priv->aes_key.key_param_set.key_len)); ++ priv->aes_key.key_param_set.key_len = cpu_to_le16(len); ++ memcpy(priv->aes_key.key_param_set.key, key->key_param_set.key, len); + + return 0; + } +@@ -610,9 +614,14 @@ static int mwifiex_ret_802_11_key_material_v2(struct mwifiex_private *priv, + struct host_cmd_ds_command *resp) + { + struct host_cmd_ds_802_11_key_material_v2 *key_v2; +- __le16 len; ++ int len; + + key_v2 = &resp->params.key_material_v2; ++ ++ len = le16_to_cpu(key_v2->key_param_set.key_params.aes.key_len); ++ if (len > WLAN_KEY_LEN_CCMP) ++ return -EINVAL; ++ + if (le16_to_cpu(key_v2->action) == HostCmd_ACT_GEN_SET) { + if ((le16_to_cpu(key_v2->key_param_set.key_info) & KEY_MCAST)) { + mwifiex_dbg(priv->adapter, INFO, "info: key: GTK is set\n"); +@@ -628,10 +637,9 @@ static int mwifiex_ret_802_11_key_material_v2(struct mwifiex_private *priv, + memset(priv->aes_key_v2.key_param_set.key_params.aes.key, 0, + WLAN_KEY_LEN_CCMP); + priv->aes_key_v2.key_param_set.key_params.aes.key_len = +- key_v2->key_param_set.key_params.aes.key_len; +- len = priv->aes_key_v2.key_param_set.key_params.aes.key_len; ++ cpu_to_le16(len); + memcpy(priv->aes_key_v2.key_param_set.key_params.aes.key, +- key_v2->key_param_set.key_params.aes.key, le16_to_cpu(len)); ++ key_v2->key_param_set.key_params.aes.key, len); + + return 0; + } +-- +2.25.1 + diff --git a/queue-5.4/net-dsa-mv88e6xxx-mv88e6097-does-not-support-jumbo-c.patch b/queue-5.4/net-dsa-mv88e6xxx-mv88e6097-does-not-support-jumbo-c.patch new file mode 100644 index 00000000000..0ea0c75a428 --- /dev/null +++ b/queue-5.4/net-dsa-mv88e6xxx-mv88e6097-does-not-support-jumbo-c.patch @@ -0,0 +1,38 @@ +From d38b47188366b71f16a36a5435dbe940fecf7c35 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 24 Jul 2020 11:21:20 +1200 +Subject: net: dsa: mv88e6xxx: MV88E6097 does not support jumbo configuration + +From: Chris Packham + +[ Upstream commit 0f3c66a3c7b4e8b9f654b3c998e9674376a51b0f ] + +The MV88E6097 chip does not support configuring jumbo frames. Prior to +commit 5f4366660d65 only the 6352, 6351, 6165 and 6320 chips configured +jumbo mode. The refactor accidentally added the function for the 6097. +Remove the erroneous function pointer assignment. + +Fixes: 5f4366660d65 ("net: dsa: mv88e6xxx: Refactor setting of jumbo frames") +Signed-off-by: Chris Packham +Reviewed-by: Andrew Lunn +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/dsa/mv88e6xxx/chip.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c +index 6787d560e9e3d..92e4d140df6fa 100644 +--- a/drivers/net/dsa/mv88e6xxx/chip.c ++++ b/drivers/net/dsa/mv88e6xxx/chip.c +@@ -3063,7 +3063,6 @@ static const struct mv88e6xxx_ops mv88e6097_ops = { + .port_set_frame_mode = mv88e6351_port_set_frame_mode, + .port_set_egress_floods = mv88e6352_port_set_egress_floods, + .port_set_ether_type = mv88e6351_port_set_ether_type, +- .port_set_jumbo_size = mv88e6165_port_set_jumbo_size, + .port_egress_rate_limiting = mv88e6095_port_egress_rate_limiting, + .port_pause_limit = mv88e6097_port_pause_limit, + .port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit, +-- +2.25.1 + diff --git a/queue-5.4/net-dsa-rtl8366-fix-vlan-semantics.patch b/queue-5.4/net-dsa-rtl8366-fix-vlan-semantics.patch new file mode 100644 index 00000000000..6b8748373d8 --- /dev/null +++ b/queue-5.4/net-dsa-rtl8366-fix-vlan-semantics.patch @@ -0,0 +1,91 @@ +From 48a7be7427c740c4836b668206a1c5e802687961 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 27 Jul 2020 01:34:39 +0200 +Subject: net: dsa: rtl8366: Fix VLAN semantics + +From: Linus Walleij + +[ Upstream commit 15ab7906cc9290afb006df1bb1074907fbcc7061 ] + +The RTL8366 would not handle adding new members (ports) to +a VLAN: the code assumed that ->port_vlan_add() was only +called once for a single port. When intializing the +switch with .configure_vlan_while_not_filtering set to +true, the function is called numerous times for adding +all ports to VLAN1, which was something the code could +not handle. + +Alter rtl8366_set_vlan() to just |= new members and +untagged flags to 4k and MC VLAN table entries alike. +This makes it possible to just add new ports to a +VLAN. + +Put in some helpful debug code that can be used to find +any further bugs here. + +Cc: DENG Qingfang +Cc: Mauri Sandberg +Reviewed-by: Florian Fainelli +Fixes: d8652956cf37 ("net: dsa: realtek-smi: Add Realtek SMI driver") +Signed-off-by: Linus Walleij +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/dsa/rtl8366.c | 21 +++++++++++++++++---- + 1 file changed, 17 insertions(+), 4 deletions(-) + +diff --git a/drivers/net/dsa/rtl8366.c b/drivers/net/dsa/rtl8366.c +index ac88caca5ad4d..a75dcd6698b8a 100644 +--- a/drivers/net/dsa/rtl8366.c ++++ b/drivers/net/dsa/rtl8366.c +@@ -43,18 +43,26 @@ int rtl8366_set_vlan(struct realtek_smi *smi, int vid, u32 member, + int ret; + int i; + ++ dev_dbg(smi->dev, ++ "setting VLAN%d 4k members: 0x%02x, untagged: 0x%02x\n", ++ vid, member, untag); ++ + /* Update the 4K table */ + ret = smi->ops->get_vlan_4k(smi, vid, &vlan4k); + if (ret) + return ret; + +- vlan4k.member = member; +- vlan4k.untag = untag; ++ vlan4k.member |= member; ++ vlan4k.untag |= untag; + vlan4k.fid = fid; + ret = smi->ops->set_vlan_4k(smi, &vlan4k); + if (ret) + return ret; + ++ dev_dbg(smi->dev, ++ "resulting VLAN%d 4k members: 0x%02x, untagged: 0x%02x\n", ++ vid, vlan4k.member, vlan4k.untag); ++ + /* Try to find an existing MC entry for this VID */ + for (i = 0; i < smi->num_vlan_mc; i++) { + struct rtl8366_vlan_mc vlanmc; +@@ -65,11 +73,16 @@ int rtl8366_set_vlan(struct realtek_smi *smi, int vid, u32 member, + + if (vid == vlanmc.vid) { + /* update the MC entry */ +- vlanmc.member = member; +- vlanmc.untag = untag; ++ vlanmc.member |= member; ++ vlanmc.untag |= untag; + vlanmc.fid = fid; + + ret = smi->ops->set_vlan_mc(smi, i, &vlanmc); ++ ++ dev_dbg(smi->dev, ++ "resulting VLAN%d MC members: 0x%02x, untagged: 0x%02x\n", ++ vid, vlanmc.member, vlanmc.untag); ++ + break; + } + } +-- +2.25.1 + diff --git a/queue-5.4/net-dsa-rtl8366-fix-vlan-set-up.patch b/queue-5.4/net-dsa-rtl8366-fix-vlan-set-up.patch new file mode 100644 index 00000000000..556941b196c --- /dev/null +++ b/queue-5.4/net-dsa-rtl8366-fix-vlan-set-up.patch @@ -0,0 +1,67 @@ +From f4c779a6ad27ce8d43a6bb40fd2b1792b742cf61 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 27 Jul 2020 01:34:40 +0200 +Subject: net: dsa: rtl8366: Fix VLAN set-up + +From: Linus Walleij + +[ Upstream commit 788abc6d9d278ed6fa1fa94db2098481a04152b7 ] + +Alter the rtl8366_vlan_add() to call rtl8366_set_vlan() +inside the loop that goes over all VIDs since we now +properly support calling that function more than once. +Augment the loop to postincrement as this is more +intuitive. + +The loop moved past the last VID but called +rtl8366_set_vlan() with the port number instead of +the VID, assuming a 1-to-1 correspondence between +ports and VIDs. This was also a bug. + +Cc: DENG Qingfang +Cc: Mauri Sandberg +Reviewed-by: Florian Fainelli +Fixes: d8652956cf37 ("net: dsa: realtek-smi: Add Realtek SMI driver") +Signed-off-by: Linus Walleij +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/dsa/rtl8366.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/drivers/net/dsa/rtl8366.c b/drivers/net/dsa/rtl8366.c +index a75dcd6698b8a..1368816abaed1 100644 +--- a/drivers/net/dsa/rtl8366.c ++++ b/drivers/net/dsa/rtl8366.c +@@ -397,7 +397,7 @@ void rtl8366_vlan_add(struct dsa_switch *ds, int port, + if (dsa_is_dsa_port(ds, port) || dsa_is_cpu_port(ds, port)) + dev_err(smi->dev, "port is DSA or CPU port\n"); + +- for (vid = vlan->vid_begin; vid <= vlan->vid_end; ++vid) { ++ for (vid = vlan->vid_begin; vid <= vlan->vid_end; vid++) { + int pvid_val = 0; + + dev_info(smi->dev, "add VLAN %04x\n", vid); +@@ -420,13 +420,13 @@ void rtl8366_vlan_add(struct dsa_switch *ds, int port, + if (ret < 0) + return; + } +- } + +- ret = rtl8366_set_vlan(smi, port, member, untag, 0); +- if (ret) +- dev_err(smi->dev, +- "failed to set up VLAN %04x", +- vid); ++ ret = rtl8366_set_vlan(smi, vid, member, untag, 0); ++ if (ret) ++ dev_err(smi->dev, ++ "failed to set up VLAN %04x", ++ vid); ++ } + } + EXPORT_SYMBOL_GPL(rtl8366_vlan_add); + +-- +2.25.1 + diff --git a/queue-5.4/net-ethernet-aquantia-fix-wrong-return-value.patch b/queue-5.4/net-ethernet-aquantia-fix-wrong-return-value.patch new file mode 100644 index 00000000000..cdf1f49c927 --- /dev/null +++ b/queue-5.4/net-ethernet-aquantia-fix-wrong-return-value.patch @@ -0,0 +1,37 @@ +From 27f4d63028900d7235b9fc8ea23fb2df0eb15083 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 2 Aug 2020 19:15:37 +0800 +Subject: net: ethernet: aquantia: Fix wrong return value + +From: Tianjia Zhang + +[ Upstream commit 0470a48880f8bc42ce26962b79c7b802c5a695ec ] + +In function hw_atl_a0_hw_multicast_list_set(), when an invalid +request is encountered, a negative error code should be returned. + +Fixes: bab6de8fd180b ("net: ethernet: aquantia: Atlantic A0 and B0 specific functions") +Cc: David VomLehn +Signed-off-by: Tianjia Zhang +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c +index 359a4d3871851..9a0db70c11438 100644 +--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c ++++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c +@@ -776,7 +776,7 @@ static int hw_atl_a0_hw_multicast_list_set(struct aq_hw_s *self, + int err = 0; + + if (count > (HW_ATL_A0_MAC_MAX - HW_ATL_A0_MAC_MIN)) { +- err = EBADRQC; ++ err = -EBADRQC; + goto err_exit; + } + for (self->aq_nic_cfg->mc_list_count = 0U; +-- +2.25.1 + diff --git a/queue-5.4/net-mlx5-delete-extra-dump-stack-that-gives-nothing.patch b/queue-5.4/net-mlx5-delete-extra-dump-stack-that-gives-nothing.patch new file mode 100644 index 00000000000..c9f56b55851 --- /dev/null +++ b/queue-5.4/net-mlx5-delete-extra-dump-stack-that-gives-nothing.patch @@ -0,0 +1,117 @@ +From ba4175d4b7663f4d43836d492710f3b0b3462807 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 19 Jul 2020 11:04:30 +0300 +Subject: net/mlx5: Delete extra dump stack that gives nothing + +From: Leon Romanovsky + +[ Upstream commit 6c4e9bcfb48933d533ff975e152757991556294a ] + +The WARN_*() macros are intended to catch impossible situations +from the SW point of view. They gave a little in case HW<->SW interface +is out-of-sync. + +Such out-of-sync scenario can be due to SW errors that are not part +of this flow or because some HW errors, where dump stack won't help +either. + +This specific WARN_ON() is useless because mlx5_core code is prepared +to handle such situations and will unfold everything correctly while +providing enough information to the users to understand why FS is not +working. + +WARNING: CPU: 0 PID: 3222 at drivers/net/ethernet/mellanox/mlx5/core/fs_core.c:825 connect_fts_in_prio.isra.20+0x1dd/0x260 linux/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c:825 +Kernel panic - not syncing: panic_on_warn set ... +CPU: 0 PID: 3222 Comm: syz-executor861 Not tainted 5.5.0-rc6+ #2 +Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS +rel-1.12.1-0-ga5cab58e9a3f-prebuilt.qemu.org 04/01/2014 +Call Trace: + __dump_stack linux/lib/dump_stack.c:77 [inline] + dump_stack+0x94/0xce linux/lib/dump_stack.c:118 + panic+0x234/0x56f linux/kernel/panic.c:221 + __warn+0x1cc/0x1e1 linux/kernel/panic.c:582 + report_bug+0x200/0x310 linux/lib/bug.c:195 + fixup_bug.part.11+0x32/0x80 linux/arch/x86/kernel/traps.c:174 + fixup_bug linux/arch/x86/kernel/traps.c:273 [inline] + do_error_trap+0xd3/0x100 linux/arch/x86/kernel/traps.c:267 + do_invalid_op+0x31/0x40 linux/arch/x86/kernel/traps.c:286 + invalid_op+0x1e/0x30 linux/arch/x86/entry/entry_64.S:1027 +RIP: 0010:connect_fts_in_prio.isra.20+0x1dd/0x260 +linux/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c:825 +Code: 00 00 48 c7 c2 60 8c 31 84 48 c7 c6 00 81 31 84 48 8b 38 e8 3c a8 +cb ff 41 83 fd 01 8b 04 24 0f 8e 29 ff ff ff e8 83 7b bc fe <0f> 0b 8b +04 24 e9 1a ff ff ff 89 04 24 e8 c1 20 e0 fe 8b 04 24 eb +RSP: 0018:ffffc90004bb7858 EFLAGS: 00010293 +RAX: ffff88805de98e80 RBX: 0000000000000c96 RCX: ffffffff827a853d +RDX: 0000000000000000 RSI: 0000000000000000 RDI: fffff52000976efa +RBP: 0000000000000007 R08: ffffed100da060e3 R09: ffffed100da060e3 +R10: 0000000000000001 R11: ffffed100da060e2 R12: dffffc0000000000 +R13: 0000000000000002 R14: ffff8880683a1a10 R15: ffffed100d07bc1c + connect_prev_fts linux/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c:844 [inline] + connect_flow_table linux/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c:975 [inline] + __mlx5_create_flow_table+0x8f8/0x1710 linux/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c:1064 + mlx5_create_flow_table linux/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c:1094 [inline] + mlx5_create_auto_grouped_flow_table+0xe1/0x210 linux/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c:1136 + _get_prio linux/drivers/infiniband/hw/mlx5/main.c:3286 [inline] + get_flow_table+0x2ea/0x760 linux/drivers/infiniband/hw/mlx5/main.c:3376 + mlx5_ib_create_flow+0x331/0x11c0 linux/drivers/infiniband/hw/mlx5/main.c:3896 + ib_uverbs_ex_create_flow+0x13e8/0x1b40 linux/drivers/infiniband/core/uverbs_cmd.c:3311 + ib_uverbs_write+0xaa5/0xdf0 linux/drivers/infiniband/core/uverbs_main.c:769 + __vfs_write+0x7c/0x100 linux/fs/read_write.c:494 + vfs_write+0x168/0x4a0 linux/fs/read_write.c:558 + ksys_write+0xc8/0x200 linux/fs/read_write.c:611 + do_syscall_64+0x9c/0x390 linux/arch/x86/entry/common.c:294 + entry_SYSCALL_64_after_hwframe+0x44/0xa9 +RIP: 0033:0x45a059 +Code: 00 00 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 48 89 f8 48 89 +f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 +f0 ff ff 73 01 c3 48 c7 c1 bc ff ff ff f7 d8 64 89 01 48 +RSP: 002b:00007fcc17564c98 EFLAGS: 00000246 ORIG_RAX: 0000000000000001 +RAX: ffffffffffffffda RBX: 00007fcc17564ca0 RCX: 000000000045a059 +RDX: 0000000000000030 RSI: 00000000200003c0 RDI: 0000000000000005 +RBP: 0000000000000007 R08: 0000000000000002 R09: 0000000000003131 +R10: 0000000000000000 R11: 0000000000000246 R12: 00000000006e636c +R13: 0000000000000000 R14: 00000000006e6360 R15: 00007ffdcbdaf6a0 +Dumping ftrace buffer: + (ftrace buffer empty) +Kernel Offset: disabled +Rebooting in 1 seconds.. + +Fixes: f90edfd279f3 ("net/mlx5_core: Connect flow tables") +Reviewed-by: Maor Gottlieb +Reviewed-by: Mark Bloch +Signed-off-by: Leon Romanovsky +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +index 86e6bbb574829..b66e5b6eecd99 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +@@ -809,18 +809,15 @@ static int connect_fts_in_prio(struct mlx5_core_dev *dev, + { + struct mlx5_flow_root_namespace *root = find_root(&prio->node); + struct mlx5_flow_table *iter; +- int i = 0; + int err; + + fs_for_each_ft(iter, prio) { +- i++; + err = root->cmds->modify_flow_table(root, iter, ft); + if (err) { +- mlx5_core_warn(dev, "Failed to modify flow table %d\n", +- iter->id); ++ mlx5_core_err(dev, ++ "Failed to modify flow table id %d, type %d, err %d\n", ++ iter->id, iter->type, err); + /* The driver is out of sync with the FW */ +- if (i > 1) +- WARN_ON(true); + return err; + } + } +-- +2.25.1 + diff --git a/queue-5.4/net-mlx5-dr-change-push-vlan-action-sequence.patch b/queue-5.4/net-mlx5-dr-change-push-vlan-action-sequence.patch new file mode 100644 index 00000000000..465f643b8fd --- /dev/null +++ b/queue-5.4/net-mlx5-dr-change-push-vlan-action-sequence.patch @@ -0,0 +1,91 @@ +From da80ada7bf4698c175e51202e1e76644788a3d15 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 13 Jul 2020 14:09:04 +0300 +Subject: net/mlx5: DR, Change push vlan action sequence + +From: Alex Vesker + +[ Upstream commit b206490940216542c68563699b279eed3c55107c ] + +The DR TX state machine supports the following order: +modify header, push vlan and encapsulation. +Instead fs_dr would pass: +push vlan, modify header and encapsulation. + +The above caused the rule creation to fail on invalid action +sequence provided error. + +Fixes: 6a48faeeca10 ("net/mlx5: Add direct rule fs_cmd implementation") +Signed-off-by: Alex Vesker +Reviewed-by: Maor Gottlieb +Signed-off-by: Saeed Mahameed +Signed-off-by: Sasha Levin +--- + .../mellanox/mlx5/core/steering/fs_dr.c | 42 +++++++++---------- + 1 file changed, 21 insertions(+), 21 deletions(-) + +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/fs_dr.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/fs_dr.c +index 1e32e2443f737..348f02e336f68 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/fs_dr.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/fs_dr.c +@@ -247,29 +247,9 @@ static int mlx5_cmd_dr_create_fte(struct mlx5_flow_root_namespace *ns, + + /* The order of the actions are must to be keep, only the following + * order is supported by SW steering: +- * TX: push vlan -> modify header -> encap ++ * TX: modify header -> push vlan -> encap + * RX: decap -> pop vlan -> modify header + */ +- if (fte->action.action & MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH) { +- tmp_action = create_action_push_vlan(domain, &fte->action.vlan[0]); +- if (!tmp_action) { +- err = -ENOMEM; +- goto free_actions; +- } +- fs_dr_actions[fs_dr_num_actions++] = tmp_action; +- actions[num_actions++] = tmp_action; +- } +- +- if (fte->action.action & MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH_2) { +- tmp_action = create_action_push_vlan(domain, &fte->action.vlan[1]); +- if (!tmp_action) { +- err = -ENOMEM; +- goto free_actions; +- } +- fs_dr_actions[fs_dr_num_actions++] = tmp_action; +- actions[num_actions++] = tmp_action; +- } +- + if (fte->action.action & MLX5_FLOW_CONTEXT_ACTION_DECAP) { + enum mlx5dr_action_reformat_type decap_type = + DR_ACTION_REFORMAT_TYP_TNL_L2_TO_L2; +@@ -322,6 +302,26 @@ static int mlx5_cmd_dr_create_fte(struct mlx5_flow_root_namespace *ns, + actions[num_actions++] = + fte->action.modify_hdr->action.dr_action; + ++ if (fte->action.action & MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH) { ++ tmp_action = create_action_push_vlan(domain, &fte->action.vlan[0]); ++ if (!tmp_action) { ++ err = -ENOMEM; ++ goto free_actions; ++ } ++ fs_dr_actions[fs_dr_num_actions++] = tmp_action; ++ actions[num_actions++] = tmp_action; ++ } ++ ++ if (fte->action.action & MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH_2) { ++ tmp_action = create_action_push_vlan(domain, &fte->action.vlan[1]); ++ if (!tmp_action) { ++ err = -ENOMEM; ++ goto free_actions; ++ } ++ fs_dr_actions[fs_dr_num_actions++] = tmp_action; ++ actions[num_actions++] = tmp_action; ++ } ++ + if (delay_encap_set) + actions[num_actions++] = + fte->action.pkt_reformat->action.dr_action; +-- +2.25.1 + diff --git a/queue-5.4/net-spider_net-fix-the-size-used-in-a-dma_free_coher.patch b/queue-5.4/net-spider_net-fix-the-size-used-in-a-dma_free_coher.patch new file mode 100644 index 00000000000..c7424503779 --- /dev/null +++ b/queue-5.4/net-spider_net-fix-the-size-used-in-a-dma_free_coher.patch @@ -0,0 +1,39 @@ +From 889b341263de8af37e218ee816a093917bedbf29 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 2 Aug 2020 15:53:33 +0200 +Subject: net: spider_net: Fix the size used in a 'dma_free_coherent()' call + +From: Christophe JAILLET + +[ Upstream commit 36f28f7687a9ce665479cce5d64ce7afaa9e77ae ] + +Update the size used in 'dma_free_coherent()' in order to match the one +used in the corresponding 'dma_alloc_coherent()', in +'spider_net_init_chain()'. + +Fixes: d4ed8f8d1fb7 ("Spidernet DMA coalescing") +Signed-off-by: Christophe JAILLET +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/toshiba/spider_net.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/ethernet/toshiba/spider_net.c b/drivers/net/ethernet/toshiba/spider_net.c +index 538e70810d3de..a99c7c95de5cc 100644 +--- a/drivers/net/ethernet/toshiba/spider_net.c ++++ b/drivers/net/ethernet/toshiba/spider_net.c +@@ -283,8 +283,8 @@ spider_net_free_chain(struct spider_net_card *card, + descr = descr->next; + } while (descr != chain->ring); + +- dma_free_coherent(&card->pdev->dev, chain->num_desc, +- chain->hwring, chain->dma_addr); ++ dma_free_coherent(&card->pdev->dev, chain->num_desc * sizeof(struct spider_net_hw_descr), ++ chain->hwring, chain->dma_addr); + } + + /** +-- +2.25.1 + diff --git a/queue-5.4/net-thunderx-initialize-vf-s-mailbox-mutex-before-fi.patch b/queue-5.4/net-thunderx-initialize-vf-s-mailbox-mutex-before-fi.patch new file mode 100644 index 00000000000..3adcc488c8b --- /dev/null +++ b/queue-5.4/net-thunderx-initialize-vf-s-mailbox-mutex-before-fi.patch @@ -0,0 +1,104 @@ +From d5fa1421660ef403e187580ab37be53b27d20cda Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 5 Aug 2020 13:18:48 -0500 +Subject: net: thunderx: initialize VF's mailbox mutex before first usage + +From: Dean Nelson + +[ Upstream commit c1055b76ad00aed0e8b79417080f212d736246b6 ] + +A VF's mailbox mutex is not getting initialized by nicvf_probe() until after +it is first used. And such usage is resulting in... + +[ 28.270927] ------------[ cut here ]------------ +[ 28.270934] DEBUG_LOCKS_WARN_ON(lock->magic != lock) +[ 28.270980] WARNING: CPU: 9 PID: 675 at kernel/locking/mutex.c:938 __mutex_lock+0xdac/0x12f0 +[ 28.270985] Modules linked in: ast(+) nicvf(+) i2c_algo_bit drm_vram_helper drm_ttm_helper ttm nicpf(+) drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops drm ixgbe(+) sg thunder_bgx mdio i2c_thunderx mdio_thunder thunder_xcv mdio_cavium dm_mirror dm_region_hash dm_log dm_mod +[ 28.271064] CPU: 9 PID: 675 Comm: systemd-udevd Not tainted 4.18.0+ #1 +[ 28.271070] Hardware name: GIGABYTE R120-T34-00/MT30-GS2-00, BIOS F02 08/06/2019 +[ 28.271078] pstate: 60000005 (nZCv daif -PAN -UAO) +[ 28.271086] pc : __mutex_lock+0xdac/0x12f0 +[ 28.271092] lr : __mutex_lock+0xdac/0x12f0 +[ 28.271097] sp : ffff800d42146fb0 +[ 28.271103] x29: ffff800d42146fb0 x28: 0000000000000000 +[ 28.271113] x27: ffff800d24361180 x26: dfff200000000000 +[ 28.271122] x25: 0000000000000000 x24: 0000000000000002 +[ 28.271132] x23: ffff20001597cc80 x22: ffff2000139e9848 +[ 28.271141] x21: 0000000000000000 x20: 1ffff001a8428e0c +[ 28.271151] x19: ffff200015d5d000 x18: 1ffff001ae0f2184 +[ 28.271160] x17: 0000000000000000 x16: 0000000000000000 +[ 28.271170] x15: ffff800d70790c38 x14: ffff20001597c000 +[ 28.271179] x13: ffff20001597cc80 x12: ffff040002b2f779 +[ 28.271189] x11: 1fffe40002b2f778 x10: ffff040002b2f778 +[ 28.271199] x9 : 0000000000000000 x8 : 00000000f1f1f1f1 +[ 28.271208] x7 : 00000000f2f2f2f2 x6 : 0000000000000000 +[ 28.271217] x5 : 1ffff001ae0f2186 x4 : 1fffe400027eb03c +[ 28.271227] x3 : dfff200000000000 x2 : ffff1001a8428dbe +[ 28.271237] x1 : c87fdfac7ea11d00 x0 : 0000000000000000 +[ 28.271246] Call trace: +[ 28.271254] __mutex_lock+0xdac/0x12f0 +[ 28.271261] mutex_lock_nested+0x3c/0x50 +[ 28.271297] nicvf_send_msg_to_pf+0x40/0x3a0 [nicvf] +[ 28.271316] nicvf_register_misc_interrupt+0x20c/0x328 [nicvf] +[ 28.271334] nicvf_probe+0x508/0xda0 [nicvf] +[ 28.271344] local_pci_probe+0xc4/0x180 +[ 28.271352] pci_device_probe+0x3ec/0x528 +[ 28.271363] driver_probe_device+0x21c/0xb98 +[ 28.271371] device_driver_attach+0xe8/0x120 +[ 28.271379] __driver_attach+0xe0/0x2a0 +[ 28.271386] bus_for_each_dev+0x118/0x190 +[ 28.271394] driver_attach+0x48/0x60 +[ 28.271401] bus_add_driver+0x328/0x558 +[ 28.271409] driver_register+0x148/0x398 +[ 28.271416] __pci_register_driver+0x14c/0x1b0 +[ 28.271437] nicvf_init_module+0x54/0x10000 [nicvf] +[ 28.271447] do_one_initcall+0x18c/0xc18 +[ 28.271457] do_init_module+0x18c/0x618 +[ 28.271464] load_module+0x2bc0/0x4088 +[ 28.271472] __se_sys_finit_module+0x110/0x188 +[ 28.271479] __arm64_sys_finit_module+0x70/0xa0 +[ 28.271490] el0_svc_handler+0x15c/0x380 +[ 28.271496] el0_svc+0x8/0xc +[ 28.271502] irq event stamp: 52649 +[ 28.271513] hardirqs last enabled at (52649): [] _raw_spin_unlock_irqrestore+0xc0/0xd8 +[ 28.271522] hardirqs last disabled at (52648): [] _raw_spin_lock_irqsave+0x3c/0xf0 +[ 28.271530] softirqs last enabled at (52330): [] __do_softirq+0xacc/0x117c +[ 28.271540] softirqs last disabled at (52313): [] irq_exit+0x3cc/0x500 +[ 28.271545] ---[ end trace a9b90324c8a0d4ee ]--- + +This problem is resolved by moving the call to mutex_init() up earlier +in nicvf_probe(). + +Fixes: 609ea65c65a0 ("net: thunderx: add mutex to protect mailbox from concurrent calls for same VF") +Signed-off-by: Dean Nelson +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c +index f414f5651dbd8..5c45c0c6dd234 100644 +--- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c ++++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c +@@ -2185,6 +2185,9 @@ static int nicvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) + nic->max_queues *= 2; + nic->ptp_clock = ptp_clock; + ++ /* Initialize mutex that serializes usage of VF's mailbox */ ++ mutex_init(&nic->rx_mode_mtx); ++ + /* MAP VF's configuration registers */ + nic->reg_base = pcim_iomap(pdev, PCI_CFG_REG_BAR_NUM, 0); + if (!nic->reg_base) { +@@ -2261,7 +2264,6 @@ static int nicvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) + + INIT_WORK(&nic->rx_mode_work.work, nicvf_set_rx_mode_task); + spin_lock_init(&nic->rx_mode_wq_lock); +- mutex_init(&nic->rx_mode_mtx); + + err = register_netdev(netdev); + if (err) { +-- +2.25.1 + diff --git a/queue-5.4/nvme-multipath-do-not-fall-back-to-__nvme_find_path-.patch b/queue-5.4/nvme-multipath-do-not-fall-back-to-__nvme_find_path-.patch new file mode 100644 index 00000000000..3312d6398da --- /dev/null +++ b/queue-5.4/nvme-multipath-do-not-fall-back-to-__nvme_find_path-.patch @@ -0,0 +1,49 @@ +From 05146416eff8cb46d1147a5e7c7564443a77d6e0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 27 Jul 2020 18:08:03 +0200 +Subject: nvme-multipath: do not fall back to __nvme_find_path() for + non-optimized paths + +From: Hannes Reinecke + +[ Upstream commit fbd6a42d8932e172921c7de10468a2e12c34846b ] + +When nvme_round_robin_path() finds a valid namespace we should be using it; +falling back to __nvme_find_path() for non-optimized paths will cause the +result from nvme_round_robin_path() to be ignored for non-optimized paths. + +Fixes: 75c10e732724 ("nvme-multipath: round-robin I/O policy") +Signed-off-by: Martin Wilck +Signed-off-by: Hannes Reinecke +Reviewed-by: Sagi Grimberg +Signed-off-by: Christoph Hellwig +Signed-off-by: Sasha Levin +--- + drivers/nvme/host/multipath.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c +index 38d25d7c6bca3..484aad0d0c9c6 100644 +--- a/drivers/nvme/host/multipath.c ++++ b/drivers/nvme/host/multipath.c +@@ -275,10 +275,13 @@ inline struct nvme_ns *nvme_find_path(struct nvme_ns_head *head) + struct nvme_ns *ns; + + ns = srcu_dereference(head->current_path[node], &head->srcu); +- if (READ_ONCE(head->subsys->iopolicy) == NVME_IOPOLICY_RR && ns) +- ns = nvme_round_robin_path(head, node, ns); +- if (unlikely(!ns || !nvme_path_is_optimized(ns))) +- ns = __nvme_find_path(head, node); ++ if (unlikely(!ns)) ++ return __nvme_find_path(head, node); ++ ++ if (READ_ONCE(head->subsys->iopolicy) == NVME_IOPOLICY_RR) ++ return nvme_round_robin_path(head, node, ns); ++ if (unlikely(!nvme_path_is_optimized(ns))) ++ return __nvme_find_path(head, node); + return ns; + } + +-- +2.25.1 + diff --git a/queue-5.4/nvme-multipath-fix-logic-for-non-optimized-paths.patch b/queue-5.4/nvme-multipath-fix-logic-for-non-optimized-paths.patch new file mode 100644 index 00000000000..8a01e466a39 --- /dev/null +++ b/queue-5.4/nvme-multipath-fix-logic-for-non-optimized-paths.patch @@ -0,0 +1,42 @@ +From fb95ec54fd3b16497cecbc12e0e5b0c740367162 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 27 Jul 2020 18:08:02 +0200 +Subject: nvme-multipath: fix logic for non-optimized paths + +From: Martin Wilck + +[ Upstream commit 3f6e3246db0e6f92e784965d9d0edb8abe6c6b74 ] + +Handle the special case where we have exactly one optimized path, +which we should keep using in this case. + +Fixes: 75c10e732724 ("nvme-multipath: round-robin I/O policy") +Signed off-by: Martin Wilck +Signed-off-by: Hannes Reinecke +Reviewed-by: Sagi Grimberg +Signed-off-by: Christoph Hellwig +Signed-off-by: Sasha Levin +--- + drivers/nvme/host/multipath.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c +index 5433aa2f76017..38d25d7c6bca3 100644 +--- a/drivers/nvme/host/multipath.c ++++ b/drivers/nvme/host/multipath.c +@@ -249,6 +249,12 @@ static struct nvme_ns *nvme_round_robin_path(struct nvme_ns_head *head, + fallback = ns; + } + ++ /* No optimized path found, re-check the current path */ ++ if (!nvme_path_is_disabled(old) && ++ old->ana_state == NVME_ANA_OPTIMIZED) { ++ found = old; ++ goto out; ++ } + if (!fallback) + return NULL; + found = fallback; +-- +2.25.1 + diff --git a/queue-5.4/nvme-rdma-fix-controller-reset-hang-during-traffic.patch b/queue-5.4/nvme-rdma-fix-controller-reset-hang-during-traffic.patch new file mode 100644 index 00000000000..b0b88db6399 --- /dev/null +++ b/queue-5.4/nvme-rdma-fix-controller-reset-hang-during-traffic.patch @@ -0,0 +1,71 @@ +From 915fc0865a615dd6b3138a75f013d1c24098fb96 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 27 Jul 2020 17:32:09 -0700 +Subject: nvme-rdma: fix controller reset hang during traffic + +From: Sagi Grimberg + +[ Upstream commit 9f98772ba307dd89a3d17dc2589f213d3972fc64 ] + +commit fe35ec58f0d3 ("block: update hctx map when use multiple maps") +exposed an issue where we may hang trying to wait for queue freeze +during I/O. We call blk_mq_update_nr_hw_queues which in case of multiple +queue maps (which we have now for default/read/poll) is attempting to +freeze the queue. However we never started queue freeze when starting the +reset, which means that we have inflight pending requests that entered the +queue that we will not complete once the queue is quiesced. + +So start a freeze before we quiesce the queue, and unfreeze the queue +after we successfully connected the I/O queues (and make sure to call +blk_mq_update_nr_hw_queues only after we are sure that the queue was +already frozen). + +This follows to how the pci driver handles resets. + +Fixes: fe35ec58f0d3 ("block: update hctx map when use multiple maps") +Signed-off-by: Sagi Grimberg +Signed-off-by: Christoph Hellwig +Signed-off-by: Sasha Levin +--- + drivers/nvme/host/rdma.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c +index cd0d499781908..d0336545e1fe0 100644 +--- a/drivers/nvme/host/rdma.c ++++ b/drivers/nvme/host/rdma.c +@@ -890,15 +890,20 @@ static int nvme_rdma_configure_io_queues(struct nvme_rdma_ctrl *ctrl, bool new) + ret = PTR_ERR(ctrl->ctrl.connect_q); + goto out_free_tag_set; + } +- } else { +- blk_mq_update_nr_hw_queues(&ctrl->tag_set, +- ctrl->ctrl.queue_count - 1); + } + + ret = nvme_rdma_start_io_queues(ctrl); + if (ret) + goto out_cleanup_connect_q; + ++ if (!new) { ++ nvme_start_queues(&ctrl->ctrl); ++ nvme_wait_freeze(&ctrl->ctrl); ++ blk_mq_update_nr_hw_queues(ctrl->ctrl.tagset, ++ ctrl->ctrl.queue_count - 1); ++ nvme_unfreeze(&ctrl->ctrl); ++ } ++ + return 0; + + out_cleanup_connect_q: +@@ -931,6 +936,7 @@ static void nvme_rdma_teardown_io_queues(struct nvme_rdma_ctrl *ctrl, + bool remove) + { + if (ctrl->ctrl.queue_count > 1) { ++ nvme_start_freeze(&ctrl->ctrl); + nvme_stop_queues(&ctrl->ctrl); + nvme_rdma_stop_io_queues(ctrl); + if (ctrl->ctrl.tagset) { +-- +2.25.1 + diff --git a/queue-5.4/nvme-tcp-fix-controller-reset-hang-during-traffic.patch b/queue-5.4/nvme-tcp-fix-controller-reset-hang-during-traffic.patch new file mode 100644 index 00000000000..0f5893897dc --- /dev/null +++ b/queue-5.4/nvme-tcp-fix-controller-reset-hang-during-traffic.patch @@ -0,0 +1,71 @@ +From 9fa0672462e3e429183125ec06ba78b54a101c46 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 24 Jul 2020 15:10:12 -0700 +Subject: nvme-tcp: fix controller reset hang during traffic + +From: Sagi Grimberg + +[ Upstream commit 2875b0aecabe2f081a8432e2bc85b85df0529490 ] + +commit fe35ec58f0d3 ("block: update hctx map when use multiple maps") +exposed an issue where we may hang trying to wait for queue freeze +during I/O. We call blk_mq_update_nr_hw_queues which in case of multiple +queue maps (which we have now for default/read/poll) is attempting to +freeze the queue. However we never started queue freeze when starting the +reset, which means that we have inflight pending requests that entered the +queue that we will not complete once the queue is quiesced. + +So start a freeze before we quiesce the queue, and unfreeze the queue +after we successfully connected the I/O queues (and make sure to call +blk_mq_update_nr_hw_queues only after we are sure that the queue was +already frozen). + +This follows to how the pci driver handles resets. + +Fixes: fe35ec58f0d3 ("block: update hctx map when use multiple maps") +Signed-off-by: Sagi Grimberg +Signed-off-by: Christoph Hellwig +Signed-off-by: Sasha Levin +--- + drivers/nvme/host/tcp.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c +index 53e113a18a549..0166ff0e4738e 100644 +--- a/drivers/nvme/host/tcp.c ++++ b/drivers/nvme/host/tcp.c +@@ -1684,15 +1684,20 @@ static int nvme_tcp_configure_io_queues(struct nvme_ctrl *ctrl, bool new) + ret = PTR_ERR(ctrl->connect_q); + goto out_free_tag_set; + } +- } else { +- blk_mq_update_nr_hw_queues(ctrl->tagset, +- ctrl->queue_count - 1); + } + + ret = nvme_tcp_start_io_queues(ctrl); + if (ret) + goto out_cleanup_connect_q; + ++ if (!new) { ++ nvme_start_queues(ctrl); ++ nvme_wait_freeze(ctrl); ++ blk_mq_update_nr_hw_queues(ctrl->tagset, ++ ctrl->queue_count - 1); ++ nvme_unfreeze(ctrl); ++ } ++ + return 0; + + out_cleanup_connect_q: +@@ -1797,6 +1802,7 @@ static void nvme_tcp_teardown_io_queues(struct nvme_ctrl *ctrl, + { + if (ctrl->queue_count <= 1) + return; ++ nvme_start_freeze(ctrl); + nvme_stop_queues(ctrl); + nvme_tcp_stop_io_queues(ctrl); + if (ctrl->tagset) { +-- +2.25.1 + diff --git a/queue-5.4/ocfs2-fix-unbalanced-locking.patch b/queue-5.4/ocfs2-fix-unbalanced-locking.patch new file mode 100644 index 00000000000..1384c32365e --- /dev/null +++ b/queue-5.4/ocfs2-fix-unbalanced-locking.patch @@ -0,0 +1,56 @@ +From 870df799c93f0911b19c8a0c0df77a6ef7511493 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 6 Aug 2020 23:18:09 -0700 +Subject: ocfs2: fix unbalanced locking + +From: Pavel Machek + +[ Upstream commit 57c720d4144a9c2b88105c3e8f7b0e97e4b5cc93 ] + +Based on what fails, function can return with nfs_sync_rwlock either +locked or unlocked. That can not be right. + +Always return with lock unlocked on error. + +Fixes: 4cd9973f9ff6 ("ocfs2: avoid inode removal while nfsd is accessing it") +Signed-off-by: Pavel Machek (CIP) +Signed-off-by: Andrew Morton +Reviewed-by: Joseph Qi +Reviewed-by: Andrew Morton +Cc: Mark Fasheh +Cc: Joel Becker +Cc: Junxiao Bi +Cc: Changwei Ge +Cc: Gang He +Cc: Jun Piao +Link: http://lkml.kernel.org/r/20200724124443.GA28164@duo.ucw.cz +Signed-off-by: Linus Torvalds +Signed-off-by: Sasha Levin +--- + fs/ocfs2/dlmglue.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c +index e2c34c704185d..50a863fc17792 100644 +--- a/fs/ocfs2/dlmglue.c ++++ b/fs/ocfs2/dlmglue.c +@@ -2871,9 +2871,15 @@ int ocfs2_nfs_sync_lock(struct ocfs2_super *osb, int ex) + + status = ocfs2_cluster_lock(osb, lockres, ex ? LKM_EXMODE : LKM_PRMODE, + 0, 0); +- if (status < 0) ++ if (status < 0) { + mlog(ML_ERROR, "lock on nfs sync lock failed %d\n", status); + ++ if (ex) ++ up_write(&osb->nfs_sync_rwlock); ++ else ++ up_read(&osb->nfs_sync_rwlock); ++ } ++ + return status; + } + +-- +2.25.1 + diff --git a/queue-5.4/pci-aspm-add-missing-newline-in-sysfs-policy.patch b/queue-5.4/pci-aspm-add-missing-newline-in-sysfs-policy.patch new file mode 100644 index 00000000000..6b4b822bd5e --- /dev/null +++ b/queue-5.4/pci-aspm-add-missing-newline-in-sysfs-policy.patch @@ -0,0 +1,40 @@ +From 0e547812f68e3b0e8a4f0cd4f3987bf2bfd5757f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 17 Jul 2020 15:59:25 +0800 +Subject: PCI/ASPM: Add missing newline in sysfs 'policy' + +From: Xiongfeng Wang + +[ Upstream commit 3167e3d340c092fd47924bc4d23117a3074ef9a9 ] + +When I cat ASPM parameter 'policy' by sysfs, it displays as follows. Add a +newline for easy reading. Other sysfs attributes already include a +newline. + + [root@localhost ~]# cat /sys/module/pcie_aspm/parameters/policy + [default] performance powersave powersupersave [root@localhost ~]# + +Fixes: 7d715a6c1ae5 ("PCI: add PCI Express ASPM support") +Link: https://lore.kernel.org/r/1594972765-10404-1-git-send-email-wangxiongfeng2@huawei.com +Signed-off-by: Xiongfeng Wang +Signed-off-by: Bjorn Helgaas +Signed-off-by: Sasha Levin +--- + drivers/pci/pcie/aspm.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c +index 4a0ec34062d60..7624c71011c6e 100644 +--- a/drivers/pci/pcie/aspm.c ++++ b/drivers/pci/pcie/aspm.c +@@ -1157,6 +1157,7 @@ static int pcie_aspm_get_policy(char *buffer, const struct kernel_param *kp) + cnt += sprintf(buffer + cnt, "[%s] ", policy_str[i]); + else + cnt += sprintf(buffer + cnt, "%s ", policy_str[i]); ++ cnt += sprintf(buffer + cnt, "\n"); + return cnt; + } + +-- +2.25.1 + diff --git a/queue-5.4/pci-cadence-fix-updating-vendor-id-and-subsystem-ven.patch b/queue-5.4/pci-cadence-fix-updating-vendor-id-and-subsystem-ven.patch new file mode 100644 index 00000000000..6d97250dc57 --- /dev/null +++ b/queue-5.4/pci-cadence-fix-updating-vendor-id-and-subsystem-ven.patch @@ -0,0 +1,56 @@ +From a2cee6b8ceee28cfe85c9012808609c31e4f242b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 22 Jul 2020 16:33:11 +0530 +Subject: PCI: cadence: Fix updating Vendor ID and Subsystem Vendor ID register + +From: Kishon Vijay Abraham I + +[ Upstream commit e3bca37d15dca118f2ef1f0a068bb6e07846ea20 ] + +Commit 1b79c5284439 ("PCI: cadence: Add host driver for Cadence PCIe +controller") in order to update Vendor ID, directly wrote to +PCI_VENDOR_ID register. However PCI_VENDOR_ID in root port configuration +space is read-only register and writing to it will have no effect. +Use local management register to configure Vendor ID and Subsystem Vendor +ID. + +Link: https://lore.kernel.org/r/20200722110317.4744-10-kishon@ti.com +Fixes: 1b79c5284439 ("PCI: cadence: Add host driver for Cadence PCIe controller") +Signed-off-by: Kishon Vijay Abraham I +Signed-off-by: Lorenzo Pieralisi +Reviewed-by: Rob Herring +Signed-off-by: Sasha Levin +--- + drivers/pci/controller/pcie-cadence-host.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/drivers/pci/controller/pcie-cadence-host.c b/drivers/pci/controller/pcie-cadence-host.c +index 97e251090b4f9..0dfc778f40a7a 100644 +--- a/drivers/pci/controller/pcie-cadence-host.c ++++ b/drivers/pci/controller/pcie-cadence-host.c +@@ -102,6 +102,7 @@ static int cdns_pcie_host_init_root_port(struct cdns_pcie_rc *rc) + { + struct cdns_pcie *pcie = &rc->pcie; + u32 value, ctrl; ++ u32 id; + + /* + * Set the root complex BAR configuration register: +@@ -121,8 +122,12 @@ static int cdns_pcie_host_init_root_port(struct cdns_pcie_rc *rc) + cdns_pcie_writel(pcie, CDNS_PCIE_LM_RC_BAR_CFG, value); + + /* Set root port configuration space */ +- if (rc->vendor_id != 0xffff) +- cdns_pcie_rp_writew(pcie, PCI_VENDOR_ID, rc->vendor_id); ++ if (rc->vendor_id != 0xffff) { ++ id = CDNS_PCIE_LM_ID_VENDOR(rc->vendor_id) | ++ CDNS_PCIE_LM_ID_SUBSYS(rc->vendor_id); ++ cdns_pcie_writel(pcie, CDNS_PCIE_LM_ID, id); ++ } ++ + if (rc->device_id != 0xffff) + cdns_pcie_rp_writew(pcie, PCI_DEVICE_ID, rc->device_id); + +-- +2.25.1 + diff --git a/queue-5.4/pci-fix-pci_cfg_wait-queue-locking-problem.patch b/queue-5.4/pci-fix-pci_cfg_wait-queue-locking-problem.patch new file mode 100644 index 00000000000..82cb53cb210 --- /dev/null +++ b/queue-5.4/pci-fix-pci_cfg_wait-queue-locking-problem.patch @@ -0,0 +1,72 @@ +From d51e9f2093c1d9dc97d41c03b09b0e87fb908780 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 25 Jun 2020 18:14:55 -0500 +Subject: PCI: Fix pci_cfg_wait queue locking problem + +From: Bjorn Helgaas + +[ Upstream commit 2a7e32d0547f41c5ce244f84cf5d6ca7fccee7eb ] + +The pci_cfg_wait queue is used to prevent user-space config accesses to +devices while they are recovering from reset. + +Previously we used these operations on pci_cfg_wait: + + __add_wait_queue(&pci_cfg_wait, ...) + __remove_wait_queue(&pci_cfg_wait, ...) + wake_up_all(&pci_cfg_wait) + +The wake_up acquires the wait queue lock, but the add and remove do not. + +Originally these were all protected by the pci_lock, but cdcb33f98244 +("PCI: Avoid possible deadlock on pci_lock and p->pi_lock"), moved +wake_up_all() outside pci_lock, so it could race with add/remove +operations, which caused occasional kernel panics, e.g., during vfio-pci +hotplug/unplug testing: + + Unable to handle kernel read from unreadable memory at virtual address ffff802dac469000 + +Resolve this by using wait_event() instead of __add_wait_queue() and +__remove_wait_queue(). The wait queue lock is held by both wait_event() +and wake_up_all(), so it provides mutual exclusion. + +Fixes: cdcb33f98244 ("PCI: Avoid possible deadlock on pci_lock and p->pi_lock") +Link: https://lore.kernel.org/linux-pci/79827f2f-9b43-4411-1376-b9063b67aee3@huawei.com/T/#u +Based-on: https://lore.kernel.org/linux-pci/20191210031527.40136-1-zhengxiang9@huawei.com/ +Based-on-patch-by: Xiang Zheng +Signed-off-by: Bjorn Helgaas +Tested-by: Xiang Zheng +Cc: Heyi Guo +Cc: Biaoxiang Ye +Signed-off-by: Sasha Levin +--- + drivers/pci/access.c | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/drivers/pci/access.c b/drivers/pci/access.c +index 2fccb5762c762..0914ddeae17f4 100644 +--- a/drivers/pci/access.c ++++ b/drivers/pci/access.c +@@ -204,17 +204,13 @@ EXPORT_SYMBOL(pci_bus_set_ops); + static DECLARE_WAIT_QUEUE_HEAD(pci_cfg_wait); + + static noinline void pci_wait_cfg(struct pci_dev *dev) ++ __must_hold(&pci_lock) + { +- DECLARE_WAITQUEUE(wait, current); +- +- __add_wait_queue(&pci_cfg_wait, &wait); + do { +- set_current_state(TASK_UNINTERRUPTIBLE); + raw_spin_unlock_irq(&pci_lock); +- schedule(); ++ wait_event(pci_cfg_wait, !dev->block_cfg_access); + raw_spin_lock_irq(&pci_lock); + } while (dev->block_cfg_access); +- __remove_wait_queue(&pci_cfg_wait, &wait); + } + + /* Returns 0 on success, negative values indicate error. */ +-- +2.25.1 + diff --git a/queue-5.4/pci-release-ivrs-table-in-amd-acs-quirk.patch b/queue-5.4/pci-release-ivrs-table-in-amd-acs-quirk.patch new file mode 100644 index 00000000000..ddcc095d032 --- /dev/null +++ b/queue-5.4/pci-release-ivrs-table-in-amd-acs-quirk.patch @@ -0,0 +1,40 @@ +From 613dee54c521932469bc9d1c7168e365afd331d1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 22 Jul 2020 17:44:28 +0800 +Subject: PCI: Release IVRS table in AMD ACS quirk + +From: Hanjun Guo + +[ Upstream commit 090688fa4e448284aaa16136372397d7d10814db ] + +The acpi_get_table() should be coupled with acpi_put_table() if the mapped +table is not used at runtime to release the table mapping. + +In pci_quirk_amd_sb_acs(), IVRS table is just used for checking AMD IOMMU +is supported, not used at runtime, so put the table after using it. + +Fixes: 15b100dfd1c9 ("PCI: Claim ACS support for AMD southbridge devices") +Link: https://lore.kernel.org/r/1595411068-15440-1-git-send-email-guohanjun@huawei.com +Signed-off-by: Hanjun Guo +Signed-off-by: Bjorn Helgaas +Signed-off-by: Sasha Levin +--- + drivers/pci/quirks.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c +index 4ac4b28e0ebbf..9bc0f321aaf0e 100644 +--- a/drivers/pci/quirks.c ++++ b/drivers/pci/quirks.c +@@ -4446,6 +4446,8 @@ static int pci_quirk_amd_sb_acs(struct pci_dev *dev, u16 acs_flags) + if (ACPI_FAILURE(status)) + return -ENODEV; + ++ acpi_put_table(header); ++ + /* Filter out flags not applicable to multifunction */ + acs_flags &= (PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_EC | PCI_ACS_DT); + +-- +2.25.1 + diff --git a/queue-5.4/phy-armada-38x-fix-neta-lockup-when-repeatedly-switc.patch b/queue-5.4/phy-armada-38x-fix-neta-lockup-when-repeatedly-switc.patch new file mode 100644 index 00000000000..cb7896bb988 --- /dev/null +++ b/queue-5.4/phy-armada-38x-fix-neta-lockup-when-repeatedly-switc.patch @@ -0,0 +1,141 @@ +From 86222746d71da35674e55c18ebf981faaf49c7a5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 21 Jul 2020 15:40:43 +0100 +Subject: phy: armada-38x: fix NETA lockup when repeatedly switching speeds + +From: Russell King + +[ Upstream commit 1dea06cd643da38931382ebdc151efced201ffad ] + +The mvneta hardware appears to lock up in various random ways when +repeatedly switching speeds between 1G and 2.5G, which involves +reprogramming the COMPHY. It is not entirely clear why this happens, +but best guess is that reprogramming the COMPHY glitches mvneta clocks +causing the hardware to fail. It seems that rebooting resolves the +failure, but not down/up cycling the interface alone. + +Various other approaches have been tried, such as trying to cleanly +power down the COMPHY and then take it back through the power up +initialisation, but this does not seem to help. + +It was finally noticed that u-boot's last step when configuring a +COMPHY for "SGMII" mode was to poke at a register described as +"GBE_CONFIGURATION_REG", which is undocumented in any external +documentation. All that we have is the fact that u-boot sets a bit +corresponding to the "SGMII" lane at the end of COMPHY initialisation. + +Experimentation shows that if we clear this bit prior to changing the +speed, and then set it afterwards, mvneta does not suffer this problem +on the SolidRun Clearfog when switching speeds between 1G and 2.5G. + +This problem was found while script-testing phylink. + +This fix also requires the corresponding change to DT to be effective. +See "ARM: dts: armada-38x: fix NETA lockup when repeatedly switching +speeds". + +Fixes: 14dc100b4411 ("phy: armada38x: add common phy support") +Signed-off-by: Russell King +Reviewed-by: Andrew Lunn +Link: https://lore.kernel.org/r/E1jxtRj-0003Tz-CG@rmk-PC.armlinux.org.uk +Signed-off-by: Vinod Koul +Signed-off-by: Sasha Levin +--- + drivers/phy/marvell/phy-armada38x-comphy.c | 45 ++++++++++++++++++---- + 1 file changed, 38 insertions(+), 7 deletions(-) + +diff --git a/drivers/phy/marvell/phy-armada38x-comphy.c b/drivers/phy/marvell/phy-armada38x-comphy.c +index 6960dfd8ad8c9..0fe4089643342 100644 +--- a/drivers/phy/marvell/phy-armada38x-comphy.c ++++ b/drivers/phy/marvell/phy-armada38x-comphy.c +@@ -41,6 +41,7 @@ struct a38x_comphy_lane { + + struct a38x_comphy { + void __iomem *base; ++ void __iomem *conf; + struct device *dev; + struct a38x_comphy_lane lane[MAX_A38X_COMPHY]; + }; +@@ -54,6 +55,21 @@ static const u8 gbe_mux[MAX_A38X_COMPHY][MAX_A38X_PORTS] = { + { 0, 0, 3 }, + }; + ++static void a38x_set_conf(struct a38x_comphy_lane *lane, bool enable) ++{ ++ struct a38x_comphy *priv = lane->priv; ++ u32 conf; ++ ++ if (priv->conf) { ++ conf = readl_relaxed(priv->conf); ++ if (enable) ++ conf |= BIT(lane->port); ++ else ++ conf &= ~BIT(lane->port); ++ writel(conf, priv->conf); ++ } ++} ++ + static void a38x_comphy_set_reg(struct a38x_comphy_lane *lane, + unsigned int offset, u32 mask, u32 value) + { +@@ -97,6 +113,7 @@ static int a38x_comphy_set_mode(struct phy *phy, enum phy_mode mode, int sub) + { + struct a38x_comphy_lane *lane = phy_get_drvdata(phy); + unsigned int gen; ++ int ret; + + if (mode != PHY_MODE_ETHERNET) + return -EINVAL; +@@ -115,13 +132,20 @@ static int a38x_comphy_set_mode(struct phy *phy, enum phy_mode mode, int sub) + return -EINVAL; + } + ++ a38x_set_conf(lane, false); ++ + a38x_comphy_set_speed(lane, gen, gen); + +- return a38x_comphy_poll(lane, COMPHY_STAT1, +- COMPHY_STAT1_PLL_RDY_TX | +- COMPHY_STAT1_PLL_RDY_RX, +- COMPHY_STAT1_PLL_RDY_TX | +- COMPHY_STAT1_PLL_RDY_RX); ++ ret = a38x_comphy_poll(lane, COMPHY_STAT1, ++ COMPHY_STAT1_PLL_RDY_TX | ++ COMPHY_STAT1_PLL_RDY_RX, ++ COMPHY_STAT1_PLL_RDY_TX | ++ COMPHY_STAT1_PLL_RDY_RX); ++ ++ if (ret == 0) ++ a38x_set_conf(lane, true); ++ ++ return ret; + } + + static const struct phy_ops a38x_comphy_ops = { +@@ -174,14 +198,21 @@ static int a38x_comphy_probe(struct platform_device *pdev) + if (!priv) + return -ENOMEM; + +- res = platform_get_resource(pdev, IORESOURCE_MEM, 0); +- base = devm_ioremap_resource(&pdev->dev, res); ++ base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(base)) + return PTR_ERR(base); + + priv->dev = &pdev->dev; + priv->base = base; + ++ /* Optional */ ++ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "conf"); ++ if (res) { ++ priv->conf = devm_ioremap_resource(&pdev->dev, res); ++ if (IS_ERR(priv->conf)) ++ return PTR_ERR(priv->conf); ++ } ++ + for_each_available_child_of_node(pdev->dev.of_node, child) { + struct phy *phy; + int ret; +-- +2.25.1 + diff --git a/queue-5.4/phy-exynos5-usbdrd-calibrating-makes-sense-only-for-.patch b/queue-5.4/phy-exynos5-usbdrd-calibrating-makes-sense-only-for-.patch new file mode 100644 index 00000000000..aac6dad87bb --- /dev/null +++ b/queue-5.4/phy-exynos5-usbdrd-calibrating-makes-sense-only-for-.patch @@ -0,0 +1,40 @@ +From 8e1cf61884e019badebb7b23e10dd18168fff3c7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 8 Jul 2020 15:38:00 +0200 +Subject: phy: exynos5-usbdrd: Calibrating makes sense only for USB2.0 PHY + +From: Marek Szyprowski + +[ Upstream commit dcbabfeb17c3c2fdb6bc92a3031ecd37df1834a8 ] + +PHY calibration is needed only for USB2.0 (UTMI) PHY, so skip calling +calibration code when phy_calibrate() is called for USB3.0 (PIPE3) PHY. + +Fixes: d8c80bb3b55b ("phy: exynos5-usbdrd: Calibrate LOS levels for exynos5420/5800") +Signed-off-by: Marek Szyprowski +Acked-by: Krzysztof Kozlowski +Link: https://lore.kernel.org/r/20200708133800.3336-1-m.szyprowski@samsung.com +Signed-off-by: Vinod Koul +Signed-off-by: Sasha Levin +--- + drivers/phy/samsung/phy-exynos5-usbdrd.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/phy/samsung/phy-exynos5-usbdrd.c b/drivers/phy/samsung/phy-exynos5-usbdrd.c +index e510732afb8b0..7f6279fb4f8fa 100644 +--- a/drivers/phy/samsung/phy-exynos5-usbdrd.c ++++ b/drivers/phy/samsung/phy-exynos5-usbdrd.c +@@ -714,7 +714,9 @@ static int exynos5_usbdrd_phy_calibrate(struct phy *phy) + struct phy_usb_instance *inst = phy_get_drvdata(phy); + struct exynos5_usbdrd_phy *phy_drd = to_usbdrd_phy(inst); + +- return exynos5420_usbdrd_phy_calibrate(phy_drd); ++ if (inst->phy_cfg->id == EXYNOS5_DRDPHY_UTMI) ++ return exynos5420_usbdrd_phy_calibrate(phy_drd); ++ return 0; + } + + static const struct phy_ops exynos5_usbdrd_phy_ops = { +-- +2.25.1 + diff --git a/queue-5.4/phy-renesas-rcar-gen3-usb2-move-irq-registration-to-.patch b/queue-5.4/phy-renesas-rcar-gen3-usb2-move-irq-registration-to-.patch new file mode 100644 index 00000000000..1ac776b515a --- /dev/null +++ b/queue-5.4/phy-renesas-rcar-gen3-usb2-move-irq-registration-to-.patch @@ -0,0 +1,159 @@ +From a77d511d00c595ed6ee5517e95f82c7ebf251364 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 17 Jul 2020 20:44:56 +0900 +Subject: phy: renesas: rcar-gen3-usb2: move irq registration to init + +From: Yoshihiro Shimoda + +[ Upstream commit 08b0ad375ca66181faee725b1b358bcae8d592ee ] + +If CONFIG_DEBUG_SHIRQ was enabled, r8a77951-salvator-xs could boot +correctly. If we appended "earlycon keep_bootcon" to the kernel +command like, we could get kernel log like below. + + SError Interrupt on CPU0, code 0xbf000002 -- SError + CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.8.0-rc3-salvator-x-00505-g6c843129e6faaf01 #785 + Hardware name: Renesas Salvator-X 2nd version board based on r8a77951 (DT) + pstate: 60400085 (nZCv daIf +PAN -UAO BTYPE=--) + pc : rcar_gen3_phy_usb2_irq+0x14/0x54 + lr : free_irq+0xf4/0x27c + +This means free_irq() calls the interrupt handler while PM runtime +is not getting if DEBUG_SHIRQ is enabled and rcar_gen3_phy_usb2_probe() +failed. To fix the issue, move the irq registration place to +rcar_gen3_phy_usb2_init() which is ready to handle the interrupts. + +Note that after the commit 549b6b55b005 ("phy: renesas: rcar-gen3-usb2: +enable/disable independent irqs") which is merged into v5.2, since this +driver creates multiple phy instances, needs to check whether one of +phy instances is initialized. However, if we backport this patch to v5.1 +or less, we don't need to check it because such kernel have single +phy instance. + +Reported-by: Wolfram Sang +Reported-by: Geert Uytterhoeven +Fixes: 9f391c574efc ("phy: rcar-gen3-usb2: add runtime ID/VBUS pin detection") +Signed-off-by: Yoshihiro Shimoda +Link: https://lore.kernel.org/r/1594986297-12434-2-git-send-email-yoshihiro.shimoda.uh@renesas.com +Signed-off-by: Vinod Koul +Signed-off-by: Sasha Levin +--- + drivers/phy/renesas/phy-rcar-gen3-usb2.c | 61 +++++++++++++----------- + 1 file changed, 33 insertions(+), 28 deletions(-) + +diff --git a/drivers/phy/renesas/phy-rcar-gen3-usb2.c b/drivers/phy/renesas/phy-rcar-gen3-usb2.c +index bfb22f868857f..5087b7c44d55b 100644 +--- a/drivers/phy/renesas/phy-rcar-gen3-usb2.c ++++ b/drivers/phy/renesas/phy-rcar-gen3-usb2.c +@@ -111,6 +111,7 @@ struct rcar_gen3_chan { + struct work_struct work; + struct mutex lock; /* protects rphys[...].powered */ + enum usb_dr_mode dr_mode; ++ int irq; + bool extcon_host; + bool is_otg_channel; + bool uses_otg_pins; +@@ -389,12 +390,38 @@ static void rcar_gen3_init_otg(struct rcar_gen3_chan *ch) + rcar_gen3_device_recognition(ch); + } + ++static irqreturn_t rcar_gen3_phy_usb2_irq(int irq, void *_ch) ++{ ++ struct rcar_gen3_chan *ch = _ch; ++ void __iomem *usb2_base = ch->base; ++ u32 status = readl(usb2_base + USB2_OBINTSTA); ++ irqreturn_t ret = IRQ_NONE; ++ ++ if (status & USB2_OBINT_BITS) { ++ dev_vdbg(ch->dev, "%s: %08x\n", __func__, status); ++ writel(USB2_OBINT_BITS, usb2_base + USB2_OBINTSTA); ++ rcar_gen3_device_recognition(ch); ++ ret = IRQ_HANDLED; ++ } ++ ++ return ret; ++} ++ + static int rcar_gen3_phy_usb2_init(struct phy *p) + { + struct rcar_gen3_phy *rphy = phy_get_drvdata(p); + struct rcar_gen3_chan *channel = rphy->ch; + void __iomem *usb2_base = channel->base; + u32 val; ++ int ret; ++ ++ if (!rcar_gen3_is_any_rphy_initialized(channel) && channel->irq >= 0) { ++ INIT_WORK(&channel->work, rcar_gen3_phy_usb2_work); ++ ret = request_irq(channel->irq, rcar_gen3_phy_usb2_irq, ++ IRQF_SHARED, dev_name(channel->dev), channel); ++ if (ret < 0) ++ dev_err(channel->dev, "No irq handler (%d)\n", channel->irq); ++ } + + /* Initialize USB2 part */ + val = readl(usb2_base + USB2_INT_ENABLE); +@@ -433,6 +460,9 @@ static int rcar_gen3_phy_usb2_exit(struct phy *p) + val &= ~USB2_INT_ENABLE_UCOM_INTEN; + writel(val, usb2_base + USB2_INT_ENABLE); + ++ if (channel->irq >= 0 && !rcar_gen3_is_any_rphy_initialized(channel)) ++ free_irq(channel->irq, channel); ++ + return 0; + } + +@@ -503,23 +533,6 @@ static const struct phy_ops rz_g1c_phy_usb2_ops = { + .owner = THIS_MODULE, + }; + +-static irqreturn_t rcar_gen3_phy_usb2_irq(int irq, void *_ch) +-{ +- struct rcar_gen3_chan *ch = _ch; +- void __iomem *usb2_base = ch->base; +- u32 status = readl(usb2_base + USB2_OBINTSTA); +- irqreturn_t ret = IRQ_NONE; +- +- if (status & USB2_OBINT_BITS) { +- dev_vdbg(ch->dev, "%s: %08x\n", __func__, status); +- writel(USB2_OBINT_BITS, usb2_base + USB2_OBINTSTA); +- rcar_gen3_device_recognition(ch); +- ret = IRQ_HANDLED; +- } +- +- return ret; +-} +- + static const struct of_device_id rcar_gen3_phy_usb2_match_table[] = { + { + .compatible = "renesas,usb2-phy-r8a77470", +@@ -598,7 +611,7 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev) + struct phy_provider *provider; + struct resource *res; + const struct phy_ops *phy_usb2_ops; +- int irq, ret = 0, i; ++ int ret = 0, i; + + if (!dev->of_node) { + dev_err(dev, "This driver needs device tree\n"); +@@ -614,16 +627,8 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev) + if (IS_ERR(channel->base)) + return PTR_ERR(channel->base); + +- /* call request_irq for OTG */ +- irq = platform_get_irq_optional(pdev, 0); +- if (irq >= 0) { +- INIT_WORK(&channel->work, rcar_gen3_phy_usb2_work); +- irq = devm_request_irq(dev, irq, rcar_gen3_phy_usb2_irq, +- IRQF_SHARED, dev_name(dev), channel); +- if (irq < 0) +- dev_err(dev, "No irq handler (%d)\n", irq); +- } +- ++ /* get irq number here and request_irq for OTG in phy_init */ ++ channel->irq = platform_get_irq_optional(pdev, 0); + channel->dr_mode = rcar_gen3_get_dr_mode(dev->of_node); + if (channel->dr_mode != USB_DR_MODE_UNKNOWN) { + int ret; +-- +2.25.1 + diff --git a/queue-5.4/pinctrl-single-fix-pcs_parse_pinconf-return-value.patch b/queue-5.4/pinctrl-single-fix-pcs_parse_pinconf-return-value.patch new file mode 100644 index 00000000000..32ff01dc43c --- /dev/null +++ b/queue-5.4/pinctrl-single-fix-pcs_parse_pinconf-return-value.patch @@ -0,0 +1,143 @@ +From 4ca6bb0add76d70ab0345e6044533c83ebd78130 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 8 Jun 2020 14:51:43 +0200 +Subject: pinctrl-single: fix pcs_parse_pinconf() return value + +From: Drew Fustini + +[ Upstream commit f46fe79ff1b65692a65266a5bec6dbe2bf7fc70f ] + +This patch causes pcs_parse_pinconf() to return -ENOTSUPP when no +pinctrl_map is added. The current behavior is to return 0 when +!PCS_HAS_PINCONF or !nconfs. Thus pcs_parse_one_pinctrl_entry() +incorrectly assumes that a map was added and sets num_maps = 2. + +Analysis: +========= +The function pcs_parse_one_pinctrl_entry() calls pcs_parse_pinconf() +if PCS_HAS_PINCONF is enabled. The function pcs_parse_pinconf() +returns 0 to indicate there was no error and num_maps is then set to 2: + + 980 static int pcs_parse_one_pinctrl_entry(struct pcs_device *pcs, + 981 struct device_node *np, + 982 struct pinctrl_map **map, + 983 unsigned *num_maps, + 984 const char **pgnames) + 985 { + +1053 (*map)->type = PIN_MAP_TYPE_MUX_GROUP; +1054 (*map)->data.mux.group = np->name; +1055 (*map)->data.mux.function = np->name; +1056 +1057 if (PCS_HAS_PINCONF && function) { +1058 res = pcs_parse_pinconf(pcs, np, function, map); +1059 if (res) +1060 goto free_pingroups; +1061 *num_maps = 2; +1062 } else { +1063 *num_maps = 1; +1064 } + +However, pcs_parse_pinconf() will also return 0 if !PCS_HAS_PINCONF or +!nconfs. I believe these conditions should indicate that no map was +added by returning -ENOTSUPP. Otherwise pcs_parse_one_pinctrl_entry() +will set num_maps = 2 even though no maps were successfully added, as +it does not reach "m++" on line 940: + + 895 static int pcs_parse_pinconf(struct pcs_device *pcs, struct device_node *np, + 896 struct pcs_function *func, + 897 struct pinctrl_map **map) + 898 + 899 { + 900 struct pinctrl_map *m = *map; + + 917 /* If pinconf isn't supported, don't parse properties in below. */ + 918 if (!PCS_HAS_PINCONF) + 919 return 0; + 920 + 921 /* cacluate how much properties are supported in current node */ + 922 for (i = 0; i < ARRAY_SIZE(prop2); i++) { + 923 if (of_find_property(np, prop2[i].name, NULL)) + 924 nconfs++; + 925 } + 926 for (i = 0; i < ARRAY_SIZE(prop4); i++) { + 927 if (of_find_property(np, prop4[i].name, NULL)) + 928 nconfs++; + 929 } + 930 if (!nconfs) + 919 return 0; + 932 + 933 func->conf = devm_kcalloc(pcs->dev, + 934 nconfs, sizeof(struct pcs_conf_vals), + 935 GFP_KERNEL); + 936 if (!func->conf) + 937 return -ENOMEM; + 938 func->nconfs = nconfs; + 939 conf = &(func->conf[0]); + 940 m++; + +This situtation will cause a boot failure [0] on the BeagleBone Black +(AM3358) when am33xx_pinmux node in arch/arm/boot/dts/am33xx-l4.dtsi +has compatible = "pinconf-single" instead of "pinctrl-single". + +The patch fixes this issue by returning -ENOSUPP when !PCS_HAS_PINCONF +or !nconfs, so that pcs_parse_one_pinctrl_entry() will know that no +map was added. + +Logic is also added to pcs_parse_one_pinctrl_entry() to distinguish +between -ENOSUPP and other errors. In the case of -ENOSUPP, num_maps +is set to 1 as it is valid for pinconf to be enabled and a given pin +group to not any pinconf properties. + +[0] https://lore.kernel.org/linux-omap/20200529175544.GA3766151@x1/ + +Fixes: 9dddb4df90d1 ("pinctrl: single: support generic pinconf") +Signed-off-by: Drew Fustini +Acked-by: Tony Lindgren +Link: https://lore.kernel.org/r/20200608125143.GA2789203@x1 +Signed-off-by: Linus Walleij +Signed-off-by: Sasha Levin +--- + drivers/pinctrl/pinctrl-single.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c +index 1e0614daee9bf..a9d511982780c 100644 +--- a/drivers/pinctrl/pinctrl-single.c ++++ b/drivers/pinctrl/pinctrl-single.c +@@ -916,7 +916,7 @@ static int pcs_parse_pinconf(struct pcs_device *pcs, struct device_node *np, + + /* If pinconf isn't supported, don't parse properties in below. */ + if (!PCS_HAS_PINCONF) +- return 0; ++ return -ENOTSUPP; + + /* cacluate how much properties are supported in current node */ + for (i = 0; i < ARRAY_SIZE(prop2); i++) { +@@ -928,7 +928,7 @@ static int pcs_parse_pinconf(struct pcs_device *pcs, struct device_node *np, + nconfs++; + } + if (!nconfs) +- return 0; ++ return -ENOTSUPP; + + func->conf = devm_kcalloc(pcs->dev, + nconfs, sizeof(struct pcs_conf_vals), +@@ -1056,9 +1056,12 @@ static int pcs_parse_one_pinctrl_entry(struct pcs_device *pcs, + + if (PCS_HAS_PINCONF && function) { + res = pcs_parse_pinconf(pcs, np, function, map); +- if (res) ++ if (res == 0) ++ *num_maps = 2; ++ else if (res == -ENOTSUPP) ++ *num_maps = 1; ++ else + goto free_pingroups; +- *num_maps = 2; + } else { + *num_maps = 1; + } +-- +2.25.1 + diff --git a/queue-5.4/platform-x86-asus-nb-wmi-add-support-for-asus-rog-ze.patch b/queue-5.4/platform-x86-asus-nb-wmi-add-support-for-asus-rog-ze.patch new file mode 100644 index 00000000000..eb769a2ff13 --- /dev/null +++ b/queue-5.4/platform-x86-asus-nb-wmi-add-support-for-asus-rog-ze.patch @@ -0,0 +1,127 @@ +From 85410820c2c6c496f419b21390638e575eee0a0c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 11 Jul 2020 11:43:21 +0200 +Subject: platform/x86: asus-nb-wmi: add support for ASUS ROG Zephyrus G14 and + G15 + +From: Armas Spann + +[ Upstream commit 13bceda68fb9ef388ad40d355ab8d03ee64d14c2 ] + +Add device support for the new ASUS ROG Zephyrus G14 (GA401I) and +G15 (GA502I) series. + +This is accomplished by two new quirk entries (one per each series), +as well as all current available G401I/G502I DMI_PRODUCT_NAMEs to match +the corresponding devices. + +Signed-off-by: Armas Spann +Signed-off-by: Andy Shevchenko +Signed-off-by: Sasha Levin +--- + drivers/platform/x86/asus-nb-wmi.c | 82 ++++++++++++++++++++++++++++++ + 1 file changed, 82 insertions(+) + +diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c +index 0d42477946f32..59b78a181723b 100644 +--- a/drivers/platform/x86/asus-nb-wmi.c ++++ b/drivers/platform/x86/asus-nb-wmi.c +@@ -110,6 +110,16 @@ static struct quirk_entry quirk_asus_forceals = { + .wmi_force_als_set = true, + }; + ++static struct quirk_entry quirk_asus_ga401i = { ++ .wmi_backlight_power = true, ++ .wmi_backlight_set_devstate = true, ++}; ++ ++static struct quirk_entry quirk_asus_ga502i = { ++ .wmi_backlight_power = true, ++ .wmi_backlight_set_devstate = true, ++}; ++ + static int dmi_matched(const struct dmi_system_id *dmi) + { + pr_info("Identified laptop model '%s'\n", dmi->ident); +@@ -411,6 +421,78 @@ static const struct dmi_system_id asus_quirks[] = { + }, + .driver_data = &quirk_asus_forceals, + }, ++ { ++ .callback = dmi_matched, ++ .ident = "ASUSTeK COMPUTER INC. GA401IH", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), ++ DMI_MATCH(DMI_PRODUCT_NAME, "GA401IH"), ++ }, ++ .driver_data = &quirk_asus_ga401i, ++ }, ++ { ++ .callback = dmi_matched, ++ .ident = "ASUSTeK COMPUTER INC. GA401II", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), ++ DMI_MATCH(DMI_PRODUCT_NAME, "GA401II"), ++ }, ++ .driver_data = &quirk_asus_ga401i, ++ }, ++ { ++ .callback = dmi_matched, ++ .ident = "ASUSTeK COMPUTER INC. GA401IU", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), ++ DMI_MATCH(DMI_PRODUCT_NAME, "GA401IU"), ++ }, ++ .driver_data = &quirk_asus_ga401i, ++ }, ++ { ++ .callback = dmi_matched, ++ .ident = "ASUSTeK COMPUTER INC. GA401IV", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), ++ DMI_MATCH(DMI_PRODUCT_NAME, "GA401IV"), ++ }, ++ .driver_data = &quirk_asus_ga401i, ++ }, ++ { ++ .callback = dmi_matched, ++ .ident = "ASUSTeK COMPUTER INC. GA401IVC", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), ++ DMI_MATCH(DMI_PRODUCT_NAME, "GA401IVC"), ++ }, ++ .driver_data = &quirk_asus_ga401i, ++ }, ++ { ++ .callback = dmi_matched, ++ .ident = "ASUSTeK COMPUTER INC. GA502II", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), ++ DMI_MATCH(DMI_PRODUCT_NAME, "GA502II"), ++ }, ++ .driver_data = &quirk_asus_ga502i, ++ }, ++ { ++ .callback = dmi_matched, ++ .ident = "ASUSTeK COMPUTER INC. GA502IU", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), ++ DMI_MATCH(DMI_PRODUCT_NAME, "GA502IU"), ++ }, ++ .driver_data = &quirk_asus_ga502i, ++ }, ++ { ++ .callback = dmi_matched, ++ .ident = "ASUSTeK COMPUTER INC. GA502IV", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), ++ DMI_MATCH(DMI_PRODUCT_NAME, "GA502IV"), ++ }, ++ .driver_data = &quirk_asus_ga502i, ++ }, + {}, + }; + +-- +2.25.1 + diff --git a/queue-5.4/platform-x86-intel-hid-fix-return-value-check-in-che.patch b/queue-5.4/platform-x86-intel-hid-fix-return-value-check-in-che.patch new file mode 100644 index 00000000000..2ee11d980de --- /dev/null +++ b/queue-5.4/platform-x86-intel-hid-fix-return-value-check-in-che.patch @@ -0,0 +1,38 @@ +From 664cc038e0366b040ee6bc31c79fd2b3d2eb6f1c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 10 Jul 2020 17:30:17 +0800 +Subject: platform/x86: intel-hid: Fix return value check in check_acpi_dev() + +From: Lu Wei + +[ Upstream commit 71fbe886ce6dd0be17f20aded9c63fe58edd2806 ] + +In the function check_acpi_dev(), if it fails to create +platform device, the return value is ERR_PTR() or NULL. +Thus it must use IS_ERR_OR_NULL() to check return value. + +Fixes: ecc83e52b28c ("intel-hid: new hid event driver for hotkeys") +Reported-by: Hulk Robot +Signed-off-by: Lu Wei +Signed-off-by: Andy Shevchenko +Signed-off-by: Sasha Levin +--- + drivers/platform/x86/intel-hid.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/platform/x86/intel-hid.c b/drivers/platform/x86/intel-hid.c +index 7a506c1d01134..ad1399dcb21f5 100644 +--- a/drivers/platform/x86/intel-hid.c ++++ b/drivers/platform/x86/intel-hid.c +@@ -570,7 +570,7 @@ check_acpi_dev(acpi_handle handle, u32 lvl, void *context, void **rv) + return AE_OK; + + if (acpi_match_device_ids(dev, ids) == 0) +- if (acpi_create_platform_device(dev, NULL)) ++ if (!IS_ERR_OR_NULL(acpi_create_platform_device(dev, NULL))) + dev_info(&dev->dev, + "intel-hid: created platform device\n"); + +-- +2.25.1 + diff --git a/queue-5.4/platform-x86-intel-vbtn-fix-return-value-check-in-ch.patch b/queue-5.4/platform-x86-intel-vbtn-fix-return-value-check-in-ch.patch new file mode 100644 index 00000000000..2ea41556945 --- /dev/null +++ b/queue-5.4/platform-x86-intel-vbtn-fix-return-value-check-in-ch.patch @@ -0,0 +1,38 @@ +From 0cdbfd62bb3ac381ab94c7233f98a9aaa3d761f6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 10 Jul 2020 17:30:18 +0800 +Subject: platform/x86: intel-vbtn: Fix return value check in check_acpi_dev() + +From: Lu Wei + +[ Upstream commit 64dd4a5a7d214a07e3d9f40227ec30ac8ba8796e ] + +In the function check_acpi_dev(), if it fails to create +platform device, the return value is ERR_PTR() or NULL. +Thus it must use IS_ERR_OR_NULL() to check return value. + +Fixes: 332e081225fc ("intel-vbtn: new driver for Intel Virtual Button") +Reported-by: Hulk Robot +Signed-off-by: Lu Wei +Signed-off-by: Andy Shevchenko +Signed-off-by: Sasha Levin +--- + drivers/platform/x86/intel-vbtn.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/platform/x86/intel-vbtn.c b/drivers/platform/x86/intel-vbtn.c +index cb2a80fdd8f46..3393ee95077f6 100644 +--- a/drivers/platform/x86/intel-vbtn.c ++++ b/drivers/platform/x86/intel-vbtn.c +@@ -286,7 +286,7 @@ check_acpi_dev(acpi_handle handle, u32 lvl, void *context, void **rv) + return AE_OK; + + if (acpi_match_device_ids(dev, ids) == 0) +- if (acpi_create_platform_device(dev, NULL)) ++ if (!IS_ERR_OR_NULL(acpi_create_platform_device(dev, NULL))) + dev_info(&dev->dev, + "intel-vbtn: created platform device\n"); + +-- +2.25.1 + diff --git a/queue-5.4/power-supply-check-if-calc_soc-succeeded-in-pm860x_i.patch b/queue-5.4/power-supply-check-if-calc_soc-succeeded-in-pm860x_i.patch new file mode 100644 index 00000000000..7ac5c13a75d --- /dev/null +++ b/queue-5.4/power-supply-check-if-calc_soc-succeeded-in-pm860x_i.patch @@ -0,0 +1,58 @@ +From 6f509ede94bb35665706d8c45b0168cba54046ee Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 12 Jul 2020 12:23:51 -0700 +Subject: power: supply: check if calc_soc succeeded in pm860x_init_battery + +From: Tom Rix + +[ Upstream commit ccf193dee1f0fff55b556928591f7818bac1b3b1 ] + +clang static analysis flags this error + +88pm860x_battery.c:522:19: warning: Assigned value is + garbage or undefined [core.uninitialized.Assign] + info->start_soc = soc; + ^ ~~~ +soc is set by calling calc_soc. +But calc_soc can return without setting soc. + +So check the return status and bail similarly to other +checks in pm860x_init_battery and initialize soc to +silence the warning. + +Fixes: a830d28b48bf ("power_supply: Enable battery-charger for 88pm860x") + +Signed-off-by: Tom Rix +Signed-off-by: Sebastian Reichel +Signed-off-by: Sasha Levin +--- + drivers/power/supply/88pm860x_battery.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/drivers/power/supply/88pm860x_battery.c b/drivers/power/supply/88pm860x_battery.c +index 5ca047b3f58fb..23e7d6447ae9d 100644 +--- a/drivers/power/supply/88pm860x_battery.c ++++ b/drivers/power/supply/88pm860x_battery.c +@@ -433,7 +433,7 @@ static void pm860x_init_battery(struct pm860x_battery_info *info) + int ret; + int data; + int bat_remove; +- int soc; ++ int soc = 0; + + /* measure enable on GPADC1 */ + data = MEAS1_GP1; +@@ -496,7 +496,9 @@ static void pm860x_init_battery(struct pm860x_battery_info *info) + } + mutex_unlock(&info->lock); + +- calc_soc(info, OCV_MODE_ACTIVE, &soc); ++ ret = calc_soc(info, OCV_MODE_ACTIVE, &soc); ++ if (ret < 0) ++ goto out; + + data = pm860x_reg_read(info->i2c, PM8607_POWER_UP_LOG); + bat_remove = data & BAT_WU_LOG; +-- +2.25.1 + diff --git a/queue-5.4/powerpc-32s-fix-config_book3s_601-uses.patch b/queue-5.4/powerpc-32s-fix-config_book3s_601-uses.patch new file mode 100644 index 00000000000..db488489e71 --- /dev/null +++ b/queue-5.4/powerpc-32s-fix-config_book3s_601-uses.patch @@ -0,0 +1,50 @@ +From d399c7341f6e981ca8914fcfc540549498a5b994 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 24 Jul 2020 23:17:24 +1000 +Subject: powerpc/32s: Fix CONFIG_BOOK3S_601 uses + +From: Michael Ellerman + +[ Upstream commit df4d4ef22446b3a789a4efd74d34f2ec1e24deb2 ] + +We have two uses of CONFIG_BOOK3S_601, which doesn't exist. Fix them +to use CONFIG_PPC_BOOK3S_601 which is the correct symbol. + +Fixes: 12c3f1fd87bf ("powerpc/32s: get rid of CPU_FTR_601 feature") +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/20200724131728.1643966-5-mpe@ellerman.id.au +Signed-off-by: Sasha Levin +--- + arch/powerpc/include/asm/ptrace.h | 2 +- + arch/powerpc/include/asm/timex.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/powerpc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h +index ee3ada66deb58..c41220f4aad9e 100644 +--- a/arch/powerpc/include/asm/ptrace.h ++++ b/arch/powerpc/include/asm/ptrace.h +@@ -203,7 +203,7 @@ do { \ + #endif /* __powerpc64__ */ + + #define arch_has_single_step() (1) +-#ifndef CONFIG_BOOK3S_601 ++#ifndef CONFIG_PPC_BOOK3S_601 + #define arch_has_block_step() (true) + #else + #define arch_has_block_step() (false) +diff --git a/arch/powerpc/include/asm/timex.h b/arch/powerpc/include/asm/timex.h +index d2d2c4bd84358..6047402b0a4db 100644 +--- a/arch/powerpc/include/asm/timex.h ++++ b/arch/powerpc/include/asm/timex.h +@@ -17,7 +17,7 @@ typedef unsigned long cycles_t; + + static inline cycles_t get_cycles(void) + { +- if (IS_ENABLED(CONFIG_BOOK3S_601)) ++ if (IS_ENABLED(CONFIG_PPC_BOOK3S_601)) + return 0; + + return mftb(); +-- +2.25.1 + diff --git a/queue-5.4/powerpc-book3s64-pkeys-use-pvr-check-instead-of-cpu-.patch b/queue-5.4/powerpc-book3s64-pkeys-use-pvr-check-instead-of-cpu-.patch new file mode 100644 index 00000000000..189f81f2bac --- /dev/null +++ b/queue-5.4/powerpc-book3s64-pkeys-use-pvr-check-instead-of-cpu-.patch @@ -0,0 +1,54 @@ +From 3be15d05effc5a6cf2c8bfe8014b900833f4f0c8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 9 Jul 2020 08:59:24 +0530 +Subject: powerpc/book3s64/pkeys: Use PVR check instead of cpu feature + +From: Aneesh Kumar K.V + +[ Upstream commit d79e7a5f26f1d179cbb915a8bf2469b6d7431c29 ] + +We are wrongly using CPU_FTRS_POWER8 to check for P8 support. Instead, we should +use PVR value. Now considering we are using CPU_FTRS_POWER8, that +implies we returned true for P9 with older firmware. Keep the same behavior +by checking for P9 PVR value. + +Fixes: cf43d3b26452 ("powerpc: Enable pkey subsystem") +Signed-off-by: Aneesh Kumar K.V +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/20200709032946.881753-2-aneesh.kumar@linux.ibm.com +Signed-off-by: Sasha Levin +--- + arch/powerpc/mm/book3s64/pkeys.c | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +diff --git a/arch/powerpc/mm/book3s64/pkeys.c b/arch/powerpc/mm/book3s64/pkeys.c +index 66f307e873dca..432fd9fa8c3f0 100644 +--- a/arch/powerpc/mm/book3s64/pkeys.c ++++ b/arch/powerpc/mm/book3s64/pkeys.c +@@ -83,13 +83,17 @@ static int pkey_initialize(void) + scan_pkey_feature(); + + /* +- * Let's assume 32 pkeys on P8 bare metal, if its not defined by device +- * tree. We make this exception since skiboot forgot to expose this +- * property on power8. ++ * Let's assume 32 pkeys on P8/P9 bare metal, if its not defined by device ++ * tree. We make this exception since some version of skiboot forgot to ++ * expose this property on power8/9. + */ +- if (!pkeys_devtree_defined && !firmware_has_feature(FW_FEATURE_LPAR) && +- cpu_has_feature(CPU_FTRS_POWER8)) +- pkeys_total = 32; ++ if (!pkeys_devtree_defined && !firmware_has_feature(FW_FEATURE_LPAR)) { ++ unsigned long pvr = mfspr(SPRN_PVR); ++ ++ if (PVR_VER(pvr) == PVR_POWER8 || PVR_VER(pvr) == PVR_POWER8E || ++ PVR_VER(pvr) == PVR_POWER8NVL || PVR_VER(pvr) == PVR_POWER9) ++ pkeys_total = 32; ++ } + + /* + * Adjust the upper limit, based on the number of bits supported by +-- +2.25.1 + diff --git a/queue-5.4/powerpc-boot-fix-config_ppc_mpc52xx-references.patch b/queue-5.4/powerpc-boot-fix-config_ppc_mpc52xx-references.patch new file mode 100644 index 00000000000..479e2ca148e --- /dev/null +++ b/queue-5.4/powerpc-boot-fix-config_ppc_mpc52xx-references.patch @@ -0,0 +1,53 @@ +From fc05718ee92f26ebd4b9a9c95cb4b9a33b1aad58 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 24 Jul 2020 23:17:26 +1000 +Subject: powerpc/boot: Fix CONFIG_PPC_MPC52XX references + +From: Michael Ellerman + +[ Upstream commit e5eff89657e72a9050d95fde146b54c7dc165981 ] + +Commit 866bfc75f40e ("powerpc: conditionally compile platform-specific +serial drivers") made some code depend on CONFIG_PPC_MPC52XX, which +doesn't exist. + +Fix it to use CONFIG_PPC_MPC52xx. + +Fixes: 866bfc75f40e ("powerpc: conditionally compile platform-specific serial drivers") +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/20200724131728.1643966-7-mpe@ellerman.id.au +Signed-off-by: Sasha Levin +--- + arch/powerpc/boot/Makefile | 2 +- + arch/powerpc/boot/serial.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile +index dfbd7f22eef5e..8c69bd07ada6a 100644 +--- a/arch/powerpc/boot/Makefile ++++ b/arch/powerpc/boot/Makefile +@@ -119,7 +119,7 @@ src-wlib-y := string.S crt0.S stdio.c decompress.c main.c \ + elf_util.c $(zlib-y) devtree.c stdlib.c \ + oflib.c ofconsole.c cuboot.c + +-src-wlib-$(CONFIG_PPC_MPC52XX) += mpc52xx-psc.c ++src-wlib-$(CONFIG_PPC_MPC52xx) += mpc52xx-psc.c + src-wlib-$(CONFIG_PPC64_BOOT_WRAPPER) += opal-calls.S opal.c + ifndef CONFIG_PPC64_BOOT_WRAPPER + src-wlib-y += crtsavres.S +diff --git a/arch/powerpc/boot/serial.c b/arch/powerpc/boot/serial.c +index 9457863147f9b..00179cd6bdd08 100644 +--- a/arch/powerpc/boot/serial.c ++++ b/arch/powerpc/boot/serial.c +@@ -128,7 +128,7 @@ int serial_console_init(void) + dt_is_compatible(devp, "fsl,cpm2-smc-uart")) + rc = cpm_console_init(devp, &serial_cd); + #endif +-#ifdef CONFIG_PPC_MPC52XX ++#ifdef CONFIG_PPC_MPC52xx + else if (dt_is_compatible(devp, "fsl,mpc5200-psc-uart")) + rc = mpc5200_psc_console_init(devp, &serial_cd); + #endif +-- +2.25.1 + diff --git a/queue-5.4/powerpc-perf-fix-missing-is_sier_aviable-during-buil.patch b/queue-5.4/powerpc-perf-fix-missing-is_sier_aviable-during-buil.patch new file mode 100644 index 00000000000..e6f85faf018 --- /dev/null +++ b/queue-5.4/powerpc-perf-fix-missing-is_sier_aviable-during-buil.patch @@ -0,0 +1,52 @@ +From 6cf5220a6909f4258599b60c29c03f0ebec7a72e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 14 Jun 2020 14:06:04 +0530 +Subject: powerpc/perf: Fix missing is_sier_aviable() during build + +From: Madhavan Srinivasan + +[ Upstream commit 3c9450c053f88e525b2db1e6990cdf34d14e7696 ] + +Compilation error: + arch/powerpc/perf/perf_regs.c:80:undefined reference to `.is_sier_available' + +Currently is_sier_available() is part of core-book3s.c, which is added +to build based on CONFIG_PPC_PERF_CTRS. + +A config with CONFIG_PERF_EVENTS and without CONFIG_PPC_PERF_CTRS will +have a build break because of missing is_sier_available(). + +In practice it only breaks when CONFIG_FSL_EMB_PERF_EVENT=n because +that also guards the usage of is_sier_available(). That only happens +with CONFIG_PPC_BOOK3E_64=y and CONFIG_FSL_SOC_BOOKE=n. + +Patch adds is_sier_available() in asm/perf_event.h to fix the build +break for configs missing CONFIG_PPC_PERF_CTRS. + +Fixes: 333804dc3b7a ("powerpc/perf: Update perf_regs structure to include SIER") +Reported-by: Aneesh Kumar K.V +Signed-off-by: Madhavan Srinivasan +[mpe: Add detail about CONFIG_FSL_SOC_BOOKE] +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/20200614083604.302611-1-maddy@linux.ibm.com +Signed-off-by: Sasha Levin +--- + arch/powerpc/include/asm/perf_event.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/arch/powerpc/include/asm/perf_event.h b/arch/powerpc/include/asm/perf_event.h +index 7426d7a90e1e1..7aba3c7ea25cd 100644 +--- a/arch/powerpc/include/asm/perf_event.h ++++ b/arch/powerpc/include/asm/perf_event.h +@@ -12,6 +12,8 @@ + + #ifdef CONFIG_PPC_PERF_CTRS + #include ++#else ++static inline bool is_sier_available(void) { return false; } + #endif + + #ifdef CONFIG_FSL_EMB_PERF_EVENT +-- +2.25.1 + diff --git a/queue-5.4/powerpc-rtas-don-t-online-cpus-for-partition-suspend.patch b/queue-5.4/powerpc-rtas-don-t-online-cpus-for-partition-suspend.patch new file mode 100644 index 00000000000..c9d0e31f98c --- /dev/null +++ b/queue-5.4/powerpc-rtas-don-t-online-cpus-for-partition-suspend.patch @@ -0,0 +1,294 @@ +From c7b10e55c6cb42b58c061ed9345cdf0a3e20f0dc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 12 Jun 2020 00:12:22 -0500 +Subject: powerpc/rtas: don't online CPUs for partition suspend + +From: Nathan Lynch + +[ Upstream commit ec2fc2a9e9bbad9023aab65bc472ce7a3ca8608f ] + +Partition suspension, used for hibernation and migration, requires +that the OS place all but one of the LPAR's processor threads into one +of two states prior to calling the ibm,suspend-me RTAS function: + + * the architected offline state (via RTAS stop-self); or + * the H_JOIN hcall, which does not return until the partition + resumes execution + +Using H_CEDE as the offline mode, introduced by +commit 3aa565f53c39 ("powerpc/pseries: Add hooks to put the CPU into +an appropriate offline state"), means that any threads which are +offline from Linux's point of view must be moved to one of those two +states before a partition suspension can proceed. + +This was eventually addressed in commit 120496ac2d2d ("powerpc: Bring +all threads online prior to migration/hibernation"), which added code +to temporarily bring up any offline processor threads so they can call +H_JOIN. Conceptually this is fine, but the implementation has had +multiple races with cpu hotplug operations initiated from user +space[1][2][3], the error handling is fragile, and it generates +user-visible cpu hotplug events which is a lot of noise for a platform +feature that's supposed to minimize disruption to workloads. + +With commit 3aa565f53c39 ("powerpc/pseries: Add hooks to put the CPU +into an appropriate offline state") reverted, this code becomes +unnecessary, so remove it. Since any offline CPUs now are truly +offline from the platform's point of view, it is no longer necessary +to bring up CPUs only to have them call H_JOIN and then go offline +again upon resuming. Only active threads are required to call H_JOIN; +stopped threads can be left alone. + +[1] commit a6717c01ddc2 ("powerpc/rtas: use device model APIs and + serialization during LPM") +[2] commit 9fb603050ffd ("powerpc/rtas: retry when cpu offline races + with suspend/migration") +[3] commit dfd718a2ed1f ("powerpc/rtas: Fix a potential race between + CPU-Offline & Migration") + +Fixes: 120496ac2d2d ("powerpc: Bring all threads online prior to migration/hibernation") +Signed-off-by: Nathan Lynch +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/20200612051238.1007764-3-nathanl@linux.ibm.com +Signed-off-by: Sasha Levin +--- + arch/powerpc/include/asm/rtas.h | 2 - + arch/powerpc/kernel/rtas.c | 122 +---------------------- + arch/powerpc/platforms/pseries/suspend.c | 22 +--- + 3 files changed, 3 insertions(+), 143 deletions(-) + +diff --git a/arch/powerpc/include/asm/rtas.h b/arch/powerpc/include/asm/rtas.h +index 3c1887351c713..bd227e0eab07b 100644 +--- a/arch/powerpc/include/asm/rtas.h ++++ b/arch/powerpc/include/asm/rtas.h +@@ -368,8 +368,6 @@ extern int rtas_set_indicator_fast(int indicator, int index, int new_value); + extern void rtas_progress(char *s, unsigned short hex); + extern int rtas_suspend_cpu(struct rtas_suspend_me_data *data); + extern int rtas_suspend_last_cpu(struct rtas_suspend_me_data *data); +-extern int rtas_online_cpus_mask(cpumask_var_t cpus); +-extern int rtas_offline_cpus_mask(cpumask_var_t cpus); + extern int rtas_ibm_suspend_me(u64 handle); + + struct rtc_time; +diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c +index c5fa251b8950c..01210593d60c3 100644 +--- a/arch/powerpc/kernel/rtas.c ++++ b/arch/powerpc/kernel/rtas.c +@@ -842,96 +842,6 @@ static void rtas_percpu_suspend_me(void *info) + __rtas_suspend_cpu((struct rtas_suspend_me_data *)info, 1); + } + +-enum rtas_cpu_state { +- DOWN, +- UP, +-}; +- +-#ifndef CONFIG_SMP +-static int rtas_cpu_state_change_mask(enum rtas_cpu_state state, +- cpumask_var_t cpus) +-{ +- if (!cpumask_empty(cpus)) { +- cpumask_clear(cpus); +- return -EINVAL; +- } else +- return 0; +-} +-#else +-/* On return cpumask will be altered to indicate CPUs changed. +- * CPUs with states changed will be set in the mask, +- * CPUs with status unchanged will be unset in the mask. */ +-static int rtas_cpu_state_change_mask(enum rtas_cpu_state state, +- cpumask_var_t cpus) +-{ +- int cpu; +- int cpuret = 0; +- int ret = 0; +- +- if (cpumask_empty(cpus)) +- return 0; +- +- for_each_cpu(cpu, cpus) { +- struct device *dev = get_cpu_device(cpu); +- +- switch (state) { +- case DOWN: +- cpuret = device_offline(dev); +- break; +- case UP: +- cpuret = device_online(dev); +- break; +- } +- if (cpuret < 0) { +- pr_debug("%s: cpu_%s for cpu#%d returned %d.\n", +- __func__, +- ((state == UP) ? "up" : "down"), +- cpu, cpuret); +- if (!ret) +- ret = cpuret; +- if (state == UP) { +- /* clear bits for unchanged cpus, return */ +- cpumask_shift_right(cpus, cpus, cpu); +- cpumask_shift_left(cpus, cpus, cpu); +- break; +- } else { +- /* clear bit for unchanged cpu, continue */ +- cpumask_clear_cpu(cpu, cpus); +- } +- } +- cond_resched(); +- } +- +- return ret; +-} +-#endif +- +-int rtas_online_cpus_mask(cpumask_var_t cpus) +-{ +- int ret; +- +- ret = rtas_cpu_state_change_mask(UP, cpus); +- +- if (ret) { +- cpumask_var_t tmp_mask; +- +- if (!alloc_cpumask_var(&tmp_mask, GFP_KERNEL)) +- return ret; +- +- /* Use tmp_mask to preserve cpus mask from first failure */ +- cpumask_copy(tmp_mask, cpus); +- rtas_offline_cpus_mask(tmp_mask); +- free_cpumask_var(tmp_mask); +- } +- +- return ret; +-} +- +-int rtas_offline_cpus_mask(cpumask_var_t cpus) +-{ +- return rtas_cpu_state_change_mask(DOWN, cpus); +-} +- + int rtas_ibm_suspend_me(u64 handle) + { + long state; +@@ -939,8 +849,6 @@ int rtas_ibm_suspend_me(u64 handle) + unsigned long retbuf[PLPAR_HCALL_BUFSIZE]; + struct rtas_suspend_me_data data; + DECLARE_COMPLETION_ONSTACK(done); +- cpumask_var_t offline_mask; +- int cpuret; + + if (!rtas_service_present("ibm,suspend-me")) + return -ENOSYS; +@@ -961,9 +869,6 @@ int rtas_ibm_suspend_me(u64 handle) + return -EIO; + } + +- if (!alloc_cpumask_var(&offline_mask, GFP_KERNEL)) +- return -ENOMEM; +- + atomic_set(&data.working, 0); + atomic_set(&data.done, 0); + atomic_set(&data.error, 0); +@@ -972,24 +877,8 @@ int rtas_ibm_suspend_me(u64 handle) + + lock_device_hotplug(); + +- /* All present CPUs must be online */ +- cpumask_andnot(offline_mask, cpu_present_mask, cpu_online_mask); +- cpuret = rtas_online_cpus_mask(offline_mask); +- if (cpuret) { +- pr_err("%s: Could not bring present CPUs online.\n", __func__); +- atomic_set(&data.error, cpuret); +- goto out; +- } +- + cpu_hotplug_disable(); + +- /* Check if we raced with a CPU-Offline Operation */ +- if (!cpumask_equal(cpu_present_mask, cpu_online_mask)) { +- pr_info("%s: Raced against a concurrent CPU-Offline\n", __func__); +- atomic_set(&data.error, -EAGAIN); +- goto out_hotplug_enable; +- } +- + /* Call function on all CPUs. One of us will make the + * rtas call + */ +@@ -1000,18 +889,11 @@ int rtas_ibm_suspend_me(u64 handle) + if (atomic_read(&data.error) != 0) + printk(KERN_ERR "Error doing global join\n"); + +-out_hotplug_enable: +- cpu_hotplug_enable(); + +- /* Take down CPUs not online prior to suspend */ +- cpuret = rtas_offline_cpus_mask(offline_mask); +- if (cpuret) +- pr_warn("%s: Could not restore CPUs to offline state.\n", +- __func__); ++ cpu_hotplug_enable(); + +-out: + unlock_device_hotplug(); +- free_cpumask_var(offline_mask); ++ + return atomic_read(&data.error); + } + #else /* CONFIG_PPC_PSERIES */ +diff --git a/arch/powerpc/platforms/pseries/suspend.c b/arch/powerpc/platforms/pseries/suspend.c +index 0a24a5a185f02..f789693f61f40 100644 +--- a/arch/powerpc/platforms/pseries/suspend.c ++++ b/arch/powerpc/platforms/pseries/suspend.c +@@ -132,15 +132,11 @@ static ssize_t store_hibernate(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) + { +- cpumask_var_t offline_mask; + int rc; + + if (!capable(CAP_SYS_ADMIN)) + return -EPERM; + +- if (!alloc_cpumask_var(&offline_mask, GFP_KERNEL)) +- return -ENOMEM; +- + stream_id = simple_strtoul(buf, NULL, 16); + + do { +@@ -150,32 +146,16 @@ static ssize_t store_hibernate(struct device *dev, + } while (rc == -EAGAIN); + + if (!rc) { +- /* All present CPUs must be online */ +- cpumask_andnot(offline_mask, cpu_present_mask, +- cpu_online_mask); +- rc = rtas_online_cpus_mask(offline_mask); +- if (rc) { +- pr_err("%s: Could not bring present CPUs online.\n", +- __func__); +- goto out; +- } +- + stop_topology_update(); + rc = pm_suspend(PM_SUSPEND_MEM); + start_topology_update(); +- +- /* Take down CPUs not online prior to suspend */ +- if (!rtas_offline_cpus_mask(offline_mask)) +- pr_warn("%s: Could not restore CPUs to offline " +- "state.\n", __func__); + } + + stream_id = 0; + + if (!rc) + rc = count; +-out: +- free_cpumask_var(offline_mask); ++ + return rc; + } + +-- +2.25.1 + diff --git a/queue-5.4/powerpc-vdso-fix-vdso-cpu-truncation.patch b/queue-5.4/powerpc-vdso-fix-vdso-cpu-truncation.patch new file mode 100644 index 00000000000..8ab0e0f27d1 --- /dev/null +++ b/queue-5.4/powerpc-vdso-fix-vdso-cpu-truncation.patch @@ -0,0 +1,45 @@ +From 98133c567555447d8477530548dcc6bca9e81be5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 16 Jul 2020 09:37:04 +1000 +Subject: powerpc/vdso: Fix vdso cpu truncation + +From: Milton Miller + +[ Upstream commit a9f675f950a07d5c1dbcbb97aabac56f5ed085e3 ] + +The code in vdso_cpu_init that exposes the cpu and numa node to +userspace via SPRG_VDSO incorrctly masks the cpu to 12 bits. This means +that any kernel running on a box with more than 4096 threads (NR_CPUS +advertises a limit of of 8192 cpus) would expose userspace to two cpu +contexts running at the same time with the same cpu number. + +Note: I'm not aware of any distro shipping a kernel with support for more +than 4096 threads today, nor of any system image that currently exceeds +4096 threads. Found via code browsing. + +Fixes: 18ad51dd342a7eb09dbcd059d0b451b616d4dafc ("powerpc: Add VDSO version of getcpu") +Signed-off-by: Milton Miller +Signed-off-by: Anton Blanchard +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/20200715233704.1352257-1-anton@ozlabs.org +Signed-off-by: Sasha Levin +--- + arch/powerpc/kernel/vdso.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c +index eae9ddaecbcf4..efb1ba40274a8 100644 +--- a/arch/powerpc/kernel/vdso.c ++++ b/arch/powerpc/kernel/vdso.c +@@ -682,7 +682,7 @@ int vdso_getcpu_init(void) + node = cpu_to_node(cpu); + WARN_ON_ONCE(node > 0xffff); + +- val = (cpu & 0xfff) | ((node & 0xffff) << 16); ++ val = (cpu & 0xffff) | ((node & 0xffff) << 16); + mtspr(SPRN_SPRG_VDSO_WRITE, val); + get_paca()->sprg_vdso = val; + +-- +2.25.1 + diff --git a/queue-5.4/rdma-core-fix-bogus-warn_on-during-ib_unregister_dev.patch b/queue-5.4/rdma-core-fix-bogus-warn_on-during-ib_unregister_dev.patch new file mode 100644 index 00000000000..4988863ab13 --- /dev/null +++ b/queue-5.4/rdma-core-fix-bogus-warn_on-during-ib_unregister_dev.patch @@ -0,0 +1,74 @@ +From 2470434aa884532b16d93374063a6f93bb430902 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 26 Jun 2020 14:49:10 -0300 +Subject: RDMA/core: Fix bogus WARN_ON during ib_unregister_device_queued() + +From: Jason Gunthorpe + +[ Upstream commit 0cb42c0265837fafa2b4f302c8a7fed2631d7869 ] + +ib_unregister_device_queued() can only be used by drivers using the new +dealloc_device callback flow, and it has a safety WARN_ON to ensure +drivers are using it properly. + +However, if unregister and register are raced there is a special +destruction path that maintains the uniform error handling semantic of +'caller does ib_dealloc_device() on failure'. This requires disabling the +dealloc_device callback which triggers the WARN_ON. + +Instead of using NULL to disable the callback use a special function +pointer so the WARN_ON does not trigger. + +Fixes: d0899892edd0 ("RDMA/device: Provide APIs from the core code to help unregistration") +Link: https://lore.kernel.org/r/0-v1-a36d512e0a99+762-syz_dealloc_driver_jgg@nvidia.com +Reported-by: syzbot+4088ed905e4ae2b0e13b@syzkaller.appspotmail.com +Suggested-by: Hillf Danton +Reviewed-by: Leon Romanovsky +Signed-off-by: Jason Gunthorpe +Signed-off-by: Sasha Levin +--- + drivers/infiniband/core/device.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c +index 10ae6c6eab0ad..59dc9f3cfb376 100644 +--- a/drivers/infiniband/core/device.c ++++ b/drivers/infiniband/core/device.c +@@ -1330,6 +1330,10 @@ static int enable_device_and_get(struct ib_device *device) + return ret; + } + ++static void prevent_dealloc_device(struct ib_device *ib_dev) ++{ ++} ++ + /** + * ib_register_device - Register an IB device with IB core + * @device:Device to register +@@ -1397,11 +1401,11 @@ int ib_register_device(struct ib_device *device, const char *name) + * possibility for a parallel unregistration along with this + * error flow. Since we have a refcount here we know any + * parallel flow is stopped in disable_device and will see the +- * NULL pointers, causing the responsibility to ++ * special dealloc_driver pointer, causing the responsibility to + * ib_dealloc_device() to revert back to this thread. + */ + dealloc_fn = device->ops.dealloc_driver; +- device->ops.dealloc_driver = NULL; ++ device->ops.dealloc_driver = prevent_dealloc_device; + ib_device_put(device); + __ib_unregister_device(device); + device->ops.dealloc_driver = dealloc_fn; +@@ -1449,7 +1453,8 @@ static void __ib_unregister_device(struct ib_device *ib_dev) + * Drivers using the new flow may not call ib_dealloc_device except + * in error unwind prior to registration success. + */ +- if (ib_dev->ops.dealloc_driver) { ++ if (ib_dev->ops.dealloc_driver && ++ ib_dev->ops.dealloc_driver != prevent_dealloc_device) { + WARN_ON(kref_read(&ib_dev->dev.kobj.kref) <= 1); + ib_dealloc_device(ib_dev); + } +-- +2.25.1 + diff --git a/queue-5.4/rdma-core-fix-return-error-value-in-_ib_modify_qp-to.patch b/queue-5.4/rdma-core-fix-return-error-value-in-_ib_modify_qp-to.patch new file mode 100644 index 00000000000..da6f5a1fc8c --- /dev/null +++ b/queue-5.4/rdma-core-fix-return-error-value-in-_ib_modify_qp-to.patch @@ -0,0 +1,38 @@ +From d82ca4a91824d84ecf432c3fcb9afe2480e20c6c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 25 Jul 2020 10:56:27 +0800 +Subject: RDMA/core: Fix return error value in _ib_modify_qp() to negative + +From: Li Heng + +[ Upstream commit 47fda651d5af2506deac57d54887cf55ce26e244 ] + +The error codes in _ib_modify_qp() are supposed to be negative errno. + +Fixes: 7a5c938b9ed0 ("IB/core: Check for rdma_protocol_ib only after validating port_num") +Link: https://lore.kernel.org/r/1595645787-20375-1-git-send-email-liheng40@huawei.com +Reported-by: Hulk Robot +Signed-off-by: Li Heng +Reviewed-by: Parav Pandit +Signed-off-by: Jason Gunthorpe +Signed-off-by: Sasha Levin +--- + drivers/infiniband/core/verbs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c +index 6c4093d0a91d1..d4815f29cfd24 100644 +--- a/drivers/infiniband/core/verbs.c ++++ b/drivers/infiniband/core/verbs.c +@@ -1648,7 +1648,7 @@ static int _ib_modify_qp(struct ib_qp *qp, struct ib_qp_attr *attr, + if (!(rdma_protocol_ib(qp->device, + attr->alt_ah_attr.port_num) && + rdma_protocol_ib(qp->device, port))) { +- ret = EINVAL; ++ ret = -EINVAL; + goto out; + } + } +-- +2.25.1 + diff --git a/queue-5.4/rdma-netlink-remove-cap_net_raw-check-when-dump-a-ra.patch b/queue-5.4/rdma-netlink-remove-cap_net_raw-check-when-dump-a-ra.patch new file mode 100644 index 00000000000..bdf8cd43cc3 --- /dev/null +++ b/queue-5.4/rdma-netlink-remove-cap_net_raw-check-when-dump-a-ra.patch @@ -0,0 +1,40 @@ +From 0f63b051c1e31317d69a467974e42da20833ef07 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 27 Jul 2020 12:58:28 +0300 +Subject: RDMA/netlink: Remove CAP_NET_RAW check when dump a raw QP + +From: Mark Zhang + +[ Upstream commit 1d70ad0f85435a7262de802b104e49e6598c50ff ] + +When dumping QPs bound to a counter, raw QPs should be allowed to dump +without the CAP_NET_RAW privilege. This is consistent with what "rdma res +show qp" does. + +Fixes: c4ffee7c9bdb ("RDMA/netlink: Implement counter dumpit calback") +Link: https://lore.kernel.org/r/20200727095828.496195-1-leon@kernel.org +Signed-off-by: Mark Zhang +Signed-off-by: Leon Romanovsky +Signed-off-by: Jason Gunthorpe +Signed-off-by: Sasha Levin +--- + drivers/infiniband/core/nldev.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c +index 244ebf285fc3f..e4905d9fecb05 100644 +--- a/drivers/infiniband/core/nldev.c ++++ b/drivers/infiniband/core/nldev.c +@@ -702,9 +702,6 @@ static int fill_stat_counter_qps(struct sk_buff *msg, + continue; + + qp = container_of(res, struct ib_qp, res); +- if (qp->qp_type == IB_QPT_RAW_PACKET && !capable(CAP_NET_RAW)) +- continue; +- + if (!qp->counter || (qp->counter->id != counter->id)) + continue; + +-- +2.25.1 + diff --git a/queue-5.4/rdma-qedr-srq-s-bug-fixes.patch b/queue-5.4/rdma-qedr-srq-s-bug-fixes.patch new file mode 100644 index 00000000000..a16156243d0 --- /dev/null +++ b/queue-5.4/rdma-qedr-srq-s-bug-fixes.patch @@ -0,0 +1,115 @@ +From b20b9dde4ee6cb25094bc66114f70c9fcf867967 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 8 Jul 2020 22:55:26 +0300 +Subject: RDMA/qedr: SRQ's bug fixes + +From: Yuval Basson + +[ Upstream commit acca72e2b031b9fbb4184511072bd246a0abcebc ] + +QP's with the same SRQ, working on different CQs and running in parallel +on different CPUs could lead to a race when maintaining the SRQ consumer +count, and leads to FW running out of SRQs. Update the consumer +atomically. Make sure the wqe_prod is updated after the sge_prod due to +FW requirements. + +Fixes: 3491c9e799fb ("qedr: Add support for kernel mode SRQ's") +Link: https://lore.kernel.org/r/20200708195526.31040-1-ybason@marvell.com +Signed-off-by: Michal Kalderon +Signed-off-by: Yuval Basson +Signed-off-by: Jason Gunthorpe +Signed-off-by: Sasha Levin +--- + drivers/infiniband/hw/qedr/qedr.h | 4 ++-- + drivers/infiniband/hw/qedr/verbs.c | 22 ++++++++++------------ + 2 files changed, 12 insertions(+), 14 deletions(-) + +diff --git a/drivers/infiniband/hw/qedr/qedr.h b/drivers/infiniband/hw/qedr/qedr.h +index 8e927f6c15203..ed56df319d2df 100644 +--- a/drivers/infiniband/hw/qedr/qedr.h ++++ b/drivers/infiniband/hw/qedr/qedr.h +@@ -349,10 +349,10 @@ struct qedr_srq_hwq_info { + u32 wqe_prod; + u32 sge_prod; + u32 wr_prod_cnt; +- u32 wr_cons_cnt; ++ atomic_t wr_cons_cnt; + u32 num_elems; + +- u32 *virt_prod_pair_addr; ++ struct rdma_srq_producers *virt_prod_pair_addr; + dma_addr_t phy_prod_pair_addr; + }; + +diff --git a/drivers/infiniband/hw/qedr/verbs.c b/drivers/infiniband/hw/qedr/verbs.c +index 8b4240c1cc763..16a994fd7d0a7 100644 +--- a/drivers/infiniband/hw/qedr/verbs.c ++++ b/drivers/infiniband/hw/qedr/verbs.c +@@ -3460,7 +3460,7 @@ static u32 qedr_srq_elem_left(struct qedr_srq_hwq_info *hw_srq) + * count and consumer count and subtract it from max + * work request supported so that we get elements left. + */ +- used = hw_srq->wr_prod_cnt - hw_srq->wr_cons_cnt; ++ used = hw_srq->wr_prod_cnt - (u32)atomic_read(&hw_srq->wr_cons_cnt); + + return hw_srq->max_wr - used; + } +@@ -3475,7 +3475,6 @@ int qedr_post_srq_recv(struct ib_srq *ibsrq, const struct ib_recv_wr *wr, + unsigned long flags; + int status = 0; + u32 num_sge; +- u32 offset; + + spin_lock_irqsave(&srq->lock, flags); + +@@ -3488,7 +3487,8 @@ int qedr_post_srq_recv(struct ib_srq *ibsrq, const struct ib_recv_wr *wr, + if (!qedr_srq_elem_left(hw_srq) || + wr->num_sge > srq->hw_srq.max_sges) { + DP_ERR(dev, "Can't post WR (%d,%d) || (%d > %d)\n", +- hw_srq->wr_prod_cnt, hw_srq->wr_cons_cnt, ++ hw_srq->wr_prod_cnt, ++ atomic_read(&hw_srq->wr_cons_cnt), + wr->num_sge, srq->hw_srq.max_sges); + status = -ENOMEM; + *bad_wr = wr; +@@ -3522,22 +3522,20 @@ int qedr_post_srq_recv(struct ib_srq *ibsrq, const struct ib_recv_wr *wr, + hw_srq->sge_prod++; + } + +- /* Flush WQE and SGE information before ++ /* Update WQE and SGE information before + * updating producer. + */ +- wmb(); ++ dma_wmb(); + + /* SRQ producer is 8 bytes. Need to update SGE producer index + * in first 4 bytes and need to update WQE producer in + * next 4 bytes. + */ +- *srq->hw_srq.virt_prod_pair_addr = hw_srq->sge_prod; +- offset = offsetof(struct rdma_srq_producers, wqe_prod); +- *((u8 *)srq->hw_srq.virt_prod_pair_addr + offset) = +- hw_srq->wqe_prod; ++ srq->hw_srq.virt_prod_pair_addr->sge_prod = hw_srq->sge_prod; ++ /* Make sure sge producer is updated first */ ++ dma_wmb(); ++ srq->hw_srq.virt_prod_pair_addr->wqe_prod = hw_srq->wqe_prod; + +- /* Flush producer after updating it. */ +- wmb(); + wr = wr->next; + } + +@@ -3956,7 +3954,7 @@ static int process_resp_one_srq(struct qedr_dev *dev, struct qedr_qp *qp, + } else { + __process_resp_one(dev, qp, cq, wc, resp, wr_id); + } +- srq->hw_srq.wr_cons_cnt++; ++ atomic_inc(&srq->hw_srq.wr_cons_cnt); + + return 1; + } +-- +2.25.1 + diff --git a/queue-5.4/rdma-rxe-prevent-access-to-wr-next-ptr-afrer-wr-is-p.patch b/queue-5.4/rdma-rxe-prevent-access-to-wr-next-ptr-afrer-wr-is-p.patch new file mode 100644 index 00000000000..58f3cefe3fa --- /dev/null +++ b/queue-5.4/rdma-rxe-prevent-access-to-wr-next-ptr-afrer-wr-is-p.patch @@ -0,0 +1,61 @@ +From 0d0e30c229b6284f5fe0c276ab10392133437580 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 16 Jul 2020 22:03:41 +0300 +Subject: RDMA/rxe: Prevent access to wr->next ptr afrer wr is posted to send + queue + +From: Mikhail Malygin + +[ Upstream commit 5f0b2a6093a4d9aab093964c65083fe801ef1e58 ] + +rxe_post_send_kernel() iterates over linked list of wr's, until the +wr->next ptr is NULL. However if we've got an interrupt after last wr is +posted, control may be returned to the code after send completion callback +is executed and wr memory is freed. + +As a result, wr->next pointer may contain incorrect value leading to +panic. Store the wr->next on the stack before posting it. + +Fixes: 8700e3e7c485 ("Soft RoCE driver") +Link: https://lore.kernel.org/r/20200716190340.23453-1-m.malygin@yadro.com +Signed-off-by: Mikhail Malygin +Signed-off-by: Sergey Kojushev +Signed-off-by: Jason Gunthorpe +Signed-off-by: Sasha Levin +--- + drivers/infiniband/sw/rxe/rxe_verbs.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c +index 623129f27f5a1..71358b0b8910c 100644 +--- a/drivers/infiniband/sw/rxe/rxe_verbs.c ++++ b/drivers/infiniband/sw/rxe/rxe_verbs.c +@@ -679,6 +679,7 @@ static int rxe_post_send_kernel(struct rxe_qp *qp, const struct ib_send_wr *wr, + unsigned int mask; + unsigned int length = 0; + int i; ++ struct ib_send_wr *next; + + while (wr) { + mask = wr_opcode_mask(wr->opcode, qp); +@@ -695,6 +696,8 @@ static int rxe_post_send_kernel(struct rxe_qp *qp, const struct ib_send_wr *wr, + break; + } + ++ next = wr->next; ++ + length = 0; + for (i = 0; i < wr->num_sge; i++) + length += wr->sg_list[i].length; +@@ -705,7 +708,7 @@ static int rxe_post_send_kernel(struct rxe_qp *qp, const struct ib_send_wr *wr, + *bad_wr = wr; + break; + } +- wr = wr->next; ++ wr = next; + } + + rxe_run_task(&qp->req.task, 1); +-- +2.25.1 + diff --git a/queue-5.4/rdma-rxe-skip-dgid-check-in-loopback-mode.patch b/queue-5.4/rdma-rxe-skip-dgid-check-in-loopback-mode.patch new file mode 100644 index 00000000000..ddcb82efc77 --- /dev/null +++ b/queue-5.4/rdma-rxe-skip-dgid-check-in-loopback-mode.patch @@ -0,0 +1,72 @@ +From ad4abd34f6a5ea7b623eee8600b4b8ecaa9a9f8c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 30 Jun 2020 15:36:05 +0300 +Subject: RDMA/rxe: Skip dgid check in loopback mode + +From: Zhu Yanjun + +[ Upstream commit 5c99274be8864519328aa74bc550ba410095bc1c ] + +In the loopback tests, the following call trace occurs. + + Call Trace: + __rxe_do_task+0x1a/0x30 [rdma_rxe] + rxe_qp_destroy+0x61/0xa0 [rdma_rxe] + rxe_destroy_qp+0x20/0x60 [rdma_rxe] + ib_destroy_qp_user+0xcc/0x220 [ib_core] + uverbs_free_qp+0x3c/0xc0 [ib_uverbs] + destroy_hw_idr_uobject+0x24/0x70 [ib_uverbs] + uverbs_destroy_uobject+0x43/0x1b0 [ib_uverbs] + uobj_destroy+0x41/0x70 [ib_uverbs] + __uobj_get_destroy+0x39/0x70 [ib_uverbs] + ib_uverbs_destroy_qp+0x88/0xc0 [ib_uverbs] + ib_uverbs_handler_UVERBS_METHOD_INVOKE_WRITE+0xb9/0xf0 [ib_uverbs] + ib_uverbs_cmd_verbs+0xb16/0xc30 [ib_uverbs] + +The root cause is that the actual RDMA connection is not created in the +loopback tests and the rxe_match_dgid will fail randomly. + +To fix this call trace which appear in the loopback tests, skip check of +the dgid. + +Fixes: 8700e3e7c485 ("Soft RoCE driver") +Link: https://lore.kernel.org/r/20200630123605.446959-1-leon@kernel.org +Signed-off-by: Zhu Yanjun +Signed-off-by: Leon Romanovsky +Signed-off-by: Jason Gunthorpe +Signed-off-by: Sasha Levin +--- + drivers/infiniband/sw/rxe/rxe_recv.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/drivers/infiniband/sw/rxe/rxe_recv.c b/drivers/infiniband/sw/rxe/rxe_recv.c +index 831ad578a7b29..46e111c218fd4 100644 +--- a/drivers/infiniband/sw/rxe/rxe_recv.c ++++ b/drivers/infiniband/sw/rxe/rxe_recv.c +@@ -330,10 +330,14 @@ static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb) + + static int rxe_match_dgid(struct rxe_dev *rxe, struct sk_buff *skb) + { ++ struct rxe_pkt_info *pkt = SKB_TO_PKT(skb); + const struct ib_gid_attr *gid_attr; + union ib_gid dgid; + union ib_gid *pdgid; + ++ if (pkt->mask & RXE_LOOPBACK_MASK) ++ return 0; ++ + if (skb->protocol == htons(ETH_P_IP)) { + ipv6_addr_set_v4mapped(ip_hdr(skb)->daddr, + (struct in6_addr *)&dgid); +@@ -366,7 +370,7 @@ void rxe_rcv(struct sk_buff *skb) + if (unlikely(skb->len < pkt->offset + RXE_BTH_BYTES)) + goto drop; + +- if (unlikely(rxe_match_dgid(rxe, skb) < 0)) { ++ if (rxe_match_dgid(rxe, skb) < 0) { + pr_warn_ratelimited("failed matching dgid\n"); + goto drop; + } +-- +2.25.1 + diff --git a/queue-5.4/recordmcount-only-record-relocation-of-type-r_aarch6.patch b/queue-5.4/recordmcount-only-record-relocation-of-type-r_aarch6.patch new file mode 100644 index 00000000000..2039544144c --- /dev/null +++ b/queue-5.4/recordmcount-only-record-relocation-of-type-r_aarch6.patch @@ -0,0 +1,83 @@ +From af2ffdb2c60b4cf1f13cd8b8412ceb7a2cf3284d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 17 Jul 2020 16:33:38 +0200 +Subject: recordmcount: only record relocation of type R_AARCH64_CALL26 on + arm64. + +From: Gregory Herrero + +[ Upstream commit ea0eada45632f4807b2f49de951072283e2d781c ] + +Currently, if a section has a relocation to '_mcount' symbol, a new +__mcount_loc entry will be added whatever the relocation type is. +This is problematic when a relocation to '_mcount' is in the middle of a +section and is not a call for ftrace use. + +Such relocation could be generated with below code for example: + bool is_mcount(unsigned long addr) + { + return (target == (unsigned long) &_mcount); + } + +With this snippet of code, ftrace will try to patch the mcount location +generated by this code on module load and fail with: + + Call trace: + ftrace_bug+0xa0/0x28c + ftrace_process_locs+0x2f4/0x430 + ftrace_module_init+0x30/0x38 + load_module+0x14f0/0x1e78 + __do_sys_finit_module+0x100/0x11c + __arm64_sys_finit_module+0x28/0x34 + el0_svc_common+0x88/0x194 + el0_svc_handler+0x38/0x8c + el0_svc+0x8/0xc + ---[ end trace d828d06b36ad9d59 ]--- + ftrace failed to modify + [] 0xffffa2dbf3a3a41c + actual: 66:a9:3c:90 + Initializing ftrace call sites + ftrace record flags: 2000000 + (0) + expected tramp: ffffa2dc6cf66724 + +So Limit the relocation type to R_AARCH64_CALL26 as in perl version of +recordmcount. + +Fixes: af64d2aa872a ("ftrace: Add arm64 support to recordmcount") +Signed-off-by: Gregory Herrero +Acked-by: Steven Rostedt (VMware) +Link: https://lore.kernel.org/r/20200717143338.19302-1-gregory.herrero@oracle.com +Signed-off-by: Catalin Marinas +Signed-off-by: Sasha Levin +--- + scripts/recordmcount.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c +index 7225107a9aafe..e59022b3f1254 100644 +--- a/scripts/recordmcount.c ++++ b/scripts/recordmcount.c +@@ -434,6 +434,11 @@ static int arm_is_fake_mcount(Elf32_Rel const *rp) + return 1; + } + ++static int arm64_is_fake_mcount(Elf64_Rel const *rp) ++{ ++ return ELF64_R_TYPE(w(rp->r_info)) != R_AARCH64_CALL26; ++} ++ + /* 64-bit EM_MIPS has weird ELF64_Rela.r_info. + * http://techpubs.sgi.com/library/manuals/4000/007-4658-001/pdf/007-4658-001.pdf + * We interpret Table 29 Relocation Operation (Elf64_Rel, Elf64_Rela) [p.40] +@@ -547,6 +552,7 @@ static int do_file(char const *const fname) + make_nop = make_nop_arm64; + rel_type_nop = R_AARCH64_NONE; + ideal_nop = ideal_nop4_arm64; ++ is_fake_mcount64 = arm64_is_fake_mcount; + break; + case EM_IA_64: reltype = R_IA64_IMM64; break; + case EM_MIPS: /* reltype: e_class */ break; +-- +2.25.1 + diff --git a/queue-5.4/regulator-fix-memory-leak-on-error-path-of-regulator.patch b/queue-5.4/regulator-fix-memory-leak-on-error-path-of-regulator.patch new file mode 100644 index 00000000000..85783eca3dc --- /dev/null +++ b/queue-5.4/regulator-fix-memory-leak-on-error-path-of-regulator.patch @@ -0,0 +1,116 @@ +From bf895cce07614f7bfbc63517a818955ac4d57e91 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 24 Jul 2020 03:50:13 +0300 +Subject: regulator: fix memory leak on error path of regulator_register() + +From: Vladimir Zapolskiy + +[ Upstream commit 9177514ce34902b3adb2abd490b6ad05d1cfcb43 ] + +The change corrects registration and deregistration on error path +of a regulator, the problem was manifested by a reported memory +leak on deferred probe: + + as3722-regulator as3722-regulator: regulator 13 register failed -517 + + # cat /sys/kernel/debug/kmemleak + unreferenced object 0xecc43740 (size 64): + comm "swapper/0", pid 1, jiffies 4294937640 (age 712.880s) + hex dump (first 32 bytes): + 72 65 67 75 6c 61 74 6f 72 2e 32 34 00 5a 5a 5a regulator.24.ZZZ + 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a ZZZZZZZZZZZZZZZZ + backtrace: + [<0c4c3d1c>] __kmalloc_track_caller+0x15c/0x2c0 + [<40c0ad48>] kvasprintf+0x64/0xd4 + [<109abd29>] kvasprintf_const+0x70/0x84 + [] kobject_set_name_vargs+0x34/0xa8 + [<62282ea2>] dev_set_name+0x40/0x64 + [] regulator_register+0x3a4/0x1344 + [<16a9543f>] devm_regulator_register+0x4c/0x84 + [<51a4c6a1>] as3722_regulator_probe+0x294/0x754 + ... + +The memory leak problem was introduced as a side ef another fix in +regulator_register() error path, I believe that the proper fix is +to decouple device_register() function into its two compounds and +initialize a struct device before assigning any values to its fields +and then using it before actual registration of a device happens. + +This lets to call put_device() safely after initialization, and, since +now a release callback is called, kfree(rdev->constraints) shall be +removed to exclude a double free condition. + +Fixes: a3cde9534ebd ("regulator: core: fix regulator_register() error paths to properly release rdev") +Signed-off-by: Vladimir Zapolskiy +Cc: Wen Yang +Link: https://lore.kernel.org/r/20200724005013.23278-1-vz@mleia.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + drivers/regulator/core.c | 18 +++++++----------- + 1 file changed, 7 insertions(+), 11 deletions(-) + +diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c +index 0011bdc15afbb..a17aebe0aa7a7 100644 +--- a/drivers/regulator/core.c ++++ b/drivers/regulator/core.c +@@ -4994,7 +4994,6 @@ regulator_register(const struct regulator_desc *regulator_desc, + struct regulator_dev *rdev; + bool dangling_cfg_gpiod = false; + bool dangling_of_gpiod = false; +- bool reg_device_fail = false; + struct device *dev; + int ret, i; + +@@ -5123,10 +5122,12 @@ regulator_register(const struct regulator_desc *regulator_desc, + } + + /* register with sysfs */ ++ device_initialize(&rdev->dev); + rdev->dev.class = ®ulator_class; + rdev->dev.parent = dev; + dev_set_name(&rdev->dev, "regulator.%lu", + (unsigned long) atomic_inc_return(®ulator_no)); ++ dev_set_drvdata(&rdev->dev, rdev); + + /* set regulator constraints */ + if (init_data) +@@ -5177,12 +5178,9 @@ regulator_register(const struct regulator_desc *regulator_desc, + !rdev->desc->fixed_uV) + rdev->is_switch = true; + +- dev_set_drvdata(&rdev->dev, rdev); +- ret = device_register(&rdev->dev); +- if (ret != 0) { +- reg_device_fail = true; ++ ret = device_add(&rdev->dev); ++ if (ret != 0) + goto unset_supplies; +- } + + rdev_init_debugfs(rdev); + +@@ -5204,17 +5202,15 @@ regulator_register(const struct regulator_desc *regulator_desc, + mutex_unlock(®ulator_list_mutex); + wash: + kfree(rdev->coupling_desc.coupled_rdevs); +- kfree(rdev->constraints); + mutex_lock(®ulator_list_mutex); + regulator_ena_gpio_free(rdev); + mutex_unlock(®ulator_list_mutex); ++ put_device(&rdev->dev); ++ rdev = NULL; + clean: + if (dangling_of_gpiod) + gpiod_put(config->ena_gpiod); +- if (reg_device_fail) +- put_device(&rdev->dev); +- else +- kfree(rdev); ++ kfree(rdev); + kfree(config); + rinse: + if (dangling_cfg_gpiod) +-- +2.25.1 + diff --git a/queue-5.4/rtw88-coex-only-skip-coex-triggered-by-bt-info.patch b/queue-5.4/rtw88-coex-only-skip-coex-triggered-by-bt-info.patch new file mode 100644 index 00000000000..0d07b5114d9 --- /dev/null +++ b/queue-5.4/rtw88-coex-only-skip-coex-triggered-by-bt-info.patch @@ -0,0 +1,50 @@ +From 7c9386e9663ecd44c9a4e200fb82b38675b4c052 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 17 Jul 2020 14:49:34 +0800 +Subject: rtw88: coex: only skip coex triggered by BT info + +From: Yan-Hsuan Chuang + +[ Upstream commit 3f194bd4ca1cd9b8eef34d37d562279dbeb80319 ] + +The coex mechanism used to skip upon the freeze flag is raised. +That will cause the coex mechanism being skipped unexpectedly. +Coex only wanted to keep the TDMA table from being changed by +BT side. + +So, check the freeze and reason, if the coex reason is coming +from BT info, skip it, to make sure the coex triggered by Wifi +itself can work. + +This is required for the AP mode, while the control flow is +different with STA mode. When starting an AP mode, the AP mode +needs to start working immedaitely after leaving IPS, and the +freeze flag could be raised. If the coex info is skipped, then +the AP mode will not set the antenna owner, leads to TX stuck. + +Fixes: 4136214f7c46 ("rtw88: add BT co-existence support") +Signed-off-by: Yan-Hsuan Chuang +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/20200717064937.27966-5-yhchuang@realtek.com +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/realtek/rtw88/coex.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/realtek/rtw88/coex.c b/drivers/net/wireless/realtek/rtw88/coex.c +index 3e95ad1989123..853ac1c2ed73c 100644 +--- a/drivers/net/wireless/realtek/rtw88/coex.c ++++ b/drivers/net/wireless/realtek/rtw88/coex.c +@@ -1923,7 +1923,8 @@ static void rtw_coex_run_coex(struct rtw_dev *rtwdev, u8 reason) + if (coex_stat->wl_under_ips) + return; + +- if (coex->freeze && !coex_stat->bt_setup_link) ++ if (coex->freeze && coex_dm->reason == COEX_RSN_BTINFO && ++ !coex_stat->bt_setup_link) + return; + + coex_stat->cnt_wl[COEX_CNT_WL_COEXRUN]++; +-- +2.25.1 + diff --git a/queue-5.4/rtw88-fix-ldpc-field-for-ra-info.patch b/queue-5.4/rtw88-fix-ldpc-field-for-ra-info.patch new file mode 100644 index 00000000000..c0f8253bf1e --- /dev/null +++ b/queue-5.4/rtw88-fix-ldpc-field-for-ra-info.patch @@ -0,0 +1,39 @@ +From c6fb5d1da516b59401862c7c5d70ecad79d83911 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 17 Jul 2020 14:49:31 +0800 +Subject: rtw88: fix LDPC field for RA info + +From: Tsang-Shian Lin + +[ Upstream commit ae44fa993e8e6c1a1d22e5ca03d9eadd53b2745b ] + +Convert the type of LDPC field to boolen because +LDPC field of RA info H2C command to firmware +is only one bit. + +Fixes: e3037485c68e ("rtw88: new Realtek 802.11ac driver") +Signed-off-by: Tsang-Shian Lin +Signed-off-by: Yan-Hsuan Chuang +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/20200717064937.27966-2-yhchuang@realtek.com +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/realtek/rtw88/fw.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/realtek/rtw88/fw.c b/drivers/net/wireless/realtek/rtw88/fw.c +index 35dbdb3c4f1e5..8efaee7571f35 100644 +--- a/drivers/net/wireless/realtek/rtw88/fw.c ++++ b/drivers/net/wireless/realtek/rtw88/fw.c +@@ -340,7 +340,7 @@ void rtw_fw_send_ra_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si) + SET_RA_INFO_INIT_RA_LVL(h2c_pkt, si->init_ra_lv); + SET_RA_INFO_SGI_EN(h2c_pkt, si->sgi_enable); + SET_RA_INFO_BW_MODE(h2c_pkt, si->bw_mode); +- SET_RA_INFO_LDPC(h2c_pkt, si->ldpc_en); ++ SET_RA_INFO_LDPC(h2c_pkt, !!si->ldpc_en); + SET_RA_INFO_NO_UPDATE(h2c_pkt, no_update); + SET_RA_INFO_VHT_EN(h2c_pkt, si->vht_enable); + SET_RA_INFO_DIS_PT(h2c_pkt, disable_pt); +-- +2.25.1 + diff --git a/queue-5.4/rtw88-fix-short-gi-capability-based-on-current-bandw.patch b/queue-5.4/rtw88-fix-short-gi-capability-based-on-current-bandw.patch new file mode 100644 index 00000000000..28b72b01ca7 --- /dev/null +++ b/queue-5.4/rtw88-fix-short-gi-capability-based-on-current-bandw.patch @@ -0,0 +1,81 @@ +From c49d3ad5cb4e896ef6c262cdb56c2892c37eb8ae Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 17 Jul 2020 14:49:32 +0800 +Subject: rtw88: fix short GI capability based on current bandwidth + +From: Tsang-Shian Lin + +[ Upstream commit 4dd86b901d1373ef8446ecb50a7ca009f3475211 ] + +Fix the transmission is not sent with short GI under +some conditions even if the receiver supports short GI. +If VHT capability IE exists in the beacon, the original +code uses the short GI for 80M field as driver's short GI +setting for transmission, even the current bandwidth is +not 80MHz. + +Short GI supported fields for 20M/40M are informed in HT +capability information element, and short GI supported +field for 80M is informed in VHT capability information +element. + +These three fields may be set to different values. +Driver needs to record each short GI support field for +each bandwidth, and send correct info depends on current +bandwidth to the WiFi firmware. + +Fixes: e3037485c68e ("rtw88: new Realtek 802.11ac driver") +Signed-off-by: Tsang-Shian Lin +Signed-off-by: Yan-Hsuan Chuang +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/20200717064937.27966-3-yhchuang@realtek.com +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/realtek/rtw88/main.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c +index 88e2252bf8a2b..15c7a6fc37b90 100644 +--- a/drivers/net/wireless/realtek/rtw88/main.c ++++ b/drivers/net/wireless/realtek/rtw88/main.c +@@ -553,8 +553,6 @@ void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si) + stbc_en = VHT_STBC_EN; + if (sta->vht_cap.cap & IEEE80211_VHT_CAP_RXLDPC) + ldpc_en = VHT_LDPC_EN; +- if (sta->vht_cap.cap & IEEE80211_VHT_CAP_SHORT_GI_80) +- is_support_sgi = true; + } else if (sta->ht_cap.ht_supported) { + ra_mask |= (sta->ht_cap.mcs.rx_mask[1] << 20) | + (sta->ht_cap.mcs.rx_mask[0] << 12); +@@ -562,9 +560,6 @@ void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si) + stbc_en = HT_STBC_EN; + if (sta->ht_cap.cap & IEEE80211_HT_CAP_LDPC_CODING) + ldpc_en = HT_LDPC_EN; +- if (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_20 || +- sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_40) +- is_support_sgi = true; + } + + if (efuse->hw_cap.nss == 1) +@@ -606,12 +601,18 @@ void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si) + switch (sta->bandwidth) { + case IEEE80211_STA_RX_BW_80: + bw_mode = RTW_CHANNEL_WIDTH_80; ++ is_support_sgi = sta->vht_cap.vht_supported && ++ (sta->vht_cap.cap & IEEE80211_VHT_CAP_SHORT_GI_80); + break; + case IEEE80211_STA_RX_BW_40: + bw_mode = RTW_CHANNEL_WIDTH_40; ++ is_support_sgi = sta->ht_cap.ht_supported && ++ (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_40); + break; + default: + bw_mode = RTW_CHANNEL_WIDTH_20; ++ is_support_sgi = sta->ht_cap.ht_supported && ++ (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_20); + break; + } + +-- +2.25.1 + diff --git a/queue-5.4/s390-qeth-don-t-process-empty-bridge-port-events.patch b/queue-5.4/s390-qeth-don-t-process-empty-bridge-port-events.patch new file mode 100644 index 00000000000..50d251070fa --- /dev/null +++ b/queue-5.4/s390-qeth-don-t-process-empty-bridge-port-events.patch @@ -0,0 +1,40 @@ +From 06826ef086d7cb9c946b4b98e7014608e27b9507 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 30 Jul 2020 17:01:20 +0200 +Subject: s390/qeth: don't process empty bridge port events + +From: Julian Wiedmann + +[ Upstream commit 02472e28b9a45471c6d8729ff2c7422baa9be46a ] + +Discard events that don't contain any entries. This shouldn't happen, +but subsequent code relies on being able to use entry 0. So better +be safe than accessing garbage. + +Fixes: b4d72c08b358 ("qeth: bridgeport support - basic control") +Signed-off-by: Julian Wiedmann +Reviewed-by: Alexandra Winter +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/s390/net/qeth_l2_main.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c +index 92bace3b28fd2..4ce28aa490cdb 100644 +--- a/drivers/s390/net/qeth_l2_main.c ++++ b/drivers/s390/net/qeth_l2_main.c +@@ -1199,6 +1199,10 @@ static void qeth_bridge_state_change(struct qeth_card *card, + int extrasize; + + QETH_CARD_TEXT(card, 2, "brstchng"); ++ if (qports->num_entries == 0) { ++ QETH_CARD_TEXT(card, 2, "BPempty"); ++ return; ++ } + if (qports->entry_length != sizeof(struct qeth_sbp_port_entry)) { + QETH_CARD_TEXT_(card, 2, "BPsz%04x", qports->entry_length); + return; +-- +2.25.1 + diff --git a/queue-5.4/sched-correct-sd_flags-returned-by-tl-sd_flags.patch b/queue-5.4/sched-correct-sd_flags-returned-by-tl-sd_flags.patch new file mode 100644 index 00000000000..b7b373f22b9 --- /dev/null +++ b/queue-5.4/sched-correct-sd_flags-returned-by-tl-sd_flags.patch @@ -0,0 +1,40 @@ +From c320158416f00c2bdee9a45b648dce44b9989855 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 9 Jun 2020 23:09:36 +0800 +Subject: sched: correct SD_flags returned by tl->sd_flags() + +From: Peng Liu + +[ Upstream commit 9b1b234bb86bcdcdb142e900d39b599185465dbb ] + +During sched domain init, we check whether non-topological SD_flags are +returned by tl->sd_flags(), if found, fire a waning and correct the +violation, but the code failed to correct the violation. Correct this. + +Fixes: 143e1e28cb40 ("sched: Rework sched_domain topology definition") +Signed-off-by: Peng Liu +Signed-off-by: Peter Zijlstra (Intel) +Reviewed-by: Vincent Guittot +Reviewed-by: Valentin Schneider +Link: https://lkml.kernel.org/r/20200609150936.GA13060@iZj6chx1xj0e0buvshuecpZ +Signed-off-by: Sasha Levin +--- + kernel/sched/topology.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c +index 1fa1e13a59446..ffaa97a8d4051 100644 +--- a/kernel/sched/topology.c ++++ b/kernel/sched/topology.c +@@ -1333,7 +1333,7 @@ sd_init(struct sched_domain_topology_level *tl, + sd_flags = (*tl->sd_flags)(); + if (WARN_ONCE(sd_flags & ~TOPOLOGY_SD_FLAGS, + "wrong sd_flags in topology description\n")) +- sd_flags &= ~TOPOLOGY_SD_FLAGS; ++ sd_flags &= TOPOLOGY_SD_FLAGS; + + /* Apply detected topology flags */ + sd_flags |= dflags; +-- +2.25.1 + diff --git a/queue-5.4/sched-fair-fix-nohz-next-idle-balance.patch b/queue-5.4/sched-fair-fix-nohz-next-idle-balance.patch new file mode 100644 index 00000000000..6aea1d7f0e0 --- /dev/null +++ b/queue-5.4/sched-fair-fix-nohz-next-idle-balance.patch @@ -0,0 +1,86 @@ +From 2012854fc30ac5d2d7069ace965b0daa93a8cafa Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 9 Jun 2020 14:37:48 +0200 +Subject: sched/fair: Fix NOHZ next idle balance + +From: Vincent Guittot + +[ Upstream commit 3ea2f097b17e13a8280f1f9386c331b326a3dbef ] + +With commit: + 'b7031a02ec75 ("sched/fair: Add NOHZ_STATS_KICK")' +rebalance_domains of the local cfs_rq happens before others idle cpus have +updated nohz.next_balance and its value is overwritten. + +Move the update of nohz.next_balance for other idles cpus before balancing +and updating the next_balance of local cfs_rq. + +Also, the nohz.next_balance is now updated only if all idle cpus got a +chance to rebalance their domains and the idle balance has not been aborted +because of new activities on the CPU. In case of need_resched, the idle +load balance will be kick the next jiffie in order to address remaining +ilb. + +Fixes: b7031a02ec75 ("sched/fair: Add NOHZ_STATS_KICK") +Reported-by: Peng Liu +Signed-off-by: Vincent Guittot +Signed-off-by: Peter Zijlstra (Intel) +Reviewed-by: Valentin Schneider +Acked-by: Mel Gorman +Link: https://lkml.kernel.org/r/20200609123748.18636-1-vincent.guittot@linaro.org +Signed-off-by: Sasha Levin +--- + kernel/sched/fair.c | 23 ++++++++++++++--------- + 1 file changed, 14 insertions(+), 9 deletions(-) + +diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c +index 9b16080093be1..20bf1f66733ac 100644 +--- a/kernel/sched/fair.c ++++ b/kernel/sched/fair.c +@@ -9385,7 +9385,12 @@ static void kick_ilb(unsigned int flags) + { + int ilb_cpu; + +- nohz.next_balance++; ++ /* ++ * Increase nohz.next_balance only when if full ilb is triggered but ++ * not if we only update stats. ++ */ ++ if (flags & NOHZ_BALANCE_KICK) ++ nohz.next_balance = jiffies+1; + + ilb_cpu = find_new_ilb(); + +@@ -9703,6 +9708,14 @@ static bool _nohz_idle_balance(struct rq *this_rq, unsigned int flags, + } + } + ++ /* ++ * next_balance will be updated only when there is a need. ++ * When the CPU is attached to null domain for ex, it will not be ++ * updated. ++ */ ++ if (likely(update_next_balance)) ++ nohz.next_balance = next_balance; ++ + /* Newly idle CPU doesn't need an update */ + if (idle != CPU_NEWLY_IDLE) { + update_blocked_averages(this_cpu); +@@ -9723,14 +9736,6 @@ static bool _nohz_idle_balance(struct rq *this_rq, unsigned int flags, + if (has_blocked_load) + WRITE_ONCE(nohz.has_blocked, 1); + +- /* +- * next_balance will be updated only when there is a need. +- * When the CPU is attached to null domain for ex, it will not be +- * updated. +- */ +- if (likely(update_next_balance)) +- nohz.next_balance = next_balance; +- + return ret; + } + +-- +2.25.1 + diff --git a/queue-5.4/sched-uclamp-fix-initialization-of-struct-uclamp_rq.patch b/queue-5.4/sched-uclamp-fix-initialization-of-struct-uclamp_rq.patch new file mode 100644 index 00000000000..6a793cfa56f --- /dev/null +++ b/queue-5.4/sched-uclamp-fix-initialization-of-struct-uclamp_rq.patch @@ -0,0 +1,75 @@ +From 36ef52f24f211a57711d58a8c55cda8809696ae6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 30 Jun 2020 12:21:22 +0100 +Subject: sched/uclamp: Fix initialization of struct uclamp_rq + +From: Qais Yousef + +[ Upstream commit d81ae8aac85ca2e307d273f6dc7863a721bf054e ] + +struct uclamp_rq was zeroed out entirely in assumption that in the first +call to uclamp_rq_inc() they'd be initialized correctly in accordance to +default settings. + +But when next patch introduces a static key to skip +uclamp_rq_{inc,dec}() until userspace opts in to use uclamp, schedutil +will fail to perform any frequency changes because the +rq->uclamp[UCLAMP_MAX].value is zeroed at init and stays as such. Which +means all rqs are capped to 0 by default. + +Fix it by making sure we do proper initialization at init without +relying on uclamp_rq_inc() doing it later. + +Fixes: 69842cba9ace ("sched/uclamp: Add CPU's clamp buckets refcounting") +Signed-off-by: Qais Yousef +Signed-off-by: Peter Zijlstra (Intel) +Reviewed-by: Valentin Schneider +Tested-by: Lukasz Luba +Link: https://lkml.kernel.org/r/20200630112123.12076-2-qais.yousef@arm.com +Signed-off-by: Sasha Levin +--- + kernel/sched/core.c | 21 ++++++++++++++++----- + 1 file changed, 16 insertions(+), 5 deletions(-) + +diff --git a/kernel/sched/core.c b/kernel/sched/core.c +index 38ae3cf9d173e..b34b5c6e25248 100644 +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c +@@ -1238,6 +1238,20 @@ static void uclamp_fork(struct task_struct *p) + } + } + ++static void __init init_uclamp_rq(struct rq *rq) ++{ ++ enum uclamp_id clamp_id; ++ struct uclamp_rq *uc_rq = rq->uclamp; ++ ++ for_each_clamp_id(clamp_id) { ++ uc_rq[clamp_id] = (struct uclamp_rq) { ++ .value = uclamp_none(clamp_id) ++ }; ++ } ++ ++ rq->uclamp_flags = 0; ++} ++ + static void __init init_uclamp(void) + { + struct uclamp_se uc_max = {}; +@@ -1246,11 +1260,8 @@ static void __init init_uclamp(void) + + mutex_init(&uclamp_mutex); + +- for_each_possible_cpu(cpu) { +- memset(&cpu_rq(cpu)->uclamp, 0, +- sizeof(struct uclamp_rq)*UCLAMP_CNT); +- cpu_rq(cpu)->uclamp_flags = 0; +- } ++ for_each_possible_cpu(cpu) ++ init_uclamp_rq(cpu_rq(cpu)); + + for_each_clamp_id(clamp_id) { + uclamp_se_set(&init_task.uclamp_req[clamp_id], +-- +2.25.1 + diff --git a/queue-5.4/scsi-cumana_2-fix-different-dev_id-between-request_i.patch b/queue-5.4/scsi-cumana_2-fix-different-dev_id-between-request_i.patch new file mode 100644 index 00000000000..62300f788a9 --- /dev/null +++ b/queue-5.4/scsi-cumana_2-fix-different-dev_id-between-request_i.patch @@ -0,0 +1,39 @@ +From 7436ab931634ffda4b55115e9a61cac69cb9c3a0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 25 Jun 2020 22:47:30 +0200 +Subject: scsi: cumana_2: Fix different dev_id between request_irq() and + free_irq() + +From: Christophe JAILLET + +[ Upstream commit 040ab9c4fd0070cd5fa71ba3a7b95b8470db9b4d ] + +The dev_id used in request_irq() and free_irq() should match. Use 'info' +in both cases. + +Link: https://lore.kernel.org/r/20200625204730.943520-1-christophe.jaillet@wanadoo.fr +Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") +Acked-by: Russell King +Signed-off-by: Christophe JAILLET +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/arm/cumana_2.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/scsi/arm/cumana_2.c b/drivers/scsi/arm/cumana_2.c +index a1f3e9ee4e639..14e1d001253c4 100644 +--- a/drivers/scsi/arm/cumana_2.c ++++ b/drivers/scsi/arm/cumana_2.c +@@ -450,7 +450,7 @@ static int cumanascsi2_probe(struct expansion_card *ec, + + if (info->info.scsi.dma != NO_DMA) + free_dma(info->info.scsi.dma); +- free_irq(ec->irq, host); ++ free_irq(ec->irq, info); + + out_release: + fas216_release(host); +-- +2.25.1 + diff --git a/queue-5.4/scsi-eesox-fix-different-dev_id-between-request_irq-.patch b/queue-5.4/scsi-eesox-fix-different-dev_id-between-request_irq-.patch new file mode 100644 index 00000000000..d5e9b92578f --- /dev/null +++ b/queue-5.4/scsi-eesox-fix-different-dev_id-between-request_irq-.patch @@ -0,0 +1,38 @@ +From fac832aa853d9171ad92201b26b492e854547336 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 26 Jun 2020 06:05:53 +0200 +Subject: scsi: eesox: Fix different dev_id between request_irq() and + free_irq() + +From: Christophe JAILLET + +[ Upstream commit 86f2da1112ccf744ad9068b1d5d9843faf8ddee6 ] + +The dev_id used in request_irq() and free_irq() should match. Use 'info' in +both cases. + +Link: https://lore.kernel.org/r/20200626040553.944352-1-christophe.jaillet@wanadoo.fr +Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") +Signed-off-by: Christophe JAILLET +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/arm/eesox.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/scsi/arm/eesox.c b/drivers/scsi/arm/eesox.c +index 134f040d58e26..f441ec8eb93df 100644 +--- a/drivers/scsi/arm/eesox.c ++++ b/drivers/scsi/arm/eesox.c +@@ -571,7 +571,7 @@ static int eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id) + + if (info->info.scsi.dma != NO_DMA) + free_dma(info->info.scsi.dma); +- free_irq(ec->irq, host); ++ free_irq(ec->irq, info); + + out_remove: + fas216_remove(host); +-- +2.25.1 + diff --git a/queue-5.4/scsi-megaraid_sas-clear-affinity-hint.patch b/queue-5.4/scsi-megaraid_sas-clear-affinity-hint.patch new file mode 100644 index 00000000000..28bb9b215bb --- /dev/null +++ b/queue-5.4/scsi-megaraid_sas-clear-affinity-hint.patch @@ -0,0 +1,53 @@ +From b778b1fd7bb0367e5ee496350569f443e525e8ce Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 9 Jul 2020 15:31:44 +0200 +Subject: scsi: megaraid_sas: Clear affinity hint + +From: Tomas Henzl + +[ Upstream commit 1eb81df5c53b1e785fdef298d533feab991381e4 ] + +To avoid a warning in free_irq, clear the affinity hint. + +Link: https://lore.kernel.org/r/20200709133144.8363-1-thenzl@redhat.com +Fixes: f0b9e7bdc309 ("scsi: megaraid_sas: Set affinity for high IOPS reply queues") +Acked-by: Sumit Saxena +Signed-off-by: Tomas Henzl +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/megaraid/megaraid_sas_base.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c +index 0cbe6740e0c98..2c2966a297c77 100644 +--- a/drivers/scsi/megaraid/megaraid_sas_base.c ++++ b/drivers/scsi/megaraid/megaraid_sas_base.c +@@ -5586,9 +5586,13 @@ megasas_setup_irqs_msix(struct megasas_instance *instance, u8 is_probe) + &instance->irq_context[i])) { + dev_err(&instance->pdev->dev, + "Failed to register IRQ for vector %d.\n", i); +- for (j = 0; j < i; j++) ++ for (j = 0; j < i; j++) { ++ if (j < instance->low_latency_index_start) ++ irq_set_affinity_hint( ++ pci_irq_vector(pdev, j), NULL); + free_irq(pci_irq_vector(pdev, j), + &instance->irq_context[j]); ++ } + /* Retry irq register for IO_APIC*/ + instance->msix_vectors = 0; + instance->msix_load_balance = false; +@@ -5626,6 +5630,9 @@ megasas_destroy_irqs(struct megasas_instance *instance) { + + if (instance->msix_vectors) + for (i = 0; i < instance->msix_vectors; i++) { ++ if (i < instance->low_latency_index_start) ++ irq_set_affinity_hint( ++ pci_irq_vector(instance->pdev, i), NULL); + free_irq(pci_irq_vector(instance->pdev, i), + &instance->irq_context[i]); + } +-- +2.25.1 + diff --git a/queue-5.4/scsi-mesh-fix-panic-after-host-or-bus-reset.patch b/queue-5.4/scsi-mesh-fix-panic-after-host-or-bus-reset.patch new file mode 100644 index 00000000000..5f3daa6209c --- /dev/null +++ b/queue-5.4/scsi-mesh-fix-panic-after-host-or-bus-reset.patch @@ -0,0 +1,109 @@ +From abf54d39164112eba0927f98a3a420cff5cbcf75 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 23 Jul 2020 09:25:51 +1000 +Subject: scsi: mesh: Fix panic after host or bus reset + +From: Finn Thain + +[ Upstream commit edd7dd2292ab9c3628b65c4d04514c3068ad54f6 ] + +Booting Linux with a Conner CP3200 drive attached to the MESH SCSI bus +results in EH measures and a panic: + +[ 25.499838] mesh: configured for synchronous 5 MB/s +[ 25.787154] mesh: performing initial bus reset... +[ 29.867115] scsi host0: MESH +[ 29.929527] mesh: target 0 synchronous at 3.6 MB/s +[ 29.998763] scsi 0:0:0:0: Direct-Access CONNER CP3200-200mb-3.5 4040 PQ: 0 ANSI: 1 CCS +[ 31.989975] sd 0:0:0:0: [sda] 415872 512-byte logical blocks: (213 MB/203 MiB) +[ 32.070975] sd 0:0:0:0: [sda] Write Protect is off +[ 32.137197] sd 0:0:0:0: [sda] Mode Sense: 5b 00 00 08 +[ 32.209661] sd 0:0:0:0: [sda] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA +[ 32.332708] sda: [mac] sda1 sda2 sda3 +[ 32.417733] sd 0:0:0:0: [sda] Attached SCSI disk +... snip ... +[ 76.687067] mesh_abort((ptrval)) +[ 76.743606] mesh: state at (ptrval), regs at (ptrval), dma at (ptrval) +[ 76.810798] ct=6000 seq=86 bs=4017 fc= 0 exc= 0 err= 0 im= 7 int= 0 sp=85 +[ 76.880720] dma stat=84e0 cmdptr=1f73d000 +[ 76.941387] phase=4 msgphase=0 conn_tgt=0 data_ptr=24576 +[ 77.005567] dma_st=1 dma_ct=0 n_msgout=0 +[ 77.065456] target 0: req=(ptrval) goes_out=0 saved_ptr=0 +[ 77.130512] mesh_abort((ptrval)) +[ 77.187670] mesh: state at (ptrval), regs at (ptrval), dma at (ptrval) +[ 77.255594] ct=6000 seq=86 bs=4017 fc= 0 exc= 0 err= 0 im= 7 int= 0 sp=85 +[ 77.325778] dma stat=84e0 cmdptr=1f73d000 +[ 77.387239] phase=4 msgphase=0 conn_tgt=0 data_ptr=24576 +[ 77.453665] dma_st=1 dma_ct=0 n_msgout=0 +[ 77.515900] target 0: req=(ptrval) goes_out=0 saved_ptr=0 +[ 77.582902] mesh_host_reset +[ 88.187083] Kernel panic - not syncing: mesh: double DMA start ! +[ 88.254510] CPU: 0 PID: 358 Comm: scsi_eh_0 Not tainted 5.6.13-pmac #1 +[ 88.323302] Call Trace: +[ 88.378854] [e16ddc58] [c0027080] panic+0x13c/0x308 (unreliable) +[ 88.446221] [e16ddcb8] [c02b2478] mesh_start.part.12+0x130/0x414 +[ 88.513298] [e16ddcf8] [c02b2fc8] mesh_queue+0x54/0x70 +[ 88.577097] [e16ddd18] [c02a1848] scsi_send_eh_cmnd+0x374/0x384 +[ 88.643476] [e16dddc8] [c02a1938] scsi_eh_tur+0x5c/0xb8 +[ 88.707878] [e16dddf8] [c02a1ab8] scsi_eh_test_devices+0x124/0x178 +[ 88.775663] [e16dde28] [c02a2094] scsi_eh_ready_devs+0x588/0x8a8 +[ 88.843124] [e16dde98] [c02a31d8] scsi_error_handler+0x344/0x520 +[ 88.910697] [e16ddf08] [c00409c8] kthread+0xe4/0xe8 +[ 88.975166] [e16ddf38] [c000f234] ret_from_kernel_thread+0x14/0x1c +[ 89.044112] Rebooting in 180 seconds.. + +In theory, a panic can happen after a bus or host reset with dma_started +flag set. Fix this by halting the DMA before reinitializing the host. +Don't assume that ms->current_req is set when halt_dma() is invoked as it +may not hold for bus or host reset. + +BTW, this particular Conner drive can be made to work by inhibiting +disconnect/reselect with 'mesh.resel_targets=0'. + +Link: https://lore.kernel.org/r/3952bc691e150a7128b29120999b6092071b039a.1595460351.git.fthain@telegraphics.com.au +Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") +Cc: Paul Mackerras +Reported-and-tested-by: Stan Johnson +Signed-off-by: Finn Thain +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/mesh.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c +index 74fb50644678d..4dd50db906779 100644 +--- a/drivers/scsi/mesh.c ++++ b/drivers/scsi/mesh.c +@@ -1045,6 +1045,8 @@ static void handle_error(struct mesh_state *ms) + while ((in_8(&mr->bus_status1) & BS1_RST) != 0) + udelay(1); + printk("done\n"); ++ if (ms->dma_started) ++ halt_dma(ms); + handle_reset(ms); + /* request_q is empty, no point in mesh_start() */ + return; +@@ -1357,7 +1359,8 @@ static void halt_dma(struct mesh_state *ms) + ms->conn_tgt, ms->data_ptr, scsi_bufflen(cmd), + ms->tgts[ms->conn_tgt].data_goes_out); + } +- scsi_dma_unmap(cmd); ++ if (cmd) ++ scsi_dma_unmap(cmd); + ms->dma_started = 0; + } + +@@ -1712,6 +1715,9 @@ static int mesh_host_reset(struct scsi_cmnd *cmd) + + spin_lock_irqsave(ms->host->host_lock, flags); + ++ if (ms->dma_started) ++ halt_dma(ms); ++ + /* Reset the controller & dbdma channel */ + out_le32(&md->control, (RUN|PAUSE|FLUSH|WAKE) << 16); /* stop dma */ + out_8(&mr->exception, 0xff); /* clear all exception bits */ +-- +2.25.1 + diff --git a/queue-5.4/scsi-powertec-fix-different-dev_id-between-request_i.patch b/queue-5.4/scsi-powertec-fix-different-dev_id-between-request_i.patch new file mode 100644 index 00000000000..aeba610d22b --- /dev/null +++ b/queue-5.4/scsi-powertec-fix-different-dev_id-between-request_i.patch @@ -0,0 +1,38 @@ +From f57d5eec7901a6b45f8c8875c615848516e3a1ae Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 26 Jun 2020 05:59:48 +0200 +Subject: scsi: powertec: Fix different dev_id between request_irq() and + free_irq() + +From: Christophe JAILLET + +[ Upstream commit d179f7c763241c1dc5077fca88ddc3c47d21b763 ] + +The dev_id used in request_irq() and free_irq() should match. Use 'info' in +both cases. + +Link: https://lore.kernel.org/r/20200626035948.944148-1-christophe.jaillet@wanadoo.fr +Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") +Signed-off-by: Christophe JAILLET +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/arm/powertec.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/scsi/arm/powertec.c b/drivers/scsi/arm/powertec.c +index c795537a671cb..2dc0df005cb3b 100644 +--- a/drivers/scsi/arm/powertec.c ++++ b/drivers/scsi/arm/powertec.c +@@ -378,7 +378,7 @@ static int powertecscsi_probe(struct expansion_card *ec, + + if (info->info.scsi.dma != NO_DMA) + free_dma(info->info.scsi.dma); +- free_irq(ec->irq, host); ++ free_irq(ec->irq, info); + + out_release: + fas216_release(host); +-- +2.25.1 + diff --git a/queue-5.4/scsi-scsi_debug-add-check-for-sdebug_max_queue-durin.patch b/queue-5.4/scsi-scsi_debug-add-check-for-sdebug_max_queue-durin.patch new file mode 100644 index 00000000000..6cf1d82a463 --- /dev/null +++ b/queue-5.4/scsi-scsi_debug-add-check-for-sdebug_max_queue-durin.patch @@ -0,0 +1,92 @@ +From b8a0e45c402c5ccc8750770892a90f3755538f3c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 9 Jul 2020 20:23:19 +0800 +Subject: scsi: scsi_debug: Add check for sdebug_max_queue during module init + +From: John Garry + +[ Upstream commit c87bf24cfb60bce27b4d2c7e56ebfd86fb9d16bb ] + +sdebug_max_queue should not exceed SDEBUG_CANQUEUE, otherwise crashes like +this can be triggered by passing an out-of-range value: + +Hardware name: Huawei D06 /D06, BIOS Hisilicon D06 UEFI RC0 - V1.16.01 03/15/2019 + pstate: 20400009 (nzCv daif +PAN -UAO BTYPE=--) + pc : schedule_resp+0x2a4/0xa70 [scsi_debug] + lr : schedule_resp+0x52c/0xa70 [scsi_debug] + sp : ffff800022ab36f0 + x29: ffff800022ab36f0 x28: ffff0023a935a610 + x27: ffff800008e0a648 x26: 0000000000000003 + x25: ffff0023e84f3200 x24: 00000000003d0900 + x23: 0000000000000000 x22: 0000000000000000 + x21: ffff0023be60a320 x20: ffff0023be60b538 + x19: ffff800008e13000 x18: 0000000000000000 + x17: 0000000000000000 x16: 0000000000000000 + x15: 0000000000000000 x14: 0000000000000000 + x13: 0000000000000000 x12: 0000000000000000 + x11: 0000000000000000 x10: 0000000000000000 + x9 : 0000000000000001 x8 : 0000000000000000 + x7 : 0000000000000000 x6 : 00000000000000c1 + x5 : 0000020000200000 x4 : dead0000000000ff + x3 : 0000000000000200 x2 : 0000000000000200 + x1 : ffff800008e13d88 x0 : 0000000000000000 + Call trace: +schedule_resp+0x2a4/0xa70 [scsi_debug] +scsi_debug_queuecommand+0x2c4/0x9e0 [scsi_debug] +scsi_queue_rq+0x698/0x840 +__blk_mq_try_issue_directly+0x108/0x228 +blk_mq_request_issue_directly+0x58/0x98 +blk_mq_try_issue_list_directly+0x5c/0xf0 +blk_mq_sched_insert_requests+0x18c/0x200 +blk_mq_flush_plug_list+0x11c/0x190 +blk_flush_plug_list+0xdc/0x110 +blk_finish_plug+0x38/0x210 +blkdev_direct_IO+0x450/0x4d8 +generic_file_read_iter+0x84/0x180 +blkdev_read_iter+0x3c/0x50 +aio_read+0xc0/0x170 +io_submit_one+0x5c8/0xc98 +__arm64_sys_io_submit+0x1b0/0x258 +el0_svc_common.constprop.3+0x68/0x170 +do_el0_svc+0x24/0x90 +el0_sync_handler+0x13c/0x1a8 +el0_sync+0x158/0x180 + Code: 528847e0 72a001e0 6b00003f 540018cd (3941c340) + +In addition, it should not be less than 1. + +So add checks for these, and fail the module init for those cases. + +[mkp: changed if condition to match error message] + +Link: https://lore.kernel.org/r/1594297400-24756-2-git-send-email-john.garry@huawei.com +Fixes: c483739430f1 ("scsi_debug: add multiple queue support") +Reviewed-by: Ming Lei +Acked-by: Douglas Gilbert +Signed-off-by: John Garry +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/scsi_debug.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c +index 32965ec76965a..44181a2cbf18d 100644 +--- a/drivers/scsi/scsi_debug.c ++++ b/drivers/scsi/scsi_debug.c +@@ -5296,6 +5296,12 @@ static int __init scsi_debug_init(void) + pr_err("submit_queues must be 1 or more\n"); + return -EINVAL; + } ++ ++ if ((sdebug_max_queue > SDEBUG_CANQUEUE) || (sdebug_max_queue < 1)) { ++ pr_err("max_queue must be in range [1, %d]\n", SDEBUG_CANQUEUE); ++ return -EINVAL; ++ } ++ + sdebug_q_arr = kcalloc(submit_queues, sizeof(struct sdebug_queue), + GFP_KERNEL); + if (sdebug_q_arr == NULL) +-- +2.25.1 + diff --git a/queue-5.4/seccomp-fix-ioctl-number-for-seccomp_ioctl_notif_id_.patch b/queue-5.4/seccomp-fix-ioctl-number-for-seccomp_ioctl_notif_id_.patch new file mode 100644 index 00000000000..f2663e44ca4 --- /dev/null +++ b/queue-5.4/seccomp-fix-ioctl-number-for-seccomp_ioctl_notif_id_.patch @@ -0,0 +1,79 @@ +From 647f480784797c98c921fd9fc363cce4ebc7df58 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 15 Jun 2020 15:42:46 -0700 +Subject: seccomp: Fix ioctl number for SECCOMP_IOCTL_NOTIF_ID_VALID + +From: Kees Cook + +[ Upstream commit 47e33c05f9f07cac3de833e531bcac9ae052c7ca ] + +When SECCOMP_IOCTL_NOTIF_ID_VALID was first introduced it had the wrong +direction flag set. While this isn't a big deal as nothing currently +enforces these bits in the kernel, it should be defined correctly. Fix +the define and provide support for the old command until it is no longer +needed for backward compatibility. + +Fixes: 6a21cc50f0c7 ("seccomp: add a return code to trap to userspace") +Signed-off-by: Kees Cook +Signed-off-by: Sasha Levin +--- + include/uapi/linux/seccomp.h | 3 ++- + kernel/seccomp.c | 9 +++++++++ + tools/testing/selftests/seccomp/seccomp_bpf.c | 2 +- + 3 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/include/uapi/linux/seccomp.h b/include/uapi/linux/seccomp.h +index 90734aa5aa363..b5f901af79f0b 100644 +--- a/include/uapi/linux/seccomp.h ++++ b/include/uapi/linux/seccomp.h +@@ -93,5 +93,6 @@ struct seccomp_notif_resp { + #define SECCOMP_IOCTL_NOTIF_RECV SECCOMP_IOWR(0, struct seccomp_notif) + #define SECCOMP_IOCTL_NOTIF_SEND SECCOMP_IOWR(1, \ + struct seccomp_notif_resp) +-#define SECCOMP_IOCTL_NOTIF_ID_VALID SECCOMP_IOR(2, __u64) ++#define SECCOMP_IOCTL_NOTIF_ID_VALID SECCOMP_IOW(2, __u64) ++ + #endif /* _UAPI_LINUX_SECCOMP_H */ +diff --git a/kernel/seccomp.c b/kernel/seccomp.c +index 2c697ce7be21f..e0fd972356539 100644 +--- a/kernel/seccomp.c ++++ b/kernel/seccomp.c +@@ -42,6 +42,14 @@ + #include + #include + ++/* ++ * When SECCOMP_IOCTL_NOTIF_ID_VALID was first introduced, it had the ++ * wrong direction flag in the ioctl number. This is the broken one, ++ * which the kernel needs to keep supporting until all userspaces stop ++ * using the wrong command number. ++ */ ++#define SECCOMP_IOCTL_NOTIF_ID_VALID_WRONG_DIR SECCOMP_IOR(2, __u64) ++ + enum notify_state { + SECCOMP_NOTIFY_INIT, + SECCOMP_NOTIFY_SENT, +@@ -1168,6 +1176,7 @@ static long seccomp_notify_ioctl(struct file *file, unsigned int cmd, + return seccomp_notify_recv(filter, buf); + case SECCOMP_IOCTL_NOTIF_SEND: + return seccomp_notify_send(filter, buf); ++ case SECCOMP_IOCTL_NOTIF_ID_VALID_WRONG_DIR: + case SECCOMP_IOCTL_NOTIF_ID_VALID: + return seccomp_notify_id_valid(filter, buf); + default: +diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c +index 96bbda4f10fc6..19c7351eeb74b 100644 +--- a/tools/testing/selftests/seccomp/seccomp_bpf.c ++++ b/tools/testing/selftests/seccomp/seccomp_bpf.c +@@ -177,7 +177,7 @@ struct seccomp_metadata { + #define SECCOMP_IOCTL_NOTIF_RECV SECCOMP_IOWR(0, struct seccomp_notif) + #define SECCOMP_IOCTL_NOTIF_SEND SECCOMP_IOWR(1, \ + struct seccomp_notif_resp) +-#define SECCOMP_IOCTL_NOTIF_ID_VALID SECCOMP_IOR(2, __u64) ++#define SECCOMP_IOCTL_NOTIF_ID_VALID SECCOMP_IOW(2, __u64) + + struct seccomp_notif { + __u64 id; +-- +2.25.1 + diff --git a/queue-5.4/selftests-powerpc-fix-cpu-affinity-for-child-process.patch b/queue-5.4/selftests-powerpc-fix-cpu-affinity-for-child-process.patch new file mode 100644 index 00000000000..99f49a18eab --- /dev/null +++ b/queue-5.4/selftests-powerpc-fix-cpu-affinity-for-child-process.patch @@ -0,0 +1,82 @@ +From bed41342f5ef54153eb7fc762d49200d6c16dd9e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 9 Jun 2020 13:44:23 +0530 +Subject: selftests/powerpc: Fix CPU affinity for child process + +From: Harish + +[ Upstream commit 854eb5022be04f81e318765f089f41a57c8e5d83 ] + +On systems with large number of cpus, test fails trying to set +affinity by calling sched_setaffinity() with smaller size for affinity +mask. This patch fixes it by making sure that the size of allocated +affinity mask is dependent on the number of CPUs as reported by +get_nprocs(). + +Fixes: 00b7ec5c9cf3 ("selftests/powerpc: Import Anton's context_switch2 benchmark") +Reported-by: Shirisha Ganta +Signed-off-by: Sandipan Das +Signed-off-by: Harish +Reviewed-by: Kamalesh Babulal +Reviewed-by: Satheesh Rajendran +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/20200609081423.529664-1-harish@linux.ibm.com +Signed-off-by: Sasha Levin +--- + .../powerpc/benchmarks/context_switch.c | 21 ++++++++++++++----- + 1 file changed, 16 insertions(+), 5 deletions(-) + +diff --git a/tools/testing/selftests/powerpc/benchmarks/context_switch.c b/tools/testing/selftests/powerpc/benchmarks/context_switch.c +index a2e8c9da7fa53..d50cc05df4952 100644 +--- a/tools/testing/selftests/powerpc/benchmarks/context_switch.c ++++ b/tools/testing/selftests/powerpc/benchmarks/context_switch.c +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -104,8 +105,9 @@ static void start_thread_on(void *(*fn)(void *), void *arg, unsigned long cpu) + + static void start_process_on(void *(*fn)(void *), void *arg, unsigned long cpu) + { +- int pid; +- cpu_set_t cpuset; ++ int pid, ncpus; ++ cpu_set_t *cpuset; ++ size_t size; + + pid = fork(); + if (pid == -1) { +@@ -116,14 +118,23 @@ static void start_process_on(void *(*fn)(void *), void *arg, unsigned long cpu) + if (pid) + return; + +- CPU_ZERO(&cpuset); +- CPU_SET(cpu, &cpuset); ++ ncpus = get_nprocs(); ++ size = CPU_ALLOC_SIZE(ncpus); ++ cpuset = CPU_ALLOC(ncpus); ++ if (!cpuset) { ++ perror("malloc"); ++ exit(1); ++ } ++ CPU_ZERO_S(size, cpuset); ++ CPU_SET_S(cpu, size, cpuset); + +- if (sched_setaffinity(0, sizeof(cpuset), &cpuset)) { ++ if (sched_setaffinity(0, size, cpuset)) { + perror("sched_setaffinity"); ++ CPU_FREE(cpuset); + exit(1); + } + ++ CPU_FREE(cpuset); + fn(arg); + + exit(0); +-- +2.25.1 + diff --git a/queue-5.4/selftests-powerpc-fix-online-cpu-selection.patch b/queue-5.4/selftests-powerpc-fix-online-cpu-selection.patch new file mode 100644 index 00000000000..517784e03a3 --- /dev/null +++ b/queue-5.4/selftests-powerpc-fix-online-cpu-selection.patch @@ -0,0 +1,95 @@ +From 747680dffb945278b46a81b47d2d07e3c51eea24 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 30 Jul 2020 10:38:46 +0530 +Subject: selftests/powerpc: Fix online CPU selection + +From: Sandipan Das + +[ Upstream commit dfa03fff86027e58c8dba5c03ae68150d4e513ad ] + +The size of the CPU affinity mask must be large enough for +systems with a very large number of CPUs. Otherwise, tests +which try to determine the first online CPU by calling +sched_getaffinity() will fail. This makes sure that the size +of the allocated affinity mask is dependent on the number of +CPUs as reported by get_nprocs_conf(). + +Fixes: 3752e453f6ba ("selftests/powerpc: Add tests of PMU EBBs") +Reported-by: Shirisha Ganta +Signed-off-by: Sandipan Das +Reviewed-by: Kamalesh Babulal +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/a408c4b8e9a23bb39b539417a21eb0ff47bb5127.1596084858.git.sandipan@linux.ibm.com +Signed-off-by: Sasha Levin +--- + tools/testing/selftests/powerpc/utils.c | 37 +++++++++++++++++-------- + 1 file changed, 25 insertions(+), 12 deletions(-) + +diff --git a/tools/testing/selftests/powerpc/utils.c b/tools/testing/selftests/powerpc/utils.c +index c02d24835db46..176102eca994c 100644 +--- a/tools/testing/selftests/powerpc/utils.c ++++ b/tools/testing/selftests/powerpc/utils.c +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -88,28 +89,40 @@ void *get_auxv_entry(int type) + + int pick_online_cpu(void) + { +- cpu_set_t mask; +- int cpu; ++ int ncpus, cpu = -1; ++ cpu_set_t *mask; ++ size_t size; ++ ++ ncpus = get_nprocs_conf(); ++ size = CPU_ALLOC_SIZE(ncpus); ++ mask = CPU_ALLOC(ncpus); ++ if (!mask) { ++ perror("malloc"); ++ return -1; ++ } + +- CPU_ZERO(&mask); ++ CPU_ZERO_S(size, mask); + +- if (sched_getaffinity(0, sizeof(mask), &mask)) { ++ if (sched_getaffinity(0, size, mask)) { + perror("sched_getaffinity"); +- return -1; ++ goto done; + } + + /* We prefer a primary thread, but skip 0 */ +- for (cpu = 8; cpu < CPU_SETSIZE; cpu += 8) +- if (CPU_ISSET(cpu, &mask)) +- return cpu; ++ for (cpu = 8; cpu < ncpus; cpu += 8) ++ if (CPU_ISSET_S(cpu, size, mask)) ++ goto done; + + /* Search for anything, but in reverse */ +- for (cpu = CPU_SETSIZE - 1; cpu >= 0; cpu--) +- if (CPU_ISSET(cpu, &mask)) +- return cpu; ++ for (cpu = ncpus - 1; cpu >= 0; cpu--) ++ if (CPU_ISSET_S(cpu, size, mask)) ++ goto done; + + printf("No cpus in affinity mask?!\n"); +- return -1; ++ ++done: ++ CPU_FREE(mask); ++ return cpu; + } + + bool is_ppc64le(void) +-- +2.25.1 + diff --git a/queue-5.4/selftests-powerpc-squash-spurious-errors-due-to-devi.patch b/queue-5.4/selftests-powerpc-squash-spurious-errors-due-to-devi.patch new file mode 100644 index 00000000000..d77c30e659d --- /dev/null +++ b/queue-5.4/selftests-powerpc-squash-spurious-errors-due-to-devi.patch @@ -0,0 +1,68 @@ +From d9b964adab09452d9296670b40a9175cfacf3a4d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 27 Jul 2020 11:01:27 +1000 +Subject: selftests/powerpc: Squash spurious errors due to device removal + +From: Oliver O'Halloran + +[ Upstream commit 5f8cf6475828b600ff6d000e580c961ac839cc61 ] + +For drivers that don't have the error handling callbacks we implement +recovery by removing the device and re-probing it. This causes the sysfs +directory for the PCI device to be removed which causes the following +spurious error to be printed when checking the PE state: + +Breaking 0005:03:00.0... +./eeh-basic.sh: line 13: can't open /sys/bus/pci/devices/0005:03:00.0/eeh_pe_state: no such file +0005:03:00.0, waited 0/60 +0005:03:00.0, waited 1/60 +0005:03:00.0, waited 2/60 +0005:03:00.0, waited 3/60 +0005:03:00.0, waited 4/60 +0005:03:00.0, waited 5/60 +0005:03:00.0, waited 6/60 +0005:03:00.0, waited 7/60 +0005:03:00.0, Recovered after 8 seconds + +We currently try to avoid this by checking if the PE state file exists +before reading from it. This is however inherently racy so re-work the +state checking so that we only read from the file once, and we squash any +errors that occur while reading. + +Fixes: 85d86c8aa52e ("selftests/powerpc: Add basic EEH selftest") +Signed-off-by: Oliver O'Halloran +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/20200727010127.23698-1-oohall@gmail.com +Signed-off-by: Sasha Levin +--- + tools/testing/selftests/powerpc/eeh/eeh-functions.sh | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/tools/testing/selftests/powerpc/eeh/eeh-functions.sh b/tools/testing/selftests/powerpc/eeh/eeh-functions.sh +index f52ed92b53e74..00dc32c0ed75c 100755 +--- a/tools/testing/selftests/powerpc/eeh/eeh-functions.sh ++++ b/tools/testing/selftests/powerpc/eeh/eeh-functions.sh +@@ -5,12 +5,17 @@ pe_ok() { + local dev="$1" + local path="/sys/bus/pci/devices/$dev/eeh_pe_state" + +- if ! [ -e "$path" ] ; then ++ # if a driver doesn't support the error handling callbacks then the ++ # device is recovered by removing and re-probing it. This causes the ++ # sysfs directory to disappear so read the PE state once and squash ++ # any potential error messages ++ local eeh_state="$(cat $path 2>/dev/null)" ++ if [ -z "$eeh_state" ]; then + return 1; + fi + +- local fw_state="$(cut -d' ' -f1 < $path)" +- local sw_state="$(cut -d' ' -f2 < $path)" ++ local fw_state="$(echo $eeh_state | cut -d' ' -f1)" ++ local sw_state="$(echo $eeh_state | cut -d' ' -f2)" + + # If EEH_PE_ISOLATED or EEH_PE_RECOVERING are set then the PE is in an + # error state or being recovered. Either way, not ok. +-- +2.25.1 + diff --git a/queue-5.4/series b/queue-5.4/series index 3d1e811d7cc..73653bcb9c4 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -3,3 +3,212 @@ hid-input-fix-devices-that-return-multiple-bytes-in-battery-report.patch nvme-add-a-identify-namespace-identification-descriptor-list-quirk.patch fs-io_uring.c-fix-uninitialized-variable-is-referenc.patch clk-qcom-clk-rpmh-wait-for-completion-when-enabling-.patch +x86-mce-inject-fix-a-wrong-assignment-of-i_mce.statu.patch +sched-fair-fix-nohz-next-idle-balance.patch +sched-correct-sd_flags-returned-by-tl-sd_flags.patch +arm64-dts-rockchip-fix-rk3368-lion-gmac-reset-gpio.patch +arm64-dts-rockchip-fix-rk3399-puma-vcc5v0-host-gpio.patch +arm64-dts-rockchip-fix-rk3399-puma-gmac-reset-gpio.patch +edac-fix-reference-count-leaks.patch +crc-t10dif-fix-potential-crypto-notify-dead-lock.patch +arm64-dts-qcom-msm8916-replace-invalid-bias-pull-non.patch +blktrace-fix-debugfs-use-after-free.patch +crypto-ccree-fix-resource-leak-on-error-path.patch +arm-exynos-mcpm-restore-big.little-cpuidle-support.patch +firmware-arm_scmi-fix-scmi-genpd-domain-probing.patch +arm64-dts-exynos-fix-silent-hang-after-boot-on-espre.patch +sched-uclamp-fix-initialization-of-struct-uclamp_rq.patch +clk-scmi-fix-min-and-max-rate-when-registering-clock.patch +m68k-mac-don-t-send-iop-message-until-channel-is-idl.patch +m68k-mac-fix-iop-status-control-register-writes.patch +platform-x86-intel-hid-fix-return-value-check-in-che.patch +platform-x86-intel-vbtn-fix-return-value-check-in-ch.patch +arm-dts-gose-fix-ports-node-name-for-adv7180.patch +arm-dts-gose-fix-ports-node-name-for-adv7612.patch +arm-at91-pm-add-missing-put_device-call-in-at91_pm_s.patch +arm-dts-sunxi-bananapi-m2-plus-v1.2-add-regulator-su.patch +arm-dts-sunxi-bananapi-m2-plus-v1.2-fix-cpu-supply-v.patch +spi-lantiq-fix-rx-overflow-error-in-full-duplex-mode.patch +tpm-require-that-all-digests-are-present-in-tcg_pcr_.patch +recordmcount-only-record-relocation-of-type-r_aarch6.patch +regulator-fix-memory-leak-on-error-path-of-regulator.patch +io_uring-fix-sq-array-offset-calculation.patch +spi-rockchip-fix-error-in-spi-slave-pio-read.patch +arm-socfpga-pm-add-missing-put_device-call-in-socfpg.patch +iocost-fix-check-condition-of-iocg-abs_vdebt.patch +irqchip-ti-sci-inta-fix-return-value-about-devm_iore.patch +seccomp-fix-ioctl-number-for-seccomp_ioctl_notif_id_.patch +md-raid0-linear-fix-dereference-before-null-check-on.patch +nvme-tcp-fix-controller-reset-hang-during-traffic.patch +nvme-rdma-fix-controller-reset-hang-during-traffic.patch +nvme-multipath-fix-logic-for-non-optimized-paths.patch +nvme-multipath-do-not-fall-back-to-__nvme_find_path-.patch +drm-tilcdc-fix-leak-null-ref-in-panel_connector_get_.patch +soc-qcom-rpmh-rsc-set-suppress_bind_attrs-flag.patch +bluetooth-add-a-mutex-lock-to-avoid-uaf-in-do_enale_.patch +loop-be-paranoid-on-exit-and-prevent-new-additions-r.patch +fs-btrfs-add-cond_resched-for-try_release_extent_map.patch +drm-amdgpu-avoid-dereferencing-a-null-pointer.patch +drm-radeon-fix-reference-count-leaks-caused-by-pm_ru.patch +crypto-aesni-fix-build-with-llvm_ias-1.patch +video-fbdev-savage-fix-memory-leak-on-error-handling.patch +video-fbdev-neofb-fix-memory-leak-in-neo_scan_monito.patch +bus-ti-sysc-add-missing-quirk-flags-for-usb_host_hs.patch +md-cluster-fix-wild-pointer-of-unlock_all_bitmaps.patch +drm-nouveau-kms-nv50-fix-disabling-dithering.patch +arm64-dts-hisilicon-hikey-fixes-to-comply-with-adi-a.patch +drm-etnaviv-fix-ref-count-leak-via-pm_runtime_get_sy.patch +drm-nouveau-fix-reference-count-leak-in-nouveau_debu.patch +drm-nouveau-fix-multiple-instances-of-reference-coun.patch +mmc-sdhci-cadence-do-not-use-hardware-tuning-for-sd-.patch +btrfs-fix-lockdep-splat-from-btrfs_dump_space_info.patch +usb-mtu3-clear-dual-mode-of-u3port-when-disable-devi.patch +drm-msm-a6xx-fix-gpu-failure-after-system-resume.patch +drm-msm-fix-a-null-pointer-access-in-msm_gem_shrinke.patch +drm-debugfs-fix-plain-echo-to-connector-force-attrib.patch +drm-radeon-disable-agp-by-default.patch +irqchip-irq-mtk-sysirq-replace-spinlock-with-raw_spi.patch +mm-mmap.c-add-cond_resched-for-exit_mmap-cpu-stalls.patch +drm-amdgpu-display-bail-early-in-dm_pp_get_static_cl.patch +drm-amd-powerplay-fix-compile-error-with-arch-arc.patch +bpf-fix-fds_example-sigsegv-error.patch +brcmfmac-keep-sdio-watchdog-running-when-console_int.patch +brcmfmac-to-fix-bss-info-flag-definition-bug.patch +brcmfmac-set-state-of-hanger-slot-to-free-when-flush.patch +platform-x86-asus-nb-wmi-add-support-for-asus-rog-ze.patch +iwlegacy-check-the-return-value-of-pcie_capability_r.patch +gpu-host1x-debug-fix-multiple-channels-emitting-mess.patch +ionic-update-eid-test-for-overflow.patch +mmc-sdhci-pci-o2micro-bug-fix-for-o2-host-controller.patch +usb-gadget-net2280-fix-memory-leak-on-probe-error-ha.patch +bdc-fix-bug-causing-crash-after-multiple-disconnects.patch +usb-bdc-halt-controller-on-suspend.patch +dyndbg-fix-a-bug_on-in-ddebug_describe_flags.patch +bcache-fix-super-block-seq-numbers-comparision-in-re.patch +acpica-do-not-increment-operation_region-reference-c.patch +drm-msm-ratelimit-crtc-event-overflow-error.patch +drm-gem-fix-a-leak-in-drm_gem_objects_lookup.patch +drm-bridge-ti-sn65dsi86-clear-old-error-bits-before-.patch +agp-intel-fix-a-memory-leak-on-module-initialisation.patch +mwifiex-fix-firmware-filename-for-sd8977-chipset.patch +mwifiex-fix-firmware-filename-for-sd8997-chipset.patch +btmrvl-fix-firmware-filename-for-sd8977-chipset.patch +btmrvl-fix-firmware-filename-for-sd8997-chipset.patch +video-fbdev-sm712fb-fix-an-issue-about-iounmap-for-a.patch +console-newport_con-fix-an-issue-about-leak-related-.patch +video-pxafb-fix-the-function-used-to-balance-a-dma_a.patch +ath10k-acquire-tx_lock-in-tx-error-paths.patch +iio-improve-iio_concentration-channel-type-descripti.patch +drm-etnaviv-fix-error-path-on-failure-to-enable-bus-.patch +drm-arm-fix-unintentional-integer-overflow-on-left-s.patch +clk-bcm63xx-gate-fix-last-clock-availability.patch +leds-lm355x-avoid-enum-conversion-warning.patch +bluetooth-btusb-fix-up-firmware-download-sequence.patch +bluetooth-btmtksdio-fix-up-firmware-download-sequenc.patch +media-cxusb-analog-fix-v4l2-dependency.patch +media-marvell-ccic-add-missed-v4l2_async_notifier_cl.patch +media-omap3isp-add-missed-v4l2_ctrl_handler_free-for.patch +asoc-sof-nocodec-add-missing-.owner-field.patch +asoc-intel-bxt_rt298-add-missing-.owner-field.patch +scsi-cumana_2-fix-different-dev_id-between-request_i.patch +drm-mipi-use-dcs-write-for-mipi_dsi_dcs_set_tear_sca.patch +cxl-fix-kobject-memleak.patch +drm-radeon-fix-array-out-of-bounds-read-and-write-is.patch +staging-vchiq_arm-add-a-matching-unregister-call.patch +iavf-fix-error-return-code-in-iavf_init_get_resource.patch +iavf-fix-updating-statistics.patch +rdma-core-fix-bogus-warn_on-during-ib_unregister_dev.patch +scsi-powertec-fix-different-dev_id-between-request_i.patch +scsi-eesox-fix-different-dev_id-between-request_irq-.patch +ipvs-allow-connection-reuse-for-unconfirmed-conntrac.patch +media-firewire-using-uninitialized-values-in-node_pr.patch +media-exynos4-is-add-missed-check-for-pinctrl_lookup.patch +media-cros-ec-cec-do-not-bail-on-device_init_wakeup-.patch +xfs-don-t-eat-an-eio-enospc-writeback-error-when-scr.patch +xfs-fix-reflink-quota-reservation-accounting-error.patch +iomap-make-sure-iomap_end-is-called-after-iomap_begi.patch +rdma-rxe-skip-dgid-check-in-loopback-mode.patch +pci-fix-pci_cfg_wait-queue-locking-problem.patch +drm-stm-repair-runtime-power-management.patch +kobject-avoid-premature-parent-object-freeing-in-kob.patch +leds-core-flush-scheduled-work-for-system-suspend.patch +drm-panel-simple-fix-bpc-for-lg-lb070wv8-panel.patch +phy-exynos5-usbdrd-calibrating-makes-sense-only-for-.patch +drm-bridge-sil_sii8620-initialize-return-of-sii8620_.patch +scsi-scsi_debug-add-check-for-sdebug_max_queue-durin.patch +mwifiex-prevent-memory-corruption-handling-keys.patch +kernfs-do-not-call-fsnotify-with-name-without-a-pare.patch +powerpc-rtas-don-t-online-cpus-for-partition-suspend.patch +powerpc-vdso-fix-vdso-cpu-truncation.patch +rdma-qedr-srq-s-bug-fixes.patch +rdma-rxe-prevent-access-to-wr-next-ptr-afrer-wr-is-p.patch +ima-have-the-lsm-free-its-audit-rule.patch +staging-rtl8192u-fix-a-dubious-looking-mask-before-a.patch +asoc-meson-fixes-the-missed-kfree-for-axg_card_add_t.patch +pci-aspm-add-missing-newline-in-sysfs-policy.patch +phy-renesas-rcar-gen3-usb2-move-irq-registration-to-.patch +powerpc-book3s64-pkeys-use-pvr-check-instead-of-cpu-.patch +drm-imx-fix-use-after-free.patch +drm-imx-tve-fix-regulator_disable-error-path.patch +gpu-ipu-v3-restore-rgb32-bgr32.patch +spi-lantiq-ssc-fix-warning-by-using-wq_mem_reclaim.patch +usb-serial-iuu_phoenix-fix-led-activity-helpers.patch +usb-core-fix-quirks_param_set-writing-to-a-const-poi.patch +thermal-ti-soc-thermal-fix-reversed-condition-in-ti_.patch +coresight-tmc-fix-tmc-mode-read-in-tmc_read_unprepar.patch +powerpc-perf-fix-missing-is_sier_aviable-during-buil.patch +mt76-mt7615-fix-potential-memory-leak-in-mcu-message.patch +phy-armada-38x-fix-neta-lockup-when-repeatedly-switc.patch +mips-octeon-add-missing-put_device-call-in-dwc3_octe.patch +usb-dwc2-fix-error-path-in-gadget-registration.patch +usb-gadget-f_uac2-fix-ac-interface-header-descriptor.patch +scsi-megaraid_sas-clear-affinity-hint.patch +scsi-mesh-fix-panic-after-host-or-bus-reset.patch +net-dsa-mv88e6xxx-mv88e6097-does-not-support-jumbo-c.patch +macintosh-via-macii-access-autopoll_devs-when-inside.patch +pci-cadence-fix-updating-vendor-id-and-subsystem-ven.patch +rdma-core-fix-return-error-value-in-_ib_modify_qp-to.patch +smack-fix-another-vsscanf-out-of-bounds.patch +smack-prevent-underflow-in-smk_set_cipso.patch +power-supply-check-if-calc_soc-succeeded-in-pm860x_i.patch +bluetooth-hci_h5-set-hci_uart_reset_on_init-to-corre.patch +bluetooth-hci_serdev-only-unregister-device-if-it-wa.patch +net-dsa-rtl8366-fix-vlan-semantics.patch +net-dsa-rtl8366-fix-vlan-set-up.patch +xfs-fix-inode-allocation-block-res-calculation-prece.patch +selftests-powerpc-squash-spurious-errors-due-to-devi.patch +powerpc-32s-fix-config_book3s_601-uses.patch +powerpc-boot-fix-config_ppc_mpc52xx-references.patch +selftests-powerpc-fix-cpu-affinity-for-child-process.patch +rdma-netlink-remove-cap_net_raw-check-when-dump-a-ra.patch +pci-release-ivrs-table-in-amd-acs-quirk.patch +cpufreq-ap806-fix-cpufreq-driver-needs-ap-cpu-clk.patch +selftests-powerpc-fix-online-cpu-selection.patch +asoc-meson-axg-tdm-interface-fix-link-fmt-setup.patch +asoc-meson-axg-tdmin-fix-g12a-skew.patch +asoc-meson-axg-tdm-formatters-fix-sclk-inversion.patch +asoc-fsl_sai-fix-value-of-fsl_sai_cr1_rfw_mask.patch +s390-qeth-don-t-process-empty-bridge-port-events.patch +ice-graceful-error-handling-in-hw-table-calloc-failu.patch +rtw88-fix-ldpc-field-for-ra-info.patch +rtw88-fix-short-gi-capability-based-on-current-bandw.patch +rtw88-coex-only-skip-coex-triggered-by-bt-info.patch +wl1251-fix-always-return-0-error.patch +tools-build-propagate-build-failures-from-tools-buil.patch +tools-bpftool-fix-wrong-return-value-in-do_dump.patch +net-mlx5-dr-change-push-vlan-action-sequence.patch +net-mlx5-delete-extra-dump-stack-that-gives-nothing.patch +net-ethernet-aquantia-fix-wrong-return-value.patch +liquidio-fix-wrong-return-value-in-cn23xx_get_pf_num.patch +net-spider_net-fix-the-size-used-in-a-dma_free_coher.patch +fsl-fman-use-32-bit-unsigned-integer.patch +fsl-fman-fix-dereference-null-return-value.patch +fsl-fman-fix-unreachable-code.patch +fsl-fman-check-dereferencing-null-pointer.patch +fsl-fman-fix-eth-hash-table-allocation.patch +net-thunderx-initialize-vf-s-mailbox-mutex-before-fi.patch +dlm-fix-kobject-memleak.patch +ocfs2-fix-unbalanced-locking.patch +pinctrl-single-fix-pcs_parse_pinconf-return-value.patch +svcrdma-fix-page-leak-in-svc_rdma_recv_read_chunk.patch +sunrpc-fix-sunrpc-add-len-parameter-to-gss_unwrap.patch diff --git a/queue-5.4/smack-fix-another-vsscanf-out-of-bounds.patch b/queue-5.4/smack-fix-another-vsscanf-out-of-bounds.patch new file mode 100644 index 00000000000..cbb294db0e4 --- /dev/null +++ b/queue-5.4/smack-fix-another-vsscanf-out-of-bounds.patch @@ -0,0 +1,39 @@ +From 13d171f208b0ea2dfcf49ee6164c3cb8aafe1e0a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 23 Jul 2020 18:22:19 +0300 +Subject: Smack: fix another vsscanf out of bounds + +From: Dan Carpenter + +[ Upstream commit a6bd4f6d9b07452b0b19842044a6c3ea384b0b88 ] + +This is similar to commit 84e99e58e8d1 ("Smack: slab-out-of-bounds in +vsscanf") where we added a bounds check on "rule". + +Reported-by: syzbot+a22c6092d003d6fe1122@syzkaller.appspotmail.com +Fixes: f7112e6c9abf ("Smack: allow for significantly longer Smack labels v4") +Signed-off-by: Dan Carpenter +Signed-off-by: Casey Schaufler +Signed-off-by: Sasha Levin +--- + security/smack/smackfs.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c +index 840a192e93370..2bae1fc493d16 100644 +--- a/security/smack/smackfs.c ++++ b/security/smack/smackfs.c +@@ -905,6 +905,10 @@ static ssize_t smk_set_cipso(struct file *file, const char __user *buf, + + for (i = 0; i < catlen; i++) { + rule += SMK_DIGITLEN; ++ if (rule > data + count) { ++ rc = -EOVERFLOW; ++ goto out; ++ } + ret = sscanf(rule, "%u", &cat); + if (ret != 1 || cat > SMACK_CIPSO_MAXCATNUM) + goto out; +-- +2.25.1 + diff --git a/queue-5.4/smack-prevent-underflow-in-smk_set_cipso.patch b/queue-5.4/smack-prevent-underflow-in-smk_set_cipso.patch new file mode 100644 index 00000000000..32be89fe641 --- /dev/null +++ b/queue-5.4/smack-prevent-underflow-in-smk_set_cipso.patch @@ -0,0 +1,36 @@ +From 86936fb98ce9762f08984090005b43d4e2d0bd8d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 23 Jul 2020 18:23:05 +0300 +Subject: Smack: prevent underflow in smk_set_cipso() + +From: Dan Carpenter + +[ Upstream commit 42a2df3e829f3c5562090391b33714b2e2e5ad4a ] + +We have an upper bound on "maplevel" but forgot to check for negative +values. + +Fixes: e114e473771c ("Smack: Simplified Mandatory Access Control Kernel") +Signed-off-by: Dan Carpenter +Signed-off-by: Casey Schaufler +Signed-off-by: Sasha Levin +--- + security/smack/smackfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c +index 2bae1fc493d16..9c4308077574c 100644 +--- a/security/smack/smackfs.c ++++ b/security/smack/smackfs.c +@@ -884,7 +884,7 @@ static ssize_t smk_set_cipso(struct file *file, const char __user *buf, + } + + ret = sscanf(rule, "%d", &maplevel); +- if (ret != 1 || maplevel > SMACK_CIPSO_MAXLEVEL) ++ if (ret != 1 || maplevel < 0 || maplevel > SMACK_CIPSO_MAXLEVEL) + goto out; + + rule += SMK_DIGITLEN; +-- +2.25.1 + diff --git a/queue-5.4/soc-qcom-rpmh-rsc-set-suppress_bind_attrs-flag.patch b/queue-5.4/soc-qcom-rpmh-rsc-set-suppress_bind_attrs-flag.patch new file mode 100644 index 00000000000..9702d6a6fc0 --- /dev/null +++ b/queue-5.4/soc-qcom-rpmh-rsc-set-suppress_bind_attrs-flag.patch @@ -0,0 +1,41 @@ +From a69230e8d163647953fc75eaa2459797bc7a4da4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 22 Jun 2020 12:23:25 +0530 +Subject: soc: qcom: rpmh-rsc: Set suppress_bind_attrs flag + +From: Maulik Shah + +[ Upstream commit 1a53ce9ab4faeb841b33d62d23283dc76c0e7c5a ] + +rpmh-rsc driver is fairly core to system and should not be removable +once its probed. However it allows to unbind driver from sysfs using +below command which results into a crash on sc7180. + +echo 18200000.rsc > /sys/bus/platform/drivers/rpmh/unbind + +Lets prevent unbind at runtime by setting suppress_bind_attrs flag. + +Reviewed-by: Stephen Boyd +Signed-off-by: Maulik Shah +Link: https://lore.kernel.org/r/1592808805-2437-1-git-send-email-mkshah@codeaurora.org +Signed-off-by: Bjorn Andersson +Signed-off-by: Sasha Levin +--- + drivers/soc/qcom/rpmh-rsc.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/soc/qcom/rpmh-rsc.c b/drivers/soc/qcom/rpmh-rsc.c +index 0ba1f465db122..8924fcd9f5f59 100644 +--- a/drivers/soc/qcom/rpmh-rsc.c ++++ b/drivers/soc/qcom/rpmh-rsc.c +@@ -715,6 +715,7 @@ static struct platform_driver rpmh_driver = { + .driver = { + .name = "rpmh", + .of_match_table = rpmh_drv_match, ++ .suppress_bind_attrs = true, + }, + }; + +-- +2.25.1 + diff --git a/queue-5.4/spi-lantiq-fix-rx-overflow-error-in-full-duplex-mode.patch b/queue-5.4/spi-lantiq-fix-rx-overflow-error-in-full-duplex-mode.patch new file mode 100644 index 00000000000..f751540fa8f --- /dev/null +++ b/queue-5.4/spi-lantiq-fix-rx-overflow-error-in-full-duplex-mode.patch @@ -0,0 +1,66 @@ +From a3a6c354d80c1381aa1fb90403eea25b6b58e4d2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 17 Jul 2020 14:27:50 +0800 +Subject: spi: lantiq: fix: Rx overflow error in full duplex mode + +From: Dilip Kota + +[ Upstream commit 661ccf2b3f1360be50242726f7c26ced6a9e7d52 ] + +In full duplex mode, rx overflow error is observed. To overcome the error, +wait until the complete data got received and proceed further. + +Fixes: 17f84b793c01 ("spi: lantiq-ssc: add support for Lantiq SSC SPI controller") +Signed-off-by: Dilip Kota +Link: https://lore.kernel.org/r/efb650b0faa49a00788c4e0ca8ef7196bdba851d.1594957019.git.eswara.kota@linux.intel.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + drivers/spi/spi-lantiq-ssc.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/drivers/spi/spi-lantiq-ssc.c b/drivers/spi/spi-lantiq-ssc.c +index 9dfe8b04e6880..55394bdbc5a30 100644 +--- a/drivers/spi/spi-lantiq-ssc.c ++++ b/drivers/spi/spi-lantiq-ssc.c +@@ -184,6 +184,7 @@ struct lantiq_ssc_spi { + unsigned int tx_fifo_size; + unsigned int rx_fifo_size; + unsigned int base_cs; ++ unsigned int fdx_tx_level; + }; + + static u32 lantiq_ssc_readl(const struct lantiq_ssc_spi *spi, u32 reg) +@@ -481,6 +482,7 @@ static void tx_fifo_write(struct lantiq_ssc_spi *spi) + u32 data; + unsigned int tx_free = tx_fifo_free(spi); + ++ spi->fdx_tx_level = 0; + while (spi->tx_todo && tx_free) { + switch (spi->bits_per_word) { + case 2 ... 8: +@@ -509,6 +511,7 @@ static void tx_fifo_write(struct lantiq_ssc_spi *spi) + + lantiq_ssc_writel(spi, data, LTQ_SPI_TB); + tx_free--; ++ spi->fdx_tx_level++; + } + } + +@@ -520,6 +523,13 @@ static void rx_fifo_read_full_duplex(struct lantiq_ssc_spi *spi) + u32 data; + unsigned int rx_fill = rx_fifo_level(spi); + ++ /* ++ * Wait until all expected data to be shifted in. ++ * Otherwise, rx overrun may occur. ++ */ ++ while (rx_fill != spi->fdx_tx_level) ++ rx_fill = rx_fifo_level(spi); ++ + while (rx_fill) { + data = lantiq_ssc_readl(spi, LTQ_SPI_RB); + +-- +2.25.1 + diff --git a/queue-5.4/spi-lantiq-ssc-fix-warning-by-using-wq_mem_reclaim.patch b/queue-5.4/spi-lantiq-ssc-fix-warning-by-using-wq_mem_reclaim.patch new file mode 100644 index 00000000000..36f3a9408d8 --- /dev/null +++ b/queue-5.4/spi-lantiq-ssc-fix-warning-by-using-wq_mem_reclaim.patch @@ -0,0 +1,47 @@ +From dcaf4f601c95f310d05f6ca9a3a4253fee02c09f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 17 Jul 2020 23:56:48 +0200 +Subject: spi: lantiq-ssc: Fix warning by using WQ_MEM_RECLAIM + +From: Hauke Mehrtens + +[ Upstream commit ba3548cf29616b58c93bbaffc3d636898d009858 ] + +The lantiq-ssc driver uses internally an own workqueue to wait till the +data is not only written out of the FIFO but really written to the wire. +This workqueue is flushed while the SPI subsystem is working in some +other system workqueue. + +The system workqueue is marked as WQ_MEM_RECLAIM, but the workqueue in +the lantiq-ssc driver does not use WQ_MEM_RECLAIM for now. Add this flag +too to prevent this warning. + +This fixes the following warning: +[ 2.975956] WARNING: CPU: 1 PID: 17 at kernel/workqueue.c:2614 check_flush_dependency+0x168/0x184 +[ 2.984752] workqueue: WQ_MEM_RECLAIM kblockd:blk_mq_run_work_fn is flushing !WQ_MEM_RECLAIM 1e100800.spi:0x0 + +Fixes: 891b7c5fbf61 ("mtd_blkdevs: convert to blk-mq") +Signed-off-by: Hauke Mehrtens +Link: https://lore.kernel.org/r/20200717215648.20522-1-hauke@hauke-m.de +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + drivers/spi/spi-lantiq-ssc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/spi/spi-lantiq-ssc.c b/drivers/spi/spi-lantiq-ssc.c +index 55394bdbc5a30..f9bc1705c0d4d 100644 +--- a/drivers/spi/spi-lantiq-ssc.c ++++ b/drivers/spi/spi-lantiq-ssc.c +@@ -917,7 +917,7 @@ static int lantiq_ssc_probe(struct platform_device *pdev) + master->bits_per_word_mask = SPI_BPW_RANGE_MASK(2, 8) | + SPI_BPW_MASK(16) | SPI_BPW_MASK(32); + +- spi->wq = alloc_ordered_workqueue(dev_name(dev), 0); ++ spi->wq = alloc_ordered_workqueue(dev_name(dev), WQ_MEM_RECLAIM); + if (!spi->wq) { + err = -ENOMEM; + goto err_clk_put; +-- +2.25.1 + diff --git a/queue-5.4/spi-rockchip-fix-error-in-spi-slave-pio-read.patch b/queue-5.4/spi-rockchip-fix-error-in-spi-slave-pio-read.patch new file mode 100644 index 00000000000..35c5ed5d51c --- /dev/null +++ b/queue-5.4/spi-rockchip-fix-error-in-spi-slave-pio-read.patch @@ -0,0 +1,39 @@ +From e7ae0da17a1c726e93e3a1cb858b30dbd20cc58a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 23 Jul 2020 08:43:56 +0800 +Subject: spi: rockchip: Fix error in SPI slave pio read + +From: Jon Lin + +[ Upstream commit 4294e4accf8d695ea5605f6b189008b692e3e82c ] + +The RXFLR is possible larger than rx_left in Rockchip SPI, fix it. + +Fixes: 01b59ce5dac8 ("spi: rockchip: use irq rather than polling") +Signed-off-by: Jon Lin +Tested-by: Emil Renner Berthing +Reviewed-by: Heiko Stuebner +Reviewed-by: Emil Renner Berthing +Link: https://lore.kernel.org/r/20200723004356.6390-3-jon.lin@rock-chips.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + drivers/spi/spi-rockchip.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c +index 2cc6d9951b52e..008b64f4e031a 100644 +--- a/drivers/spi/spi-rockchip.c ++++ b/drivers/spi/spi-rockchip.c +@@ -286,7 +286,7 @@ static void rockchip_spi_pio_writer(struct rockchip_spi *rs) + static void rockchip_spi_pio_reader(struct rockchip_spi *rs) + { + u32 words = readl_relaxed(rs->regs + ROCKCHIP_SPI_RXFLR); +- u32 rx_left = rs->rx_left - words; ++ u32 rx_left = (rs->rx_left > words) ? rs->rx_left - words : 0; + + /* the hardware doesn't allow us to change fifo threshold + * level while spi is enabled, so instead make sure to leave +-- +2.25.1 + diff --git a/queue-5.4/staging-rtl8192u-fix-a-dubious-looking-mask-before-a.patch b/queue-5.4/staging-rtl8192u-fix-a-dubious-looking-mask-before-a.patch new file mode 100644 index 00000000000..05c4a454a89 --- /dev/null +++ b/queue-5.4/staging-rtl8192u-fix-a-dubious-looking-mask-before-a.patch @@ -0,0 +1,42 @@ +From b7e2e7e9e106ab93a1e932671673fa82427ff48a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 16 Jul 2020 16:47:20 +0100 +Subject: staging: rtl8192u: fix a dubious looking mask before a shift + +From: Colin Ian King + +[ Upstream commit c4283950a9a4d3bf4a3f362e406c80ab14f10714 ] + +Currently the masking of ret with 0xff and followed by a right shift +of 8 bits always leaves a zero result. It appears the mask of 0xff +is incorrect and should be 0xff00, but I don't have the hardware to +test this. Fix this to mask the upper 8 bits before shifting. + +[ Not tested ] + +Addresses-Coverity: ("Operands don't affect result") +Fixes: 8fc8598e61f6 ("Staging: Added Realtek rtl8192u driver to staging") +Signed-off-by: Colin Ian King +Link: https://lore.kernel.org/r/20200716154720.1710252-1-colin.king@canonical.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/staging/rtl8192u/r8192U_core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c +index 511136dce3a4c..ddc09616248a5 100644 +--- a/drivers/staging/rtl8192u/r8192U_core.c ++++ b/drivers/staging/rtl8192u/r8192U_core.c +@@ -2401,7 +2401,7 @@ static int rtl8192_read_eeprom_info(struct net_device *dev) + ret = eprom_read(dev, (EEPROM_TX_PW_INDEX_CCK >> 1)); + if (ret < 0) + return ret; +- priv->EEPROMTxPowerLevelCCK = ((u16)ret & 0xff) >> 8; ++ priv->EEPROMTxPowerLevelCCK = ((u16)ret & 0xff00) >> 8; + } else + priv->EEPROMTxPowerLevelCCK = 0x10; + RT_TRACE(COMP_EPROM, "CCK Tx Power Levl: 0x%02x\n", priv->EEPROMTxPowerLevelCCK); +-- +2.25.1 + diff --git a/queue-5.4/staging-vchiq_arm-add-a-matching-unregister-call.patch b/queue-5.4/staging-vchiq_arm-add-a-matching-unregister-call.patch new file mode 100644 index 00000000000..756e5400d60 --- /dev/null +++ b/queue-5.4/staging-vchiq_arm-add-a-matching-unregister-call.patch @@ -0,0 +1,39 @@ +From 174f15a669b45223d3411ee3d5fe951d96490fd6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 29 Jun 2020 17:09:06 +0200 +Subject: staging: vchiq_arm: Add a matching unregister call + +From: Phil Elwell + +[ Upstream commit 5d9272e28a9a6117fb63f5f930991304765caa32 ] + +All the registered children of vchiq have a corresponding call to +platform_device_unregister except bcm2835_audio. Fix that. + +Fixes: 25c7597af20d ("staging: vchiq_arm: Register a platform device for audio") + +Signed-off-by: Phil Elwell +Signed-off-by: Jacopo Mondi +Signed-off-by: Nicolas Saenz Julienne +Link: https://lore.kernel.org/r/20200629150945.10720-9-nsaenzjulienne@suse.de +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +index af6bf0736b527..eb76cc2cbfd8c 100644 +--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c ++++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +@@ -3257,6 +3257,7 @@ static int vchiq_probe(struct platform_device *pdev) + + static int vchiq_remove(struct platform_device *pdev) + { ++ platform_device_unregister(bcm2835_audio); + platform_device_unregister(bcm2835_camera); + vchiq_debugfs_deinit(); + device_destroy(vchiq_class, vchiq_devid); +-- +2.25.1 + diff --git a/queue-5.4/sunrpc-fix-sunrpc-add-len-parameter-to-gss_unwrap.patch b/queue-5.4/sunrpc-fix-sunrpc-add-len-parameter-to-gss_unwrap.patch new file mode 100644 index 00000000000..71d83c553a8 --- /dev/null +++ b/queue-5.4/sunrpc-fix-sunrpc-add-len-parameter-to-gss_unwrap.patch @@ -0,0 +1,61 @@ +From 84bd178b93c5dd8e856f8cd3266e7c1641eab81c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 24 Jul 2020 17:08:57 -0400 +Subject: SUNRPC: Fix ("SUNRPC: Add "@len" parameter to gss_unwrap()") + +From: Chuck Lever + +[ Upstream commit 986a4b63d3bc5f2c0eb4083b05aff2bf883b7b2f ] + +Braino when converting "buf->len -=" to "buf->len = len -". + +The result is under-estimation of the ralign and rslack values. On +krb5p mounts, this has caused READDIR to fail with EIO, and KASAN +splats when decoding READLINK replies. + +As a result of fixing this oversight, the gss_unwrap method now +returns a buf->len that can be shorter than priv_len for small +RPC messages. The additional adjustment done in unwrap_priv_data() +can underflow buf->len. This causes the nfsd_request_too_large +check to fail during some NFSv3 operations. + +Reported-by: Marian Rainer-Harbach +Reported-by: Pierre Sauter +BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1886277 +Fixes: 31c9590ae468 ("SUNRPC: Add "@len" parameter to gss_unwrap()") +Reviewed-by: J. Bruce Fields +Signed-off-by: Chuck Lever +Signed-off-by: Sasha Levin +--- + net/sunrpc/auth_gss/gss_krb5_wrap.c | 2 +- + net/sunrpc/auth_gss/svcauth_gss.c | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/net/sunrpc/auth_gss/gss_krb5_wrap.c b/net/sunrpc/auth_gss/gss_krb5_wrap.c +index 683755d950758..78ad416569969 100644 +--- a/net/sunrpc/auth_gss/gss_krb5_wrap.c ++++ b/net/sunrpc/auth_gss/gss_krb5_wrap.c +@@ -584,7 +584,7 @@ gss_unwrap_kerberos_v2(struct krb5_ctx *kctx, int offset, int len, + buf->head[0].iov_len); + memmove(ptr, ptr + GSS_KRB5_TOK_HDR_LEN + headskip, movelen); + buf->head[0].iov_len -= GSS_KRB5_TOK_HDR_LEN + headskip; +- buf->len = len - GSS_KRB5_TOK_HDR_LEN + headskip; ++ buf->len = len - (GSS_KRB5_TOK_HDR_LEN + headskip); + + /* Trim off the trailing "extra count" and checksum blob */ + xdr_buf_trim(buf, ec + GSS_KRB5_TOK_HDR_LEN + tailskip); +diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c +index fd91274e834d6..3645cd241d3ea 100644 +--- a/net/sunrpc/auth_gss/svcauth_gss.c ++++ b/net/sunrpc/auth_gss/svcauth_gss.c +@@ -949,7 +949,6 @@ unwrap_priv_data(struct svc_rqst *rqstp, struct xdr_buf *buf, u32 seq, struct gs + + maj_stat = gss_unwrap(ctx, 0, priv_len, buf); + pad = priv_len - buf->len; +- buf->len -= pad; + /* The upper layers assume the buffer is aligned on 4-byte boundaries. + * In the krb5p case, at least, the data ends up offset, so we need to + * move it around. */ +-- +2.25.1 + diff --git a/queue-5.4/svcrdma-fix-page-leak-in-svc_rdma_recv_read_chunk.patch b/queue-5.4/svcrdma-fix-page-leak-in-svc_rdma_recv_read_chunk.patch new file mode 100644 index 00000000000..1cd6d095dae --- /dev/null +++ b/queue-5.4/svcrdma-fix-page-leak-in-svc_rdma_recv_read_chunk.patch @@ -0,0 +1,84 @@ +From 885834d50e92c771242316216c605c4fc42c6071 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 11 Jun 2020 12:44:56 -0400 +Subject: svcrdma: Fix page leak in svc_rdma_recv_read_chunk() + +From: Chuck Lever + +[ Upstream commit e814eecbe3bbeaa8b004d25a4b8974d232b765a9 ] + +Commit 07d0ff3b0cd2 ("svcrdma: Clean up Read chunk path") moved the +page saver logic so that it gets executed event when an error occurs. +In that case, the I/O is never posted, and those pages are then +leaked. Errors in this path, however, are quite rare. + +Fixes: 07d0ff3b0cd2 ("svcrdma: Clean up Read chunk path") +Signed-off-by: Chuck Lever +Signed-off-by: Sasha Levin +--- + net/sunrpc/xprtrdma/svc_rdma_rw.c | 28 +++++++++++++++++++++------- + 1 file changed, 21 insertions(+), 7 deletions(-) + +diff --git a/net/sunrpc/xprtrdma/svc_rdma_rw.c b/net/sunrpc/xprtrdma/svc_rdma_rw.c +index 066af6b2eb012..0bb3f0dca80d6 100644 +--- a/net/sunrpc/xprtrdma/svc_rdma_rw.c ++++ b/net/sunrpc/xprtrdma/svc_rdma_rw.c +@@ -677,7 +677,6 @@ static int svc_rdma_build_read_chunk(struct svc_rqst *rqstp, + struct svc_rdma_read_info *info, + __be32 *p) + { +- unsigned int i; + int ret; + + ret = -EINVAL; +@@ -700,12 +699,6 @@ static int svc_rdma_build_read_chunk(struct svc_rqst *rqstp, + info->ri_chunklen += rs_length; + } + +- /* Pages under I/O have been copied to head->rc_pages. +- * Prevent their premature release by svc_xprt_release() . +- */ +- for (i = 0; i < info->ri_readctxt->rc_page_count; i++) +- rqstp->rq_pages[i] = NULL; +- + return ret; + } + +@@ -800,6 +793,26 @@ static int svc_rdma_build_pz_read_chunk(struct svc_rqst *rqstp, + return ret; + } + ++/* Pages under I/O have been copied to head->rc_pages. Ensure they ++ * are not released by svc_xprt_release() until the I/O is complete. ++ * ++ * This has to be done after all Read WRs are constructed to properly ++ * handle a page that is part of I/O on behalf of two different RDMA ++ * segments. ++ * ++ * Do this only if I/O has been posted. Otherwise, we do indeed want ++ * svc_xprt_release() to clean things up properly. ++ */ ++static void svc_rdma_save_io_pages(struct svc_rqst *rqstp, ++ const unsigned int start, ++ const unsigned int num_pages) ++{ ++ unsigned int i; ++ ++ for (i = start; i < num_pages + start; i++) ++ rqstp->rq_pages[i] = NULL; ++} ++ + /** + * svc_rdma_recv_read_chunk - Pull a Read chunk from the client + * @rdma: controlling RDMA transport +@@ -853,6 +866,7 @@ int svc_rdma_recv_read_chunk(struct svcxprt_rdma *rdma, struct svc_rqst *rqstp, + ret = svc_rdma_post_chunk_ctxt(&info->ri_cc); + if (ret < 0) + goto out_err; ++ svc_rdma_save_io_pages(rqstp, 0, head->rc_page_count); + return 0; + + out_err: +-- +2.25.1 + diff --git a/queue-5.4/thermal-ti-soc-thermal-fix-reversed-condition-in-ti_.patch b/queue-5.4/thermal-ti-soc-thermal-fix-reversed-condition-in-ti_.patch new file mode 100644 index 00000000000..5115c09b22a --- /dev/null +++ b/queue-5.4/thermal-ti-soc-thermal-fix-reversed-condition-in-ti_.patch @@ -0,0 +1,37 @@ +From e2565db7474e8c02a8a34a900cbfd4aa52ecc53c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 16 Jun 2020 12:19:49 +0300 +Subject: thermal: ti-soc-thermal: Fix reversed condition in + ti_thermal_expose_sensor() + +From: Dan Carpenter + +[ Upstream commit 0f348db01fdf128813fdd659fcc339038fb421a4 ] + +This condition is reversed and will cause breakage. + +Fixes: 7440f518dad9 ("thermal/drivers/ti-soc-thermal: Avoid dereferencing ERR_PTR") +Signed-off-by: Dan Carpenter +Signed-off-by: Daniel Lezcano +Link: https://lore.kernel.org/r/20200616091949.GA11940@mwanda +Signed-off-by: Sasha Levin +--- + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c +index 85776db4bf346..2ce4b19f312ac 100644 +--- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c ++++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c +@@ -169,7 +169,7 @@ int ti_thermal_expose_sensor(struct ti_bandgap *bgp, int id, + + data = ti_bandgap_get_sensor_data(bgp, id); + +- if (!IS_ERR_OR_NULL(data)) ++ if (IS_ERR_OR_NULL(data)) + data = ti_thermal_build_data(bgp, id); + + if (!data) +-- +2.25.1 + diff --git a/queue-5.4/tools-bpftool-fix-wrong-return-value-in-do_dump.patch b/queue-5.4/tools-bpftool-fix-wrong-return-value-in-do_dump.patch new file mode 100644 index 00000000000..01708390a60 --- /dev/null +++ b/queue-5.4/tools-bpftool-fix-wrong-return-value-in-do_dump.patch @@ -0,0 +1,40 @@ +From d2ea4b72c25125b20500f7029a8641b6e633b407 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 2 Aug 2020 19:15:40 +0800 +Subject: tools, bpftool: Fix wrong return value in do_dump() + +From: Tianjia Zhang + +[ Upstream commit 041549b7b2c7811ec40e705c439211f00ade2dda ] + +In case of btf_id does not exist, a negative error code -ENOENT +should be returned. + +Fixes: c93cc69004df3 ("bpftool: add ability to dump BTF types") +Signed-off-by: Tianjia Zhang +Signed-off-by: Daniel Borkmann +Reviewed-by: Tobias Klauser +Acked-by: Andrii Nakryiko +Acked-by: John Fastabend +Link: https://lore.kernel.org/bpf/20200802111540.5384-1-tianjia.zhang@linux.alibaba.com +Signed-off-by: Sasha Levin +--- + tools/bpf/bpftool/btf.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/bpf/bpftool/btf.c b/tools/bpf/bpftool/btf.c +index 9a9376d1d3df2..66765f970bc51 100644 +--- a/tools/bpf/bpftool/btf.c ++++ b/tools/bpf/bpftool/btf.c +@@ -510,7 +510,7 @@ static int do_dump(int argc, char **argv) + goto done; + } + if (!btf) { +- err = ENOENT; ++ err = -ENOENT; + p_err("can't find btf with ID (%u)", btf_id); + goto done; + } +-- +2.25.1 + diff --git a/queue-5.4/tools-build-propagate-build-failures-from-tools-buil.patch b/queue-5.4/tools-build-propagate-build-failures-from-tools-buil.patch new file mode 100644 index 00000000000..0227cb14077 --- /dev/null +++ b/queue-5.4/tools-build-propagate-build-failures-from-tools-buil.patch @@ -0,0 +1,52 @@ +From deab7059353ccf1ab5c4a4d4f9ff3f5a539c5c03 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 30 Jul 2020 19:42:44 -0700 +Subject: tools, build: Propagate build failures from + tools/build/Makefile.build + +From: Andrii Nakryiko + +[ Upstream commit a278f3d8191228212c553a5d4303fa603214b717 ] + +The '&&' command seems to have a bad effect when $(cmd_$(1)) exits with +non-zero effect: the command failure is masked (despite `set -e`) and all but +the first command of $(dep-cmd) is executed (successfully, as they are mostly +printfs), thus overall returning 0 in the end. + +This means in practice that despite compilation errors, tools's build Makefile +will return success. We see this very reliably with libbpf's Makefile, which +doesn't get compilation error propagated properly. This in turns causes issues +with selftests build, as well as bpftool and other projects that rely on +building libbpf. + +The fix is simple: don't use &&. Given `set -e`, we don't need to chain +commands with &&. The shell will exit on first failure, giving desired +behavior and propagating error properly. + +Fixes: 275e2d95591e ("tools build: Move dependency copy into function") +Signed-off-by: Andrii Nakryiko +Signed-off-by: Daniel Borkmann +Acked-by: Jiri Olsa +Link: https://lore.kernel.org/bpf/20200731024244.872574-1-andriin@fb.com +Signed-off-by: Sasha Levin +--- + tools/build/Build.include | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tools/build/Build.include b/tools/build/Build.include +index 9ec01f4454f9f..585486e40995b 100644 +--- a/tools/build/Build.include ++++ b/tools/build/Build.include +@@ -74,7 +74,8 @@ dep-cmd = $(if $(wildcard $(fixdep)), + # dependencies in the cmd file + if_changed_dep = $(if $(strip $(any-prereq) $(arg-check)), \ + @set -e; \ +- $(echo-cmd) $(cmd_$(1)) && $(dep-cmd)) ++ $(echo-cmd) $(cmd_$(1)); \ ++ $(dep-cmd)) + + # if_changed - execute command if any prerequisite is newer than + # target, or command line has changed +-- +2.25.1 + diff --git a/queue-5.4/tpm-require-that-all-digests-are-present-in-tcg_pcr_.patch b/queue-5.4/tpm-require-that-all-digests-are-present-in-tcg_pcr_.patch new file mode 100644 index 00000000000..29bcdac763b --- /dev/null +++ b/queue-5.4/tpm-require-that-all-digests-are-present-in-tcg_pcr_.patch @@ -0,0 +1,116 @@ +From a2773e90c239272a9f9bed1f6912d04eb69a002c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 10 Jul 2020 14:29:55 -0500 +Subject: tpm: Require that all digests are present in TCG_PCR_EVENT2 + structures + +From: Tyler Hicks + +[ Upstream commit 7f3d176f5f7e3f0477bf82df0f600fcddcdcc4e4 ] + +Require that the TCG_PCR_EVENT2.digests.count value strictly matches the +value of TCG_EfiSpecIdEvent.numberOfAlgorithms in the event field of the +TCG_PCClientPCREvent event log header. Also require that +TCG_EfiSpecIdEvent.numberOfAlgorithms is non-zero. + +The TCG PC Client Platform Firmware Profile Specification section 9.1 +(Family "2.0", Level 00 Revision 1.04) states: + + For each Hash algorithm enumerated in the TCG_PCClientPCREvent entry, + there SHALL be a corresponding digest in all TCG_PCR_EVENT2 structures. + Note: This includes EV_NO_ACTION events which do not extend the PCR. + +Section 9.4.5.1 provides this description of +TCG_EfiSpecIdEvent.numberOfAlgorithms: + + The number of Hash algorithms in the digestSizes field. This field MUST + be set to a value of 0x01 or greater. + +Enforce these restrictions, as required by the above specification, in +order to better identify and ignore invalid sequences of bytes at the +end of an otherwise valid TPM2 event log. Firmware doesn't always have +the means necessary to inform the kernel of the actual event log size so +the kernel's event log parsing code should be stringent when parsing the +event log for resiliency against firmware bugs. This is true, for +example, when firmware passes the event log to the kernel via a reserved +memory region described in device tree. + +POWER and some ARM systems use the "linux,sml-base" and "linux,sml-size" +device tree properties to describe the memory region used to pass the +event log from firmware to the kernel. Unfortunately, the +"linux,sml-size" property describes the size of the entire reserved +memory region rather than the size of the event long within the memory +region and the event log format does not include information describing +the size of the event log. + +tpm_read_log_of(), in drivers/char/tpm/eventlog/of.c, is where the +"linux,sml-size" property is used. At the end of that function, +log->bios_event_log_end is pointing at the end of the reserved memory +region. That's typically 0x10000 bytes offset from "linux,sml-base", +depending on what's defined in the device tree source. + +The firmware event log only fills a portion of those 0x10000 bytes and +the rest of the memory region should be zeroed out by firmware. Even in +the case of a properly zeroed bytes in the remainder of the memory +region, the only thing allowing the kernel's event log parser to detect +the end of the event log is the following conditional in +__calc_tpm2_event_size(): + + if (event_type == 0 && event_field->event_size == 0) + size = 0; + +If that wasn't there, __calc_tpm2_event_size() would think that a 16 +byte sequence of zeroes, following an otherwise valid event log, was +a valid event. + +However, problems can occur if a single bit is set in the offset +corresponding to either the TCG_PCR_EVENT2.eventType or +TCG_PCR_EVENT2.eventSize fields, after the last valid event log entry. +This could confuse the parser into thinking that an additional entry is +present in the event log and exposing this invalid entry to userspace in +the /sys/kernel/security/tpm0/binary_bios_measurements file. Such +problems have been seen if firmware does not fully zero the memory +region upon a warm reboot. + +This patch significantly raises the bar on how difficult it is for +stale/invalid memory to confuse the kernel's event log parser but +there's still, ultimately, a reliance on firmware to properly initialize +the remainder of the memory region reserved for the event log as the +parser cannot be expected to detect a stale but otherwise properly +formatted firmware event log entry. + +Fixes: fd5c78694f3f ("tpm: fix handling of the TPM 2.0 event logs") +Signed-off-by: Tyler Hicks +Reviewed-by: Jarkko Sakkinen +Signed-off-by: Jarkko Sakkinen +Signed-off-by: Sasha Levin +--- + include/linux/tpm_eventlog.h | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/include/linux/tpm_eventlog.h b/include/linux/tpm_eventlog.h +index eccfd3a4e4c85..f3caeeb7a0d03 100644 +--- a/include/linux/tpm_eventlog.h ++++ b/include/linux/tpm_eventlog.h +@@ -211,9 +211,16 @@ static inline int __calc_tpm2_event_size(struct tcg_pcr_event2_head *event, + + efispecid = (struct tcg_efi_specid_event_head *)event_header->event; + +- /* Check if event is malformed. */ ++ /* ++ * Perform validation of the event in order to identify malformed ++ * events. This function may be asked to parse arbitrary byte sequences ++ * immediately following a valid event log. The caller expects this ++ * function to recognize that the byte sequence is not a valid event ++ * and to return an event size of 0. ++ */ + if (memcmp(efispecid->signature, TCG_SPECID_SIG, +- sizeof(TCG_SPECID_SIG)) || count > efispecid->num_algs) { ++ sizeof(TCG_SPECID_SIG)) || ++ !efispecid->num_algs || count != efispecid->num_algs) { + size = 0; + goto out; + } +-- +2.25.1 + diff --git a/queue-5.4/usb-bdc-halt-controller-on-suspend.patch b/queue-5.4/usb-bdc-halt-controller-on-suspend.patch new file mode 100644 index 00000000000..ea727bbeb77 --- /dev/null +++ b/queue-5.4/usb-bdc-halt-controller-on-suspend.patch @@ -0,0 +1,51 @@ +From 3723c122c132b16a1dbf7dae2a9ac9a4f777b2de Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 22 Jul 2020 13:07:45 -0400 +Subject: usb: bdc: Halt controller on suspend + +From: Danesh Petigara + +[ Upstream commit 5fc453d7de3d0c345812453823a3a56783c5f82c ] + +GISB bus error kernel panics have been observed during S2 transition +tests on the 7271t platform. The errors are a result of the BDC +interrupt handler trying to access BDC register space after the +system's suspend callbacks have completed. + +Adding a suspend hook to the BDC driver that halts the controller before +S2 entry thus preventing unwanted access to the BDC register space during +this transition. + +Signed-off-by: Danesh Petigara +Signed-off-by: Al Cooper +Acked-by: Florian Fainelli +Signed-off-by: Felipe Balbi +Signed-off-by: Sasha Levin +--- + drivers/usb/gadget/udc/bdc/bdc_core.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/drivers/usb/gadget/udc/bdc/bdc_core.c b/drivers/usb/gadget/udc/bdc/bdc_core.c +index 174555e94a6c0..3d33499db50b5 100644 +--- a/drivers/usb/gadget/udc/bdc/bdc_core.c ++++ b/drivers/usb/gadget/udc/bdc/bdc_core.c +@@ -605,9 +605,14 @@ static int bdc_remove(struct platform_device *pdev) + static int bdc_suspend(struct device *dev) + { + struct bdc *bdc = dev_get_drvdata(dev); ++ int ret; + +- clk_disable_unprepare(bdc->clk); +- return 0; ++ /* Halt the controller */ ++ ret = bdc_stop(bdc); ++ if (!ret) ++ clk_disable_unprepare(bdc->clk); ++ ++ return ret; + } + + static int bdc_resume(struct device *dev) +-- +2.25.1 + diff --git a/queue-5.4/usb-core-fix-quirks_param_set-writing-to-a-const-poi.patch b/queue-5.4/usb-core-fix-quirks_param_set-writing-to-a-const-poi.patch new file mode 100644 index 00000000000..dcbaae132d9 --- /dev/null +++ b/queue-5.4/usb-core-fix-quirks_param_set-writing-to-a-const-poi.patch @@ -0,0 +1,82 @@ +From 4ce809da50196bc34dc4757dc3be5d136353dc3a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 7 Jul 2020 16:43:50 +0200 +Subject: usb: core: fix quirks_param_set() writing to a const pointer + +From: Kars Mulder + +[ Upstream commit b1b6bed3b5036509b449b5965285d5057ba42527 ] + +The function quirks_param_set() takes as argument a const char* pointer +to the new value of the usbcore.quirks parameter. It then casts this +pointer to a non-const char* pointer and passes it to the strsep() +function, which overwrites the value. + +Fix this by creating a copy of the value using kstrdup() and letting +that copy be written to by strsep(). + +Fixes: 027bd6cafd9a ("usb: core: Add "quirks" parameter for usbcore") +Signed-off-by: Kars Mulder + +Link: https://lore.kernel.org/r/5ee2-5f048a00-21-618c5c00@230659773 +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/core/quirks.c | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c +index e0b77674869ce..c96c50faccf72 100644 +--- a/drivers/usb/core/quirks.c ++++ b/drivers/usb/core/quirks.c +@@ -25,17 +25,23 @@ static unsigned int quirk_count; + + static char quirks_param[128]; + +-static int quirks_param_set(const char *val, const struct kernel_param *kp) ++static int quirks_param_set(const char *value, const struct kernel_param *kp) + { +- char *p, *field; ++ char *val, *p, *field; + u16 vid, pid; + u32 flags; + size_t i; + int err; + ++ val = kstrdup(value, GFP_KERNEL); ++ if (!val) ++ return -ENOMEM; ++ + err = param_set_copystring(val, kp); +- if (err) ++ if (err) { ++ kfree(val); + return err; ++ } + + mutex_lock(&quirk_mutex); + +@@ -60,10 +66,11 @@ static int quirks_param_set(const char *val, const struct kernel_param *kp) + if (!quirk_list) { + quirk_count = 0; + mutex_unlock(&quirk_mutex); ++ kfree(val); + return -ENOMEM; + } + +- for (i = 0, p = (char *)val; p && *p;) { ++ for (i = 0, p = val; p && *p;) { + /* Each entry consists of VID:PID:flags */ + field = strsep(&p, ":"); + if (!field) +@@ -144,6 +151,7 @@ static int quirks_param_set(const char *val, const struct kernel_param *kp) + + unlock: + mutex_unlock(&quirk_mutex); ++ kfree(val); + + return 0; + } +-- +2.25.1 + diff --git a/queue-5.4/usb-dwc2-fix-error-path-in-gadget-registration.patch b/queue-5.4/usb-dwc2-fix-error-path-in-gadget-registration.patch new file mode 100644 index 00000000000..5e955b936f2 --- /dev/null +++ b/queue-5.4/usb-dwc2-fix-error-path-in-gadget-registration.patch @@ -0,0 +1,97 @@ +From 74d631d3e6f1f37a3a0e2ffe71838537d0d0af6a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 16 Jul 2020 14:09:48 +0200 +Subject: usb: dwc2: Fix error path in gadget registration + +From: Marek Szyprowski + +[ Upstream commit 33a06f1300a79cfd461cea0268f05e969d4f34ec ] + +When gadget registration fails, one should not call usb_del_gadget_udc(). +Ensure this by setting gadget->udc to NULL. Also in case of a failure +there is no need to disable low-level hardware, so return immiedetly +instead of jumping to error_init label. + +This fixes the following kernel NULL ptr dereference on gadget failure +(can be easily triggered with g_mass_storage without any module +parameters): + +dwc2 12480000.hsotg: dwc2_check_params: Invalid parameter besl=1 +dwc2 12480000.hsotg: dwc2_check_params: Invalid parameter g_np_tx_fifo_size=1024 +dwc2 12480000.hsotg: EPs: 16, dedicated fifos, 7808 entries in SPRAM +Mass Storage Function, version: 2009/09/11 +LUN: removable file: (no medium) +no file given for LUN0 +g_mass_storage 12480000.hsotg: failed to start g_mass_storage: -22 +8<--- cut here --- +Unable to handle kernel NULL pointer dereference at virtual address 00000104 +pgd = (ptrval) +[00000104] *pgd=00000000 +Internal error: Oops: 805 [#1] PREEMPT SMP ARM +Modules linked in: +CPU: 0 PID: 12 Comm: kworker/0:1 Not tainted 5.8.0-rc5 #3133 +Hardware name: Samsung Exynos (Flattened Device Tree) +Workqueue: events deferred_probe_work_func +PC is at usb_del_gadget_udc+0x38/0xc4 +LR is at __mutex_lock+0x31c/0xb18 +... +Process kworker/0:1 (pid: 12, stack limit = 0x(ptrval)) +Stack: (0xef121db0 to 0xef122000) +... +[] (usb_del_gadget_udc) from [] (dwc2_hsotg_remove+0x10/0x20) +[] (dwc2_hsotg_remove) from [] (dwc2_driver_probe+0x57c/0x69c) +[] (dwc2_driver_probe) from [] (platform_drv_probe+0x6c/0xa4) +[] (platform_drv_probe) from [] (really_probe+0x200/0x48c) +[] (really_probe) from [] (driver_probe_device+0x78/0x1fc) +[] (driver_probe_device) from [] (bus_for_each_drv+0x74/0xb8) +[] (bus_for_each_drv) from [] (__device_attach+0xd4/0x16c) +[] (__device_attach) from [] (bus_probe_device+0x88/0x90) +[] (bus_probe_device) from [] (deferred_probe_work_func+0x3c/0xd0) +[] (deferred_probe_work_func) from [] (process_one_work+0x234/0x7dc) +[] (process_one_work) from [] (worker_thread+0x44/0x51c) +[] (worker_thread) from [] (kthread+0x158/0x1a0) +[] (kthread) from [] (ret_from_fork+0x14/0x20) +Exception stack(0xef121fb0 to 0xef121ff8) +... +---[ end trace 9724c2fc7cc9c982 ]--- + +While fixing this also fix the double call to dwc2_lowlevel_hw_disable() +if dr_mode is set to USB_DR_MODE_PERIPHERAL. In such case low-level +hardware is already disabled before calling usb_add_gadget_udc(). That +function correctly preserves low-level hardware state, there is no need +for the second unconditional dwc2_lowlevel_hw_disable() call. + +Fixes: 207324a321a8 ("usb: dwc2: Postponed gadget registration to the udc class driver") +Acked-by: Minas Harutyunyan +Signed-off-by: Marek Szyprowski +Signed-off-by: Felipe Balbi +Signed-off-by: Sasha Levin +--- + drivers/usb/dwc2/platform.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c +index 4e14c4f7fed7a..34bb6124f1e2f 100644 +--- a/drivers/usb/dwc2/platform.c ++++ b/drivers/usb/dwc2/platform.c +@@ -514,6 +514,7 @@ static int dwc2_driver_probe(struct platform_device *dev) + if (hsotg->gadget_enabled) { + retval = usb_add_gadget_udc(hsotg->dev, &hsotg->gadget); + if (retval) { ++ hsotg->gadget.udc = NULL; + dwc2_hsotg_remove(hsotg); + goto error; + } +@@ -522,7 +523,8 @@ static int dwc2_driver_probe(struct platform_device *dev) + return 0; + + error: +- dwc2_lowlevel_hw_disable(hsotg); ++ if (hsotg->dr_mode != USB_DR_MODE_PERIPHERAL) ++ dwc2_lowlevel_hw_disable(hsotg); + return retval; + } + +-- +2.25.1 + diff --git a/queue-5.4/usb-gadget-f_uac2-fix-ac-interface-header-descriptor.patch b/queue-5.4/usb-gadget-f_uac2-fix-ac-interface-header-descriptor.patch new file mode 100644 index 00000000000..7278cb19645 --- /dev/null +++ b/queue-5.4/usb-gadget-f_uac2-fix-ac-interface-header-descriptor.patch @@ -0,0 +1,56 @@ +From 2632c08fc631b311aae5da12f26e313e4d73767d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 3 Jul 2020 16:49:03 +0300 +Subject: usb: gadget: f_uac2: fix AC Interface Header Descriptor wTotalLength + +From: Ruslan Bilovol + +[ Upstream commit a9cf8715180b18c62addbfe6f6267b8101903119 ] + +As per UAC2 spec (ch. 4.7.2), wTotalLength of AC Interface +Header Descriptor "includes the combined length of this +descriptor header and all Clock Source, Unit and Terminal +descriptors." + +Thus add its size to its wTotalLength. + +Also after recent changes wTotalLength is calculated +dynamically, update static definition of uac2_ac_header_descriptor +accordingly + +Fixes: 132fcb460839 ("usb: gadget: Add Audio Class 2.0 Driver") +Signed-off-by: Ruslan Bilovol +Signed-off-by: Felipe Balbi +Signed-off-by: Sasha Levin +--- + drivers/usb/gadget/function/f_uac2.c | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git a/drivers/usb/gadget/function/f_uac2.c b/drivers/usb/gadget/function/f_uac2.c +index db2d4980cb354..3633df6d7610f 100644 +--- a/drivers/usb/gadget/function/f_uac2.c ++++ b/drivers/usb/gadget/function/f_uac2.c +@@ -215,10 +215,7 @@ static struct uac2_ac_header_descriptor ac_hdr_desc = { + .bDescriptorSubtype = UAC_MS_HEADER, + .bcdADC = cpu_to_le16(0x200), + .bCategory = UAC2_FUNCTION_IO_BOX, +- .wTotalLength = cpu_to_le16(sizeof in_clk_src_desc +- + sizeof out_clk_src_desc + sizeof usb_out_it_desc +- + sizeof io_in_it_desc + sizeof usb_in_ot_desc +- + sizeof io_out_ot_desc), ++ /* .wTotalLength = DYNAMIC */ + .bmControls = 0, + }; + +@@ -501,7 +498,7 @@ static void setup_descriptor(struct f_uac2_opts *opts) + as_in_hdr_desc.bTerminalLink = usb_in_ot_desc.bTerminalID; + + iad_desc.bInterfaceCount = 1; +- ac_hdr_desc.wTotalLength = 0; ++ ac_hdr_desc.wTotalLength = cpu_to_le16(sizeof(ac_hdr_desc)); + + if (EPIN_EN(opts)) { + u16 len = le16_to_cpu(ac_hdr_desc.wTotalLength); +-- +2.25.1 + diff --git a/queue-5.4/usb-gadget-net2280-fix-memory-leak-on-probe-error-ha.patch b/queue-5.4/usb-gadget-net2280-fix-memory-leak-on-probe-error-ha.patch new file mode 100644 index 00000000000..46cdb484037 --- /dev/null +++ b/queue-5.4/usb-gadget-net2280-fix-memory-leak-on-probe-error-ha.patch @@ -0,0 +1,42 @@ +From 53946d307a0f6d0561f2e75d8063908fc77dc8b8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 21 Jul 2020 23:15:58 +0300 +Subject: usb: gadget: net2280: fix memory leak on probe error handling paths + +From: Evgeny Novikov + +[ Upstream commit 2468c877da428ebfd701142c4cdfefcfb7d4c00e ] + +Driver does not release memory for device on error handling paths in +net2280_probe() when gadget_release() is not registered yet. + +The patch fixes the bug like in other similar drivers. + +Found by Linux Driver Verification project (linuxtesting.org). + +Signed-off-by: Evgeny Novikov +Signed-off-by: Felipe Balbi +Signed-off-by: Sasha Levin +--- + drivers/usb/gadget/udc/net2280.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/usb/gadget/udc/net2280.c b/drivers/usb/gadget/udc/net2280.c +index 51efee21915ff..7c616d7641c6d 100644 +--- a/drivers/usb/gadget/udc/net2280.c ++++ b/drivers/usb/gadget/udc/net2280.c +@@ -3782,8 +3782,10 @@ static int net2280_probe(struct pci_dev *pdev, const struct pci_device_id *id) + return 0; + + done: +- if (dev) ++ if (dev) { + net2280_remove(pdev); ++ kfree(dev); ++ } + return retval; + } + +-- +2.25.1 + diff --git a/queue-5.4/usb-mtu3-clear-dual-mode-of-u3port-when-disable-devi.patch b/queue-5.4/usb-mtu3-clear-dual-mode-of-u3port-when-disable-devi.patch new file mode 100644 index 00000000000..5ddf6a52cbb --- /dev/null +++ b/queue-5.4/usb-mtu3-clear-dual-mode-of-u3port-when-disable-devi.patch @@ -0,0 +1,41 @@ +From 27a31ae9da6dd54bdaa5a071a1dee71ace9556d5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 27 Jul 2020 15:14:59 +0800 +Subject: usb: mtu3: clear dual mode of u3port when disable device + +From: Chunfeng Yun + +[ Upstream commit f1e51e99ed498d4aa9ae5df28e43d558ea627781 ] + +If not clear u3port's dual mode when disable device, the IP +will fail to enter sleep mode when suspend. + +Signed-off-by: Chunfeng Yun +Link: https://lore.kernel.org/r/1595834101-13094-10-git-send-email-chunfeng.yun@mediatek.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/mtu3/mtu3_core.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/drivers/usb/mtu3/mtu3_core.c b/drivers/usb/mtu3/mtu3_core.c +index 9dd02160cca97..e3780d4d65149 100644 +--- a/drivers/usb/mtu3/mtu3_core.c ++++ b/drivers/usb/mtu3/mtu3_core.c +@@ -131,8 +131,12 @@ static void mtu3_device_disable(struct mtu3 *mtu) + mtu3_setbits(ibase, SSUSB_U2_CTRL(0), + SSUSB_U2_PORT_DIS | SSUSB_U2_PORT_PDN); + +- if (mtu->ssusb->dr_mode == USB_DR_MODE_OTG) ++ if (mtu->ssusb->dr_mode == USB_DR_MODE_OTG) { + mtu3_clrbits(ibase, SSUSB_U2_CTRL(0), SSUSB_U2_PORT_OTG_SEL); ++ if (mtu->is_u3_ip) ++ mtu3_clrbits(ibase, SSUSB_U3_CTRL(0), ++ SSUSB_U3_PORT_DUAL_MODE); ++ } + + mtu3_setbits(ibase, U3D_SSUSB_IP_PW_CTRL2, SSUSB_IP_DEV_PDN); + } +-- +2.25.1 + diff --git a/queue-5.4/usb-serial-iuu_phoenix-fix-led-activity-helpers.patch b/queue-5.4/usb-serial-iuu_phoenix-fix-led-activity-helpers.patch new file mode 100644 index 00000000000..defc20f4e37 --- /dev/null +++ b/queue-5.4/usb-serial-iuu_phoenix-fix-led-activity-helpers.patch @@ -0,0 +1,70 @@ +From 29fc71b0ff807783c9ced57d4db77b1ac7b7bf05 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 16 Jul 2020 10:50:55 +0200 +Subject: USB: serial: iuu_phoenix: fix led-activity helpers + +From: Johan Hovold + +[ Upstream commit de37458f8c2bfc465500a1dd0d15dbe96d2a698c ] + +The set-led command is eight bytes long and starts with a command byte +followed by six bytes of RGB data and ends with a byte encoding a +frequency (see iuu_led() and iuu_rgbf_fill_buffer()). + +The led activity helpers had a few long-standing bugs which corrupted +the command packets by inserting a second command byte and thereby +offsetting the RGB data and dropping the frequency in non-xmas mode. + +In xmas mode, a related off-by-one error left the frequency field +uninitialised. + +Fixes: 60a8fc017103 ("USB: add iuu_phoenix driver") +Reported-by: George Spelvin +Link: https://lore.kernel.org/r/20200716085056.31471-1-johan@kernel.org +Reviewed-by: Greg Kroah-Hartman +Signed-off-by: Johan Hovold +Signed-off-by: Sasha Levin +--- + drivers/usb/serial/iuu_phoenix.c | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c +index b8dfeb4fb2ed6..ffbb2a8901b2b 100644 +--- a/drivers/usb/serial/iuu_phoenix.c ++++ b/drivers/usb/serial/iuu_phoenix.c +@@ -353,10 +353,11 @@ static void iuu_led_activity_on(struct urb *urb) + struct usb_serial_port *port = urb->context; + int result; + char *buf_ptr = port->write_urb->transfer_buffer; +- *buf_ptr++ = IUU_SET_LED; ++ + if (xmas) { +- get_random_bytes(buf_ptr, 6); +- *(buf_ptr+7) = 1; ++ buf_ptr[0] = IUU_SET_LED; ++ get_random_bytes(buf_ptr + 1, 6); ++ buf_ptr[7] = 1; + } else { + iuu_rgbf_fill_buffer(buf_ptr, 255, 255, 0, 0, 0, 0, 255); + } +@@ -374,13 +375,14 @@ static void iuu_led_activity_off(struct urb *urb) + struct usb_serial_port *port = urb->context; + int result; + char *buf_ptr = port->write_urb->transfer_buffer; ++ + if (xmas) { + iuu_rxcmd(urb); + return; +- } else { +- *buf_ptr++ = IUU_SET_LED; +- iuu_rgbf_fill_buffer(buf_ptr, 0, 0, 255, 255, 0, 0, 255); + } ++ ++ iuu_rgbf_fill_buffer(buf_ptr, 0, 0, 255, 255, 0, 0, 255); ++ + usb_fill_bulk_urb(port->write_urb, port->serial->dev, + usb_sndbulkpipe(port->serial->dev, + port->bulk_out_endpointAddress), +-- +2.25.1 + diff --git a/queue-5.4/video-fbdev-neofb-fix-memory-leak-in-neo_scan_monito.patch b/queue-5.4/video-fbdev-neofb-fix-memory-leak-in-neo_scan_monito.patch new file mode 100644 index 00000000000..3b81d8c7aff --- /dev/null +++ b/queue-5.4/video-fbdev-neofb-fix-memory-leak-in-neo_scan_monito.patch @@ -0,0 +1,46 @@ +From 762cc2f47aa6d9e6e7cfcddf1c31d980ddb8696a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 30 Jun 2020 22:54:51 +0300 +Subject: video: fbdev: neofb: fix memory leak in neo_scan_monitor() + +From: Evgeny Novikov + +[ Upstream commit edcb3895a751c762a18d25c8d9846ce9759ed7e1 ] + +neofb_probe() calls neo_scan_monitor() that can successfully allocate a +memory for info->monspecs.modedb and proceed to case 0x03. There it does +not free the memory and returns -1. neofb_probe() goes to label +err_scan_monitor, thus, it does not free this memory through calling +fb_destroy_modedb() as well. We can not go to label err_init_hw since +neo_scan_monitor() can fail during memory allocation. So, the patch frees +the memory directly for case 0x03. + +Found by Linux Driver Verification project (linuxtesting.org). + +Signed-off-by: Evgeny Novikov +Cc: Jani Nikula +Cc: Mike Rapoport +Cc: Daniel Vetter +Cc: Andrew Morton +Signed-off-by: Bartlomiej Zolnierkiewicz +Link: https://patchwork.freedesktop.org/patch/msgid/20200630195451.18675-1-novikov@ispras.ru +Signed-off-by: Sasha Levin +--- + drivers/video/fbdev/neofb.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/video/fbdev/neofb.c b/drivers/video/fbdev/neofb.c +index b770946a09206..76464000933d8 100644 +--- a/drivers/video/fbdev/neofb.c ++++ b/drivers/video/fbdev/neofb.c +@@ -1820,6 +1820,7 @@ static int neo_scan_monitor(struct fb_info *info) + #else + printk(KERN_ERR + "neofb: Only 640x480, 800x600/480 and 1024x768 panels are currently supported\n"); ++ kfree(info->monspecs.modedb); + return -1; + #endif + default: +-- +2.25.1 + diff --git a/queue-5.4/video-fbdev-savage-fix-memory-leak-on-error-handling.patch b/queue-5.4/video-fbdev-savage-fix-memory-leak-on-error-handling.patch new file mode 100644 index 00000000000..96aaf7cd9ff --- /dev/null +++ b/queue-5.4/video-fbdev-savage-fix-memory-leak-on-error-handling.patch @@ -0,0 +1,44 @@ +From 0aa84536d15ecfe31eafc4400b0ad08232e531cb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 19 Jun 2020 19:21:36 +0300 +Subject: video: fbdev: savage: fix memory leak on error handling path in probe + +From: Evgeny Novikov + +[ Upstream commit e8d35898a78e34fc854ed9680bc3f9caedab08cd ] + +savagefb_probe() calls savage_init_fb_info() that can successfully +allocate memory for info->pixmap.addr but then fail when +fb_alloc_cmap() fails. savagefb_probe() goes to label failed_init and +does not free allocated memory. It is not valid to go to label +failed_mmio since savage_init_fb_info() can fail during memory +allocation as well. So, the patch free allocated memory on the error +handling path in savage_init_fb_info() itself. + +Found by Linux Driver Verification project (linuxtesting.org). + +Signed-off-by: Evgeny Novikov +Cc: Antonino Daplas +Signed-off-by: Bartlomiej Zolnierkiewicz +Link: https://patchwork.freedesktop.org/patch/msgid/20200619162136.9010-1-novikov@ispras.ru +Signed-off-by: Sasha Levin +--- + drivers/video/fbdev/savage/savagefb_driver.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/video/fbdev/savage/savagefb_driver.c b/drivers/video/fbdev/savage/savagefb_driver.c +index 512789f5f8848..d5d22d9c0f562 100644 +--- a/drivers/video/fbdev/savage/savagefb_driver.c ++++ b/drivers/video/fbdev/savage/savagefb_driver.c +@@ -2158,6 +2158,8 @@ static int savage_init_fb_info(struct fb_info *info, struct pci_dev *dev, + info->flags |= FBINFO_HWACCEL_COPYAREA | + FBINFO_HWACCEL_FILLRECT | + FBINFO_HWACCEL_IMAGEBLIT; ++ else ++ kfree(info->pixmap.addr); + } + #endif + return err; +-- +2.25.1 + diff --git a/queue-5.4/video-fbdev-sm712fb-fix-an-issue-about-iounmap-for-a.patch b/queue-5.4/video-fbdev-sm712fb-fix-an-issue-about-iounmap-for-a.patch new file mode 100644 index 00000000000..2659412acd1 --- /dev/null +++ b/queue-5.4/video-fbdev-sm712fb-fix-an-issue-about-iounmap-for-a.patch @@ -0,0 +1,42 @@ +From 69a38f15f6f111ce8a4282ed22d17773d87aecaf Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 23 Apr 2020 00:07:19 +0800 +Subject: video: fbdev: sm712fb: fix an issue about iounmap for a wrong address + +From: Dejin Zheng + +[ Upstream commit 98bd4f72988646c35569e1e838c0ab80d06c77f6 ] + +the sfb->fb->screen_base is not save the value get by iounmap() when +the chip id is 0x720. so iounmap() for address sfb->fb->screen_base +is not right. + +Fixes: 1461d6672864854 ("staging: sm7xxfb: merge sm712fb with fbdev") +Cc: Andy Shevchenko +Cc: Sudip Mukherjee +Cc: Teddy Wang +Cc: Greg Kroah-Hartman +Signed-off-by: Dejin Zheng +Signed-off-by: Bartlomiej Zolnierkiewicz +Link: https://patchwork.freedesktop.org/patch/msgid/20200422160719.27763-1-zhengdejin5@gmail.com +Signed-off-by: Sasha Levin +--- + drivers/video/fbdev/sm712fb.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/video/fbdev/sm712fb.c b/drivers/video/fbdev/sm712fb.c +index 207d0add684b5..2466814145779 100644 +--- a/drivers/video/fbdev/sm712fb.c ++++ b/drivers/video/fbdev/sm712fb.c +@@ -1429,6 +1429,8 @@ static int smtc_map_smem(struct smtcfb_info *sfb, + static void smtc_unmap_smem(struct smtcfb_info *sfb) + { + if (sfb && sfb->fb->screen_base) { ++ if (sfb->chip_id == 0x720) ++ sfb->fb->screen_base -= 0x00200000; + iounmap(sfb->fb->screen_base); + sfb->fb->screen_base = NULL; + } +-- +2.25.1 + diff --git a/queue-5.4/video-pxafb-fix-the-function-used-to-balance-a-dma_a.patch b/queue-5.4/video-pxafb-fix-the-function-used-to-balance-a-dma_a.patch new file mode 100644 index 00000000000..3d1c7dc7d60 --- /dev/null +++ b/queue-5.4/video-pxafb-fix-the-function-used-to-balance-a-dma_a.patch @@ -0,0 +1,49 @@ +From a6c133bd80f3fa720dc25b86773b6fd1309117ec Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 29 Apr 2020 10:45:05 +0200 +Subject: video: pxafb: Fix the function used to balance a + 'dma_alloc_coherent()' call + +From: Christophe JAILLET + +[ Upstream commit 499a2c41b954518c372873202d5e7714e22010c4 ] + +'dma_alloc_coherent()' must be balanced by a call to 'dma_free_coherent()' +not 'dma_free_wc()'. +The correct dma_free_ function is already used in the error handling path +of the probe function. + +Fixes: 77e196752bdd ("[ARM] pxafb: allow video memory size to be configurable") +Signed-off-by: Christophe JAILLET +Cc: Sumit Semwal +Cc: Rafael J. Wysocki +Cc: Jonathan Corbet +Cc: Viresh Kumar +Cc: Jani Nikula +cc: Mauro Carvalho Chehab +Cc: Eric Miao +Signed-off-by: Bartlomiej Zolnierkiewicz +Link: https://patchwork.freedesktop.org/patch/msgid/20200429084505.108897-1-christophe.jaillet@wanadoo.fr +Signed-off-by: Sasha Levin +--- + drivers/video/fbdev/pxafb.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/video/fbdev/pxafb.c b/drivers/video/fbdev/pxafb.c +index f70c9f79622ec..27635926cea3f 100644 +--- a/drivers/video/fbdev/pxafb.c ++++ b/drivers/video/fbdev/pxafb.c +@@ -2425,8 +2425,8 @@ static int pxafb_remove(struct platform_device *dev) + + free_pages_exact(fbi->video_mem, fbi->video_mem_size); + +- dma_free_wc(&dev->dev, fbi->dma_buff_size, fbi->dma_buff, +- fbi->dma_buff_phys); ++ dma_free_coherent(&dev->dev, fbi->dma_buff_size, fbi->dma_buff, ++ fbi->dma_buff_phys); + + return 0; + } +-- +2.25.1 + diff --git a/queue-5.4/wl1251-fix-always-return-0-error.patch b/queue-5.4/wl1251-fix-always-return-0-error.patch new file mode 100644 index 00000000000..ebce086b2a9 --- /dev/null +++ b/queue-5.4/wl1251-fix-always-return-0-error.patch @@ -0,0 +1,38 @@ +From 4b0e62c0d77fb3d0a8045b2b4c7851287c899c2d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 30 Jul 2020 15:39:39 +0800 +Subject: wl1251: fix always return 0 error + +From: Wang Hai + +[ Upstream commit 20e6421344b5bc2f97b8e2db47b6994368417904 ] + +wl1251_event_ps_report() should not always return 0 because +wl1251_ps_set_mode() may fail. Change it to return 'ret'. + +Fixes: f7ad1eed4d4b ("wl1251: retry power save entry") +Reported-by: Hulk Robot +Signed-off-by: Wang Hai +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/20200730073939.33704-1-wanghai38@huawei.com +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/ti/wl1251/event.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/ti/wl1251/event.c b/drivers/net/wireless/ti/wl1251/event.c +index 850864dbafa11..e6d426edab56b 100644 +--- a/drivers/net/wireless/ti/wl1251/event.c ++++ b/drivers/net/wireless/ti/wl1251/event.c +@@ -70,7 +70,7 @@ static int wl1251_event_ps_report(struct wl1251 *wl, + break; + } + +- return 0; ++ return ret; + } + + static void wl1251_event_mbox_dump(struct event_mailbox *mbox) +-- +2.25.1 + diff --git a/queue-5.4/x86-mce-inject-fix-a-wrong-assignment-of-i_mce.statu.patch b/queue-5.4/x86-mce-inject-fix-a-wrong-assignment-of-i_mce.statu.patch new file mode 100644 index 00000000000..9ef28e7e7f4 --- /dev/null +++ b/queue-5.4/x86-mce-inject-fix-a-wrong-assignment-of-i_mce.statu.patch @@ -0,0 +1,38 @@ +From bbaa0ea319f554292832f4758b71dc52df3bbe1b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 11 Jun 2020 10:32:38 +0800 +Subject: x86/mce/inject: Fix a wrong assignment of i_mce.status + +From: Zhenzhong Duan + +[ Upstream commit 5d7f7d1d5e01c22894dee7c9c9266500478dca99 ] + +The original code is a nop as i_mce.status is or'ed with part of itself, +fix it. + +Fixes: a1300e505297 ("x86/ras/mce_amd_inj: Trigger deferred and thresholding errors interrupts") +Signed-off-by: Zhenzhong Duan +Signed-off-by: Borislav Petkov +Acked-by: Yazen Ghannam +Link: https://lkml.kernel.org/r/20200611023238.3830-1-zhenzhong.duan@gmail.com +Signed-off-by: Sasha Levin +--- + arch/x86/kernel/cpu/mce/inject.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/x86/kernel/cpu/mce/inject.c b/arch/x86/kernel/cpu/mce/inject.c +index 1f30117b24ba7..eb2d41c1816d6 100644 +--- a/arch/x86/kernel/cpu/mce/inject.c ++++ b/arch/x86/kernel/cpu/mce/inject.c +@@ -511,7 +511,7 @@ static void do_inject(void) + */ + if (inj_type == DFR_INT_INJ) { + i_mce.status |= MCI_STATUS_DEFERRED; +- i_mce.status |= (i_mce.status & ~MCI_STATUS_UC); ++ i_mce.status &= ~MCI_STATUS_UC; + } + + /* +-- +2.25.1 + diff --git a/queue-5.4/xfs-don-t-eat-an-eio-enospc-writeback-error-when-scr.patch b/queue-5.4/xfs-don-t-eat-an-eio-enospc-writeback-error-when-scr.patch new file mode 100644 index 00000000000..08bc52d4d4d --- /dev/null +++ b/queue-5.4/xfs-don-t-eat-an-eio-enospc-writeback-error-when-scr.patch @@ -0,0 +1,70 @@ +From f4639f85b61ea77b42aa809c826e1b93d5f06f69 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 29 Jun 2020 14:47:17 -0700 +Subject: xfs: don't eat an EIO/ENOSPC writeback error when scrubbing data fork + +From: Darrick J. Wong + +[ Upstream commit eb0efe5063bb10bcb653e4f8e92a74719c03a347 ] + +The data fork scrubber calls filemap_write_and_wait to flush dirty pages +and delalloc reservations out to disk prior to checking the data fork's +extent mappings. Unfortunately, this means that scrub can consume the +EIO/ENOSPC errors that would otherwise have stayed around in the address +space until (we hope) the writer application calls fsync to persist data +and collect errors. The end result is that programs that wrote to a +file might never see the error code and proceed as if nothing were +wrong. + +xfs_scrub is not in a position to notify file writers about the +writeback failure, and it's only here to check metadata, not file +contents. Therefore, if writeback fails, we should stuff the error code +back into the address space so that an fsync by the writer application +can pick that up. + +Fixes: 99d9d8d05da2 ("xfs: scrub inode block mappings") +Signed-off-by: Darrick J. Wong +Reviewed-by: Brian Foster +Reviewed-by: Dave Chinner +Signed-off-by: Sasha Levin +--- + fs/xfs/scrub/bmap.c | 22 ++++++++++++++++++++-- + 1 file changed, 20 insertions(+), 2 deletions(-) + +diff --git a/fs/xfs/scrub/bmap.c b/fs/xfs/scrub/bmap.c +index fa6ea6407992a..392fb4df5c127 100644 +--- a/fs/xfs/scrub/bmap.c ++++ b/fs/xfs/scrub/bmap.c +@@ -45,9 +45,27 @@ xchk_setup_inode_bmap( + */ + if (S_ISREG(VFS_I(sc->ip)->i_mode) && + sc->sm->sm_type == XFS_SCRUB_TYPE_BMBTD) { ++ struct address_space *mapping = VFS_I(sc->ip)->i_mapping; ++ + inode_dio_wait(VFS_I(sc->ip)); +- error = filemap_write_and_wait(VFS_I(sc->ip)->i_mapping); +- if (error) ++ ++ /* ++ * Try to flush all incore state to disk before we examine the ++ * space mappings for the data fork. Leave accumulated errors ++ * in the mapping for the writer threads to consume. ++ * ++ * On ENOSPC or EIO writeback errors, we continue into the ++ * extent mapping checks because write failures do not ++ * necessarily imply anything about the correctness of the file ++ * metadata. The metadata and the file data could be on ++ * completely separate devices; a media failure might only ++ * affect a subset of the disk, etc. We can handle delalloc ++ * extents in the scrubber, so leaving them in memory is fine. ++ */ ++ error = filemap_fdatawrite(mapping); ++ if (!error) ++ error = filemap_fdatawait_keep_errors(mapping); ++ if (error && (error != -ENOSPC && error != -EIO)) + goto out; + } + +-- +2.25.1 + diff --git a/queue-5.4/xfs-fix-inode-allocation-block-res-calculation-prece.patch b/queue-5.4/xfs-fix-inode-allocation-block-res-calculation-prece.patch new file mode 100644 index 00000000000..d311b28affb --- /dev/null +++ b/queue-5.4/xfs-fix-inode-allocation-block-res-calculation-prece.patch @@ -0,0 +1,46 @@ +From b8fc2ced429918c6f3146c007e4dd83d70ecf7eb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 15 Jul 2020 18:44:50 -0700 +Subject: xfs: fix inode allocation block res calculation precedence + +From: Brian Foster + +[ Upstream commit b2a8864728683443f34a9fd33a2b78b860934cc1 ] + +The block reservation calculation for inode allocation is supposed +to consist of the blocks required for the inode chunk plus +(maxlevels-1) of the inode btree multiplied by the number of inode +btrees in the fs (2 when finobt is enabled, 1 otherwise). + +Instead, the macro returns (ialloc_blocks + 2) due to a precedence +error in the calculation logic. This leads to block reservation +overruns via generic/531 on small block filesystems with finobt +enabled. Add braces to fix the calculation and reserve the +appropriate number of blocks. + +Fixes: 9d43b180af67 ("xfs: update inode allocation/free transaction reservations for finobt") +Signed-off-by: Brian Foster +Reviewed-by: Darrick J. Wong +Signed-off-by: Darrick J. Wong +Reviewed-by: Christoph Hellwig +Signed-off-by: Sasha Levin +--- + fs/xfs/libxfs/xfs_trans_space.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/xfs/libxfs/xfs_trans_space.h b/fs/xfs/libxfs/xfs_trans_space.h +index 88221c7a04ccf..c6df01a2a1585 100644 +--- a/fs/xfs/libxfs/xfs_trans_space.h ++++ b/fs/xfs/libxfs/xfs_trans_space.h +@@ -57,7 +57,7 @@ + XFS_DAREMOVE_SPACE_RES(mp, XFS_DATA_FORK) + #define XFS_IALLOC_SPACE_RES(mp) \ + (M_IGEO(mp)->ialloc_blks + \ +- (xfs_sb_version_hasfinobt(&mp->m_sb) ? 2 : 1 * \ ++ ((xfs_sb_version_hasfinobt(&mp->m_sb) ? 2 : 1) * \ + (M_IGEO(mp)->inobt_maxlevels - 1))) + + /* +-- +2.25.1 + diff --git a/queue-5.4/xfs-fix-reflink-quota-reservation-accounting-error.patch b/queue-5.4/xfs-fix-reflink-quota-reservation-accounting-error.patch new file mode 100644 index 00000000000..eb03dab66f1 --- /dev/null +++ b/queue-5.4/xfs-fix-reflink-quota-reservation-accounting-error.patch @@ -0,0 +1,64 @@ +From 18d506b9ad10421b3f0a59bc5d93c89803923f57 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 29 Jun 2020 14:47:18 -0700 +Subject: xfs: fix reflink quota reservation accounting error + +From: Darrick J. Wong + +[ Upstream commit 83895227aba1ade33e81f586aa7b6b1e143096a5 ] + +Quota reservations are supposed to account for the blocks that might be +allocated due to a bmap btree split. Reflink doesn't do this, so fix +this to make the quota accounting more accurate before we start +rearranging things. + +Fixes: 862bb360ef56 ("xfs: reflink extents from one file to another") +Signed-off-by: Darrick J. Wong +Reviewed-by: Brian Foster +Signed-off-by: Sasha Levin +--- + fs/xfs/xfs_reflink.c | 21 ++++++++++++++------- + 1 file changed, 14 insertions(+), 7 deletions(-) + +diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c +index 6a4fd1738b086..904d8285c2269 100644 +--- a/fs/xfs/xfs_reflink.c ++++ b/fs/xfs/xfs_reflink.c +@@ -1005,6 +1005,7 @@ xfs_reflink_remap_extent( + xfs_filblks_t rlen; + xfs_filblks_t unmap_len; + xfs_off_t newlen; ++ int64_t qres; + int error; + + unmap_len = irec->br_startoff + irec->br_blockcount - destoff; +@@ -1027,13 +1028,19 @@ xfs_reflink_remap_extent( + xfs_ilock(ip, XFS_ILOCK_EXCL); + xfs_trans_ijoin(tp, ip, 0); + +- /* If we're not just clearing space, then do we have enough quota? */ +- if (real_extent) { +- error = xfs_trans_reserve_quota_nblks(tp, ip, +- irec->br_blockcount, 0, XFS_QMOPT_RES_REGBLKS); +- if (error) +- goto out_cancel; +- } ++ /* ++ * Reserve quota for this operation. We don't know if the first unmap ++ * in the dest file will cause a bmap btree split, so we always reserve ++ * at least enough blocks for that split. If the extent being mapped ++ * in is written, we need to reserve quota for that too. ++ */ ++ qres = XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK); ++ if (real_extent) ++ qres += irec->br_blockcount; ++ error = xfs_trans_reserve_quota_nblks(tp, ip, qres, 0, ++ XFS_QMOPT_RES_REGBLKS); ++ if (error) ++ goto out_cancel; + + trace_xfs_reflink_remap(ip, irec->br_startoff, + irec->br_blockcount, irec->br_startblock); +-- +2.25.1 +