From: Álvaro Fernández Rojas Date: Mon, 1 Mar 2021 16:26:00 +0000 (+0100) Subject: bmips: switch to upstream SMP CPU mappings patch X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=584ce6b2a0f5832689dba9cb65b8f75fcaf9f8a4;p=openwrt%2Fstaging%2Fneocturne.git bmips: switch to upstream SMP CPU mappings patch The patch has been accepted upstream with some minor modifications. Signed-off-by: Álvaro Fernández Rojas --- diff --git a/target/linux/bmips/patches-5.10/050-v5.13-mips-smp-bmips-fix-CPU-mappings.patch b/target/linux/bmips/patches-5.10/050-v5.13-mips-smp-bmips-fix-CPU-mappings.patch new file mode 100644 index 0000000000..6ae4330439 --- /dev/null +++ b/target/linux/bmips/patches-5.10/050-v5.13-mips-smp-bmips-fix-CPU-mappings.patch @@ -0,0 +1,60 @@ +From c0f41a0dac1f3db6c40aabc0f3ac8868709ba6a6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= +Date: Wed, 24 Feb 2021 08:33:36 +0100 +Subject: [PATCH] mips: smp-bmips: fix CPU mappings +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When booting bmips with SMP enabled on a BCM6358 running on CPU #1 instead of +CPU #0, the current CPU mapping code produces the following: +- smp_processor_id(): 0 +- cpu_logical_map(0): 1 +- cpu_number_map(0): 1 + +This is because SMP isn't supported on BCM6358 since it has a shared TLB, so +it is disabled and max_cpus is decreased from 2 to 1. + +Signed-off-by: Álvaro Fernández Rojas +Reviewed-by: Florian Fainelli +Signed-off-by: Thomas Bogendoerfer +--- + arch/mips/kernel/smp-bmips.c | 27 +++++++++++++++++---------- + 1 file changed, 17 insertions(+), 10 deletions(-) + +--- a/arch/mips/kernel/smp-bmips.c ++++ b/arch/mips/kernel/smp-bmips.c +@@ -134,17 +134,24 @@ static void __init bmips_smp_setup(void) + if (!board_ebase_setup) + board_ebase_setup = &bmips_ebase_setup; + +- __cpu_number_map[boot_cpu] = 0; +- __cpu_logical_map[0] = boot_cpu; ++ if (max_cpus > 1) { ++ __cpu_number_map[boot_cpu] = 0; ++ __cpu_logical_map[0] = boot_cpu; + +- for (i = 0; i < max_cpus; i++) { +- if (i != boot_cpu) { +- __cpu_number_map[i] = cpu; +- __cpu_logical_map[cpu] = i; +- cpu++; ++ for (i = 0; i < max_cpus; i++) { ++ if (i != boot_cpu) { ++ __cpu_number_map[i] = cpu; ++ __cpu_logical_map[cpu] = i; ++ cpu++; ++ } ++ set_cpu_possible(i, 1); ++ set_cpu_present(i, 1); + } +- set_cpu_possible(i, 1); +- set_cpu_present(i, 1); ++ } else { ++ __cpu_number_map[0] = boot_cpu; ++ __cpu_logical_map[0] = 0; ++ set_cpu_possible(0, 1); ++ set_cpu_present(0, 1); + } + } + diff --git a/target/linux/bmips/patches-5.10/200-mips-smp-bmips-fix-CPU-mappings.patch b/target/linux/bmips/patches-5.10/200-mips-smp-bmips-fix-CPU-mappings.patch deleted file mode 100644 index 16232f8b04..0000000000 --- a/target/linux/bmips/patches-5.10/200-mips-smp-bmips-fix-CPU-mappings.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 56e3adab09cbadb30045893c10ec2ff0d629bc6f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= -Date: Tue, 23 Feb 2021 13:41:12 +0100 -Subject: [PATCH] mips: smp-bmips: fix CPU mappings -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When booting bmips with SMP enabled on a BCM6358 running on CPU #1 instead of -CPU #0, the current CPU mapping code produces the following: -- smp_processor_id(): 0 -- cpu_logical_map(): 1 -- cpu_number_map(): 1 - -This is because SMP isn't supported on BCM6358 since it has a shared TLB, so -it is disabled and max_cpus is decreased from 2 to 1. - -Signed-off-by: Álvaro Fernández Rojas ---- - arch/mips/kernel/smp-bmips.c | 27 +++++++++++++++++---------- - 1 file changed, 17 insertions(+), 10 deletions(-) - ---- a/arch/mips/kernel/smp-bmips.c -+++ b/arch/mips/kernel/smp-bmips.c -@@ -134,17 +134,24 @@ static void __init bmips_smp_setup(void) - if (!board_ebase_setup) - board_ebase_setup = &bmips_ebase_setup; - -- __cpu_number_map[boot_cpu] = 0; -- __cpu_logical_map[0] = boot_cpu; -+ if (max_cpus > 1) { -+ __cpu_number_map[boot_cpu] = 0; -+ __cpu_logical_map[0] = boot_cpu; - -- for (i = 0; i < max_cpus; i++) { -- if (i != boot_cpu) { -- __cpu_number_map[i] = cpu; -- __cpu_logical_map[cpu] = i; -- cpu++; -+ for (i = 0; i < max_cpus; i++) { -+ if (i != boot_cpu) { -+ __cpu_number_map[i] = cpu; -+ __cpu_logical_map[cpu] = i; -+ cpu++; -+ } -+ set_cpu_possible(i, 1); -+ set_cpu_present(i, 1); - } -- set_cpu_possible(i, 1); -- set_cpu_present(i, 1); -+ } else { -+ __cpu_number_map[0] = boot_cpu; -+ __cpu_logical_map[0] = 0; -+ set_cpu_possible(0, 1); -+ set_cpu_possible(0, 1); - } - } -