From: Greg Kroah-Hartman Date: Mon, 24 Jan 2022 14:11:18 +0000 (+0100) Subject: 5.4-stable patches X-Git-Tag: v4.4.300~41 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5c4f591d02b9570af09f1933b78c917611f2ef06;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: dt-bindings-display-meson-dw-hdmi-add-missing-sound-name-prefix-property.patch dt-bindings-display-meson-vpu-add-missing-amlogic-canvas-property.patch lib-test_meminit-destroy-cache-in-kmem_cache_alloc_bulk-test.patch lib82596-fix-irq-check-in-sni_82596_probe.patch scripts-dtc-dtx_diff-remove-broken-example-from-help-text.patch --- diff --git a/queue-5.4/dt-bindings-display-meson-dw-hdmi-add-missing-sound-name-prefix-property.patch b/queue-5.4/dt-bindings-display-meson-dw-hdmi-add-missing-sound-name-prefix-property.patch new file mode 100644 index 00000000000..6c3d32b636d --- /dev/null +++ b/queue-5.4/dt-bindings-display-meson-dw-hdmi-add-missing-sound-name-prefix-property.patch @@ -0,0 +1,45 @@ +From 22bf4047d26980807611b7e2030803db375afd87 Mon Sep 17 00:00:00 2001 +From: Alexander Stein +Date: Thu, 23 Dec 2021 13:24:32 +0100 +Subject: dt-bindings: display: meson-dw-hdmi: add missing sound-name-prefix property + +From: Alexander Stein + +commit 22bf4047d26980807611b7e2030803db375afd87 upstream. + +This is used in meson-gx and meson-g12. Add the property to the binding. +This fixes the dtschema warning: +hdmi-tx@c883a000: 'sound-name-prefix' does not match any of the +regexes: 'pinctrl-[0-9]+' + +Signed-off-by: Alexander Stein +Fixes: 376bf52deef5 ("dt-bindings: display: amlogic, meson-dw-hdmi: convert to yaml") +Acked-by: Neil Armstrong +Signed-off-by: Neil Armstrong +Link: https://patchwork.freedesktop.org/patch/msgid/20211223122434.39378-2-alexander.stein@mailbox.org +Signed-off-by: Greg Kroah-Hartman +--- + Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml ++++ b/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml +@@ -10,6 +10,9 @@ title: Amlogic specific extensions to th + maintainers: + - Neil Armstrong + ++allOf: ++ - $ref: /schemas/sound/name-prefix.yaml# ++ + description: | + The Amlogic Meson Synopsys Designware Integration is composed of + - A Synopsys DesignWare HDMI Controller IP +@@ -101,6 +104,8 @@ properties: + "#sound-dai-cells": + const: 0 + ++ sound-name-prefix: true ++ + required: + - compatible + - reg diff --git a/queue-5.4/dt-bindings-display-meson-vpu-add-missing-amlogic-canvas-property.patch b/queue-5.4/dt-bindings-display-meson-vpu-add-missing-amlogic-canvas-property.patch new file mode 100644 index 00000000000..880d307c24f --- /dev/null +++ b/queue-5.4/dt-bindings-display-meson-vpu-add-missing-amlogic-canvas-property.patch @@ -0,0 +1,54 @@ +From 640f35b871d29cd685ce0ea0762636381beeb98a Mon Sep 17 00:00:00 2001 +From: Alexander Stein +Date: Sun, 19 Dec 2021 10:41:55 +0100 +Subject: dt-bindings: display: meson-vpu: Add missing amlogic,canvas property + +From: Alexander Stein + +commit 640f35b871d29cd685ce0ea0762636381beeb98a upstream. + +This property was already mentioned in the old textual bindings +amlogic,meson-vpu.txt, but got dropped during conversion. +Adding it back similar to amlogic,gx-vdec.yaml. + +Fixes: 6b9ebf1e0e67 ("dt-bindings: display: amlogic, meson-vpu: convert to yaml") +Signed-off-by: Alexander Stein +Acked-by: Rob Herring +Reviewed-by: Neil Armstrong +Reviewed-by: Martin Blumenstingl +Signed-off-by: Neil Armstrong +Link: https://patchwork.freedesktop.org/patch/msgid/20211219094155.177206-1-alexander.stein@mailbox.org +Signed-off-by: Greg Kroah-Hartman +--- + Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml ++++ b/Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml +@@ -78,6 +78,10 @@ properties: + interrupts: + maxItems: 1 + ++ amlogic,canvas: ++ description: should point to a canvas provider node ++ $ref: /schemas/types.yaml#/definitions/phandle ++ + power-domains: + maxItems: 1 + description: phandle to the associated power domain +@@ -106,6 +110,7 @@ required: + - port@1 + - "#address-cells" + - "#size-cells" ++ - amlogic,canvas + + examples: + - | +@@ -116,6 +121,7 @@ examples: + interrupts = <3>; + #address-cells = <1>; + #size-cells = <0>; ++ amlogic,canvas = <&canvas>; + + /* CVBS VDAC output port */ + port@0 { diff --git a/queue-5.4/lib-test_meminit-destroy-cache-in-kmem_cache_alloc_bulk-test.patch b/queue-5.4/lib-test_meminit-destroy-cache-in-kmem_cache_alloc_bulk-test.patch new file mode 100644 index 00000000000..d5deea15732 --- /dev/null +++ b/queue-5.4/lib-test_meminit-destroy-cache-in-kmem_cache_alloc_bulk-test.patch @@ -0,0 +1,35 @@ +From e073e5ef90298d2d6e5e7f04b545a0815e92110c Mon Sep 17 00:00:00 2001 +From: Andrey Konovalov +Date: Wed, 19 Jan 2022 18:09:28 -0800 +Subject: lib/test_meminit: destroy cache in kmem_cache_alloc_bulk() test + +From: Andrey Konovalov + +commit e073e5ef90298d2d6e5e7f04b545a0815e92110c upstream. + +Make do_kmem_cache_size_bulk() destroy the cache it creates. + +Link: https://lkml.kernel.org/r/aced20a94bf04159a139f0846e41d38a1537debb.1640018297.git.andreyknvl@google.com +Fixes: 03a9349ac0e0 ("lib/test_meminit: add a kmem_cache_alloc_bulk() test") +Signed-off-by: Andrey Konovalov +Reviewed-by: Marco Elver +Cc: Alexander Potapenko +Cc: Dmitry Vyukov +Cc: Andrey Ryabinin +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman +--- + lib/test_meminit.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/lib/test_meminit.c ++++ b/lib/test_meminit.c +@@ -319,6 +319,7 @@ static int __init do_kmem_cache_size_bul + if (num) + kmem_cache_free_bulk(c, num, objects); + } ++ kmem_cache_destroy(c); + *total_failures += fail; + return 1; + } diff --git a/queue-5.4/lib82596-fix-irq-check-in-sni_82596_probe.patch b/queue-5.4/lib82596-fix-irq-check-in-sni_82596_probe.patch new file mode 100644 index 00000000000..5e9e45d2e56 --- /dev/null +++ b/queue-5.4/lib82596-fix-irq-check-in-sni_82596_probe.patch @@ -0,0 +1,40 @@ +From 99218cbf81bf21355a3de61cd46a706d36e900e6 Mon Sep 17 00:00:00 2001 +From: Miaoqian Lin +Date: Fri, 14 Jan 2022 06:57:24 +0000 +Subject: lib82596: Fix IRQ check in sni_82596_probe + +From: Miaoqian Lin + +commit 99218cbf81bf21355a3de61cd46a706d36e900e6 upstream. + +platform_get_irq() returns negative error number instead 0 on failure. +And the doc of platform_get_irq() provides a usage example: + + int irq = platform_get_irq(pdev, 0); + if (irq < 0) + return irq; + +Fix the check of return value to catch errors correctly. + +Fixes: 115978859272 ("i825xx: Move the Intel 82586/82593/82596 based drivers") +Signed-off-by: Miaoqian Lin +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/i825xx/sni_82596.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/net/ethernet/i825xx/sni_82596.c ++++ b/drivers/net/ethernet/i825xx/sni_82596.c +@@ -123,9 +123,10 @@ static int sni_82596_probe(struct platfo + netdevice->dev_addr[5] = readb(eth_addr + 0x06); + iounmap(eth_addr); + +- if (!netdevice->irq) { ++ if (netdevice->irq < 0) { + printk(KERN_ERR "%s: IRQ not found for i82596 at 0x%lx\n", + __FILE__, netdevice->base_addr); ++ retval = netdevice->irq; + goto probe_failed; + } + diff --git a/queue-5.4/scripts-dtc-dtx_diff-remove-broken-example-from-help-text.patch b/queue-5.4/scripts-dtc-dtx_diff-remove-broken-example-from-help-text.patch new file mode 100644 index 00000000000..72656617f37 --- /dev/null +++ b/queue-5.4/scripts-dtc-dtx_diff-remove-broken-example-from-help-text.patch @@ -0,0 +1,46 @@ +From d8adf5b92a9d2205620874d498c39923ecea8749 Mon Sep 17 00:00:00 2001 +From: Matthias Schiffer +Date: Thu, 13 Jan 2022 09:19:18 +0100 +Subject: scripts/dtc: dtx_diff: remove broken example from help text + +From: Matthias Schiffer + +commit d8adf5b92a9d2205620874d498c39923ecea8749 upstream. + +dtx_diff suggests to use <(...) syntax to pipe two inputs into it, but +this has never worked: The /proc/self/fds/... paths passed by the shell +will fail the `[ -f "${dtx}" ] && [ -r "${dtx}" ]` check in compile_to_dts, +but even with this check removed, the function cannot work: hexdump will +eat up the DTB magic, making the subsequent dtc call fail, as a pipe +cannot be rewound. + +Simply remove this broken example, as there is already an alternative one +that works fine. + +Fixes: 10eadc253ddf ("dtc: create tool to diff device trees") +Signed-off-by: Matthias Schiffer +Reviewed-by: Frank Rowand +Signed-off-by: Rob Herring +Link: https://lore.kernel.org/r/20220113081918.10387-1-matthias.schiffer@ew.tq-group.com +Signed-off-by: Greg Kroah-Hartman +--- + scripts/dtc/dtx_diff | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +--- a/scripts/dtc/dtx_diff ++++ b/scripts/dtc/dtx_diff +@@ -56,12 +56,8 @@ Otherwise DTx is treated as a dts source + or '/include/' to be processed. + + If DTx_1 and DTx_2 are in different architectures, then this script +- may not work since \${ARCH} is part of the include path. Two possible +- workarounds: +- +- `basename $0` \\ +- <(ARCH=arch_of_dtx_1 `basename $0` DTx_1) \\ +- <(ARCH=arch_of_dtx_2 `basename $0` DTx_2) ++ may not work since \${ARCH} is part of the include path. The following ++ workaround can be used: + + `basename $0` ARCH=arch_of_dtx_1 DTx_1 >tmp_dtx_1.dts + `basename $0` ARCH=arch_of_dtx_2 DTx_2 >tmp_dtx_2.dts diff --git a/queue-5.4/series b/queue-5.4/series index 45f811ae8a4..2398933ed16 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -312,3 +312,8 @@ arm64-dts-qcom-msm8996-drop-not-documented-adreno-properties.patch net_sched-restore-mpu-xxx-handling.patch bcmgenet-add-wol-irq-check.patch net-ethernet-mtk_eth_soc-fix-error-checking-in-mtk_mac_config.patch +dt-bindings-display-meson-dw-hdmi-add-missing-sound-name-prefix-property.patch +dt-bindings-display-meson-vpu-add-missing-amlogic-canvas-property.patch +scripts-dtc-dtx_diff-remove-broken-example-from-help-text.patch +lib82596-fix-irq-check-in-sni_82596_probe.patch +lib-test_meminit-destroy-cache-in-kmem_cache_alloc_bulk-test.patch