From: Greg Kroah-Hartman Date: Tue, 23 Aug 2022 11:10:58 +0000 (+0200) Subject: drop riscv-dts-sifive-add-fu540-topology-information.patch from everywhere X-Git-Tag: v4.9.326~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0a7dc49377a354d27b17244dc0f651bcdb139be4;p=thirdparty%2Fkernel%2Fstable-queue.git drop riscv-dts-sifive-add-fu540-topology-information.patch from everywhere --- diff --git a/queue-5.10/riscv-dts-sifive-add-fu540-topology-information.patch b/queue-5.10/riscv-dts-sifive-add-fu540-topology-information.patch deleted file mode 100644 index 8a33fa9150c..00000000000 --- a/queue-5.10/riscv-dts-sifive-add-fu540-topology-information.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 1c3fb44f2d4f43151b1cfe543f57bc0e63b0d42d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 5 Jul 2022 20:04:33 +0100 -Subject: riscv: dts: sifive: Add fu540 topology information - -From: Conor Dooley - -[ Upstream commit af8f260abc608c06e4466a282b53f1e2dc09f042 ] - -The fu540 has no cpu-map node, so tools like hwloc cannot correctly -parse the topology. Add the node using the existing node labels. - -Reported-by: Brice Goglin -Link: https://github.com/open-mpi/hwloc/issues/536 -Signed-off-by: Conor Dooley -Link: https://lore.kernel.org/r/20220705190435.1790466-3-mail@conchuod.ie -Signed-off-by: Palmer Dabbelt -Signed-off-by: Sasha Levin ---- - arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 24 ++++++++++++++++++++++ - 1 file changed, 24 insertions(+) - -diff --git a/arch/riscv/boot/dts/sifive/fu540-c000.dtsi b/arch/riscv/boot/dts/sifive/fu540-c000.dtsi -index 64c06c9b41dc..87d6e5a4253f 100644 ---- a/arch/riscv/boot/dts/sifive/fu540-c000.dtsi -+++ b/arch/riscv/boot/dts/sifive/fu540-c000.dtsi -@@ -133,6 +133,30 @@ - interrupt-controller; - }; - }; -+ -+ cpu-map { -+ cluster0 { -+ core0 { -+ cpu = <&cpu0>; -+ }; -+ -+ core1 { -+ cpu = <&cpu1>; -+ }; -+ -+ core2 { -+ cpu = <&cpu2>; -+ }; -+ -+ core3 { -+ cpu = <&cpu3>; -+ }; -+ -+ core4 { -+ cpu = <&cpu4>; -+ }; -+ }; -+ }; - }; - soc { - #address-cells = <2>; --- -2.35.1 - diff --git a/queue-5.10/series b/queue-5.10/series index 0b580c42bd1..25afb277507 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -134,7 +134,6 @@ tty-serial-fix-refcount-leak-bug-in-ucc_uart.c.patch vfio-clear-the-caps-buf-to-null-after-free.patch mips-cavium-octeon-fix-missing-of_node_put-in-octeon.patch modules-ensure-natural-alignment-for-.altinstruction.patch -riscv-dts-sifive-add-fu540-topology-information.patch riscv-mmap-with-prot_write-but-no-prot_read-is-inval.patch risc-v-add-fast-call-path-of-crash_kexec.patch watchdog-export-lockup_detector_reconfigure.patch diff --git a/queue-5.15/riscv-dts-sifive-add-fu540-topology-information.patch b/queue-5.15/riscv-dts-sifive-add-fu540-topology-information.patch deleted file mode 100644 index 73b5e0d7384..00000000000 --- a/queue-5.15/riscv-dts-sifive-add-fu540-topology-information.patch +++ /dev/null @@ -1,60 +0,0 @@ -From bc3ac9aa4f4bf1679f6d8dbdf9290d63c281e86e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 5 Jul 2022 20:04:33 +0100 -Subject: riscv: dts: sifive: Add fu540 topology information - -From: Conor Dooley - -[ Upstream commit af8f260abc608c06e4466a282b53f1e2dc09f042 ] - -The fu540 has no cpu-map node, so tools like hwloc cannot correctly -parse the topology. Add the node using the existing node labels. - -Reported-by: Brice Goglin -Link: https://github.com/open-mpi/hwloc/issues/536 -Signed-off-by: Conor Dooley -Link: https://lore.kernel.org/r/20220705190435.1790466-3-mail@conchuod.ie -Signed-off-by: Palmer Dabbelt -Signed-off-by: Sasha Levin ---- - arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 24 ++++++++++++++++++++++ - 1 file changed, 24 insertions(+) - -diff --git a/arch/riscv/boot/dts/sifive/fu540-c000.dtsi b/arch/riscv/boot/dts/sifive/fu540-c000.dtsi -index 64c06c9b41dc..87d6e5a4253f 100644 ---- a/arch/riscv/boot/dts/sifive/fu540-c000.dtsi -+++ b/arch/riscv/boot/dts/sifive/fu540-c000.dtsi -@@ -133,6 +133,30 @@ - interrupt-controller; - }; - }; -+ -+ cpu-map { -+ cluster0 { -+ core0 { -+ cpu = <&cpu0>; -+ }; -+ -+ core1 { -+ cpu = <&cpu1>; -+ }; -+ -+ core2 { -+ cpu = <&cpu2>; -+ }; -+ -+ core3 { -+ cpu = <&cpu3>; -+ }; -+ -+ core4 { -+ cpu = <&cpu4>; -+ }; -+ }; -+ }; - }; - soc { - #address-cells = <2>; --- -2.35.1 - diff --git a/queue-5.15/series b/queue-5.15/series index 33cabc2bdea..cc0c5964573 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -211,7 +211,6 @@ mips-cavium-octeon-fix-missing-of_node_put-in-octeon.patch iommu-io-pgtable-arm-v7s-add-a-quirk-to-allow-pgtabl.patch modules-ensure-natural-alignment-for-.altinstruction.patch asoc-rsnd-care-default-case-on-rsnd_ssiu_busif_err_i.patch -riscv-dts-sifive-add-fu540-topology-information.patch riscv-dts-sifive-add-fu740-topology-information.patch riscv-dts-canaan-add-k210-topology-information.patch riscv-mmap-with-prot_write-but-no-prot_read-is-inval.patch diff --git a/queue-5.19/riscv-dts-sifive-add-fu540-topology-information.patch b/queue-5.19/riscv-dts-sifive-add-fu540-topology-information.patch deleted file mode 100644 index ffe29c48808..00000000000 --- a/queue-5.19/riscv-dts-sifive-add-fu540-topology-information.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 58273c019874f786105c5cb914c2cf6d702f3408 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 5 Jul 2022 20:04:33 +0100 -Subject: riscv: dts: sifive: Add fu540 topology information - -From: Conor Dooley - -[ Upstream commit af8f260abc608c06e4466a282b53f1e2dc09f042 ] - -The fu540 has no cpu-map node, so tools like hwloc cannot correctly -parse the topology. Add the node using the existing node labels. - -Reported-by: Brice Goglin -Link: https://github.com/open-mpi/hwloc/issues/536 -Signed-off-by: Conor Dooley -Link: https://lore.kernel.org/r/20220705190435.1790466-3-mail@conchuod.ie -Signed-off-by: Palmer Dabbelt -Signed-off-by: Sasha Levin ---- - arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 24 ++++++++++++++++++++++ - 1 file changed, 24 insertions(+) - -diff --git a/arch/riscv/boot/dts/sifive/fu540-c000.dtsi b/arch/riscv/boot/dts/sifive/fu540-c000.dtsi -index e3172d0ffac4..24bba83bec77 100644 ---- a/arch/riscv/boot/dts/sifive/fu540-c000.dtsi -+++ b/arch/riscv/boot/dts/sifive/fu540-c000.dtsi -@@ -133,6 +133,30 @@ - interrupt-controller; - }; - }; -+ -+ cpu-map { -+ cluster0 { -+ core0 { -+ cpu = <&cpu0>; -+ }; -+ -+ core1 { -+ cpu = <&cpu1>; -+ }; -+ -+ core2 { -+ cpu = <&cpu2>; -+ }; -+ -+ core3 { -+ cpu = <&cpu3>; -+ }; -+ -+ core4 { -+ cpu = <&cpu4>; -+ }; -+ }; -+ }; - }; - soc { - #address-cells = <2>; --- -2.35.1 - diff --git a/queue-5.19/series b/queue-5.19/series index 3b0cf7e96f8..e9dd4a91d6e 100644 --- a/queue-5.19/series +++ b/queue-5.19/series @@ -329,7 +329,6 @@ asoc-sof-intel-cnl-do-not-process-ipc-reply-before-f.patch asoc-sof-intel-hda-ipc-do-not-process-ipc-reply-befo.patch asoc-sof-sof-client-probes-only-load-the-driver-if-i.patch asoc-rsnd-care-default-case-on-rsnd_ssiu_busif_err_i.patch -riscv-dts-sifive-add-fu540-topology-information.patch riscv-dts-sifive-add-fu740-topology-information.patch riscv-dts-canaan-add-k210-topology-information.patch asoc-nau8821-don-t-unconditionally-free-interrupt.patch diff --git a/queue-5.4/riscv-dts-sifive-add-fu540-topology-information.patch b/queue-5.4/riscv-dts-sifive-add-fu540-topology-information.patch deleted file mode 100644 index faee1eeddb7..00000000000 --- a/queue-5.4/riscv-dts-sifive-add-fu540-topology-information.patch +++ /dev/null @@ -1,60 +0,0 @@ -From d26c6f87f0b6235fd86fe3d4b83e1c02aeb6a872 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 5 Jul 2022 20:04:33 +0100 -Subject: riscv: dts: sifive: Add fu540 topology information - -From: Conor Dooley - -[ Upstream commit af8f260abc608c06e4466a282b53f1e2dc09f042 ] - -The fu540 has no cpu-map node, so tools like hwloc cannot correctly -parse the topology. Add the node using the existing node labels. - -Reported-by: Brice Goglin -Link: https://github.com/open-mpi/hwloc/issues/536 -Signed-off-by: Conor Dooley -Link: https://lore.kernel.org/r/20220705190435.1790466-3-mail@conchuod.ie -Signed-off-by: Palmer Dabbelt -Signed-off-by: Sasha Levin ---- - arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 24 ++++++++++++++++++++++ - 1 file changed, 24 insertions(+) - -diff --git a/arch/riscv/boot/dts/sifive/fu540-c000.dtsi b/arch/riscv/boot/dts/sifive/fu540-c000.dtsi -index afa43c7ea369..0e4514f32576 100644 ---- a/arch/riscv/boot/dts/sifive/fu540-c000.dtsi -+++ b/arch/riscv/boot/dts/sifive/fu540-c000.dtsi -@@ -129,6 +129,30 @@ - interrupt-controller; - }; - }; -+ -+ cpu-map { -+ cluster0 { -+ core0 { -+ cpu = <&cpu0>; -+ }; -+ -+ core1 { -+ cpu = <&cpu1>; -+ }; -+ -+ core2 { -+ cpu = <&cpu2>; -+ }; -+ -+ core3 { -+ cpu = <&cpu3>; -+ }; -+ -+ core4 { -+ cpu = <&cpu4>; -+ }; -+ }; -+ }; - }; - soc { - #address-cells = <2>; --- -2.35.1 - diff --git a/queue-5.4/series b/queue-5.4/series index 9d0f9007346..2e2e8d52d1a 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -370,7 +370,6 @@ lib-list_debug.c-detect-uninitialized-lists.patch tty-serial-fix-refcount-leak-bug-in-ucc_uart.c.patch vfio-clear-the-caps-buf-to-null-after-free.patch mips-cavium-octeon-fix-missing-of_node_put-in-octeon.patch -riscv-dts-sifive-add-fu540-topology-information.patch riscv-mmap-with-prot_write-but-no-prot_read-is-inval.patch risc-v-add-fast-call-path-of-crash_kexec.patch watchdog-export-lockup_detector_reconfigure.patch