RISC-V: Use Linux logical CPU number instead of hartid

Setup the cpu_logical_map during boot. Moreover, every SBI call
and PLIC context are based on the physical hartid. Use the logical
CPU to hartid mapping to pass correct hartid to respective functions.

Signed-off-by: Atish Patra <atish.patra@wdc.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Palmer Dabbelt <palmer@sifive.com>

1 files changed, 5 insertions, 3 deletions

diff --git a/arch/riscv/kernel/cpu.c b/arch/riscv/kernel/cpu.c
index 4723e235dcaa..cccc6f61c538 100644
--- a/arch/riscv/kernel/cpu.c
+++ b/arch/riscv/kernel/cpu.c
@@ -14,6 +14,7 @@
 #include <linux/init.h>
 #include <linux/seq_file.h>
 #include <linux/of.h>
+#include <asm/smp.h>
 
 /*
  * Returns the hart ID of the given device tree node, or -1 if the device tree
@@ -138,11 +139,12 @@ static void c_stop(struct seq_file *m, void *v)
 
 static int c_show(struct seq_file *m, void *v)
 {
-        unsigned long hart_id = (unsigned long)v - 1;
-        struct device_node *node = of_get_cpu_node(hart_id, NULL);
+        unsigned long cpu_id = (unsigned long)v - 1;
+        struct device_node *node = of_get_cpu_node(cpuid_to_hartid_map(cpu_id),
+                                                   NULL);
         const char *compat, *isa, *mmu;
 
-        seq_printf(m, "hart\t: %lu\n", hart_id);
+        seq_printf(m, "hart\t: %lu\n", cpu_id);
         if (!of_property_read_string(node, "riscv,isa", &isa))
                 print_isa(m, isa);
         if (!of_property_read_string(node, "mmu-type", &mmu))