OpenSDV
/
original_kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

riscv: smp: Add 64bit hartid support on RV64 

The hartid can be a 64bit value on RV64 platforms.

Modify the hartid parameter in riscv_hartid_to_cpuid() as
unsigned long so that it can hold 64bit value on RV64 platforms.

Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
Reviewed-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Atish Patra <atishp@rivosinc.com>
Link: https://lore.kernel.org/r/20220527051743.2829940-4-sunilvl@ventanamicro.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
This commit is contained in:
Sunil V L 2022-05-27 10:47:41 +05:30 committed by Palmer Dabbelt
parent c029e487e7
commit 62750eae41
No known key found for this signature in database
GPG Key ID: EF4CA1502CCBAB41
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/riscv/include/asm/smp.h
View File

@ -42,7 +42,7 @@ void arch_send_call_function_ipi_mask(struct cpumask *mask);
/* Hook for the generic smp_call_function_single() routine. */ /* Hook for the generic smp_call_function_single() routine. */
void arch_send_call_function_single_ipi(int cpu); void arch_send_call_function_single_ipi(int cpu);
int riscv_hartid_to_cpuid(int hartid); int riscv_hartid_to_cpuid(unsigned long hartid);
/* Set custom IPI operations */ /* Set custom IPI operations */
void riscv_set_ipi_ops(const struct riscv_ipi_ops *ops); void riscv_set_ipi_ops(const struct riscv_ipi_ops *ops);
@ -70,7 +70,7 @@ static inline void show_ipi_stats(struct seq_file *p, int prec)
{ {
} }
static inline int riscv_hartid_to_cpuid(int hartid) static inline int riscv_hartid_to_cpuid(unsigned long hartid)
{ {
if (hartid == boot_cpu_hartid) if (hartid == boot_cpu_hartid)
return 0; return 0;

4
arch/riscv/kernel/smp.c
View File

@ -47,7 +47,7 @@ static struct {
unsigned long bits ____cacheline_aligned; unsigned long bits ____cacheline_aligned;
} ipi_data[NR_CPUS] __cacheline_aligned; } ipi_data[NR_CPUS] __cacheline_aligned;
int riscv_hartid_to_cpuid(int hartid) int riscv_hartid_to_cpuid(unsigned long hartid)
{ {
int i; int i;
@ -55,7 +55,7 @@ int riscv_hartid_to_cpuid(int hartid)
if (cpuid_to_hartid_map(i) == hartid) if (cpuid_to_hartid_map(i) == hartid)
return i; return i;
pr_err("Couldn't find cpu id for hartid [%d]\n", hartid); pr_err("Couldn't find cpu id for hartid [%lu]\n", hartid);
return -ENOENT; return -ENOENT;
} }