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, 8 insertions, 4 deletions

diff --git a/drivers/clocksource/riscv_timer.c b/drivers/clocksource/riscv_timer.c
index ad7453fc3129..084e97dc10ed 100644
--- a/drivers/clocksource/riscv_timer.c
+++ b/drivers/clocksource/riscv_timer.c
@@ -8,6 +8,7 @@
 #include <linux/cpu.h>
 #include <linux/delay.h>
 #include <linux/irq.h>
+#include <asm/smp.h>
 #include <asm/sbi.h>
 
 /*
@@ -84,13 +85,16 @@ void riscv_timer_interrupt(void)
 
 static int __init riscv_timer_init_dt(struct device_node *n)
 {
-        int cpu_id = riscv_of_processor_hartid(n), error;
+        int cpuid, hartid, error;
         struct clocksource *cs;
 
-        if (cpu_id != smp_processor_id())
+        hartid = riscv_of_processor_hartid(n);
+        cpuid = riscv_hartid_to_cpuid(hartid);
+
+        if (cpuid != smp_processor_id())
                 return 0;
 
-        cs = per_cpu_ptr(&riscv_clocksource, cpu_id);
+        cs = per_cpu_ptr(&riscv_clocksource, cpuid);
         clocksource_register_hz(cs, riscv_timebase);
 
         error = cpuhp_setup_state(CPUHP_AP_RISCV_TIMER_STARTING,
@@ -98,7 +102,7 @@ static int __init riscv_timer_init_dt(struct device_node *n)
                          riscv_timer_starting_cpu, riscv_timer_dying_cpu);
         if (error)
                 pr_err("RISCV timer register failed [%d] for cpu = [%d]\n",
-                       error, cpu_id);
+                       error, cpuid);
         return error;
 }