869c706092
Use what is currently the SMP=y version of riscv_cpuid_to_hartid_mask()
for both SMP=y and SMP=n to fix a build failure with KVM=m and SMP=n due
to boot_cpu_hartid not being exported. This also fixes a second bug
where the SMP=n version assumes the sole CPU in the system is in the
incoming mask, which may not hold true in kvm_riscv_vcpu_sbi_ecall() if
the KVM guest VM has multiple vCPUs (on a SMP=n system).
Fixes: 1ef46c231d ("RISC-V: Implement new SBI v0.2 extensions")
Reported-by: Adam Borowski <kilobyte@angband.pl>
Reviewed-by: Anup Patel <anup.patel@wdc.com>
Signed-off-by: Sean Christopherson <seanjc@google.com>
Cc: stable@vger.kernel.org
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
107 lines
2.3 KiB
C
107 lines
2.3 KiB
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
/*
|
|
* Copyright (C) 2012 Regents of the University of California
|
|
*/
|
|
|
|
#ifndef _ASM_RISCV_SMP_H
|
|
#define _ASM_RISCV_SMP_H
|
|
|
|
#include <linux/cpumask.h>
|
|
#include <linux/irqreturn.h>
|
|
#include <linux/thread_info.h>
|
|
|
|
#define INVALID_HARTID ULONG_MAX
|
|
|
|
struct seq_file;
|
|
extern unsigned long boot_cpu_hartid;
|
|
|
|
struct riscv_ipi_ops {
|
|
void (*ipi_inject)(const struct cpumask *target);
|
|
void (*ipi_clear)(void);
|
|
};
|
|
|
|
#ifdef CONFIG_SMP
|
|
/*
|
|
* Mapping between linux logical cpu index and hartid.
|
|
*/
|
|
extern unsigned long __cpuid_to_hartid_map[NR_CPUS];
|
|
#define cpuid_to_hartid_map(cpu) __cpuid_to_hartid_map[cpu]
|
|
|
|
/* print IPI stats */
|
|
void show_ipi_stats(struct seq_file *p, int prec);
|
|
|
|
/* SMP initialization hook for setup_arch */
|
|
void __init setup_smp(void);
|
|
|
|
/* Called from C code, this handles an IPI. */
|
|
void handle_IPI(struct pt_regs *regs);
|
|
|
|
/* Hook for the generic smp_call_function_many() routine. */
|
|
void arch_send_call_function_ipi_mask(struct cpumask *mask);
|
|
|
|
/* Hook for the generic smp_call_function_single() routine. */
|
|
void arch_send_call_function_single_ipi(int cpu);
|
|
|
|
int riscv_hartid_to_cpuid(int hartid);
|
|
|
|
/* Set custom IPI operations */
|
|
void riscv_set_ipi_ops(const struct riscv_ipi_ops *ops);
|
|
|
|
/* Clear IPI for current CPU */
|
|
void riscv_clear_ipi(void);
|
|
|
|
/* Secondary hart entry */
|
|
asmlinkage void smp_callin(void);
|
|
|
|
/*
|
|
* Obtains the hart ID of the currently executing task. This relies on
|
|
* THREAD_INFO_IN_TASK, but we define that unconditionally.
|
|
*/
|
|
#define raw_smp_processor_id() (current_thread_info()->cpu)
|
|
|
|
#if defined CONFIG_HOTPLUG_CPU
|
|
int __cpu_disable(void);
|
|
void __cpu_die(unsigned int cpu);
|
|
#endif /* CONFIG_HOTPLUG_CPU */
|
|
|
|
#else
|
|
|
|
static inline void show_ipi_stats(struct seq_file *p, int prec)
|
|
{
|
|
}
|
|
|
|
static inline int riscv_hartid_to_cpuid(int hartid)
|
|
{
|
|
if (hartid == boot_cpu_hartid)
|
|
return 0;
|
|
|
|
return -1;
|
|
}
|
|
static inline unsigned long cpuid_to_hartid_map(int cpu)
|
|
{
|
|
return boot_cpu_hartid;
|
|
}
|
|
|
|
static inline void riscv_set_ipi_ops(const struct riscv_ipi_ops *ops)
|
|
{
|
|
}
|
|
|
|
static inline void riscv_clear_ipi(void)
|
|
{
|
|
}
|
|
|
|
#endif /* CONFIG_SMP */
|
|
|
|
void riscv_cpuid_to_hartid_mask(const struct cpumask *in, struct cpumask *out);
|
|
|
|
#if defined(CONFIG_HOTPLUG_CPU) && (CONFIG_SMP)
|
|
bool cpu_has_hotplug(unsigned int cpu);
|
|
#else
|
|
static inline bool cpu_has_hotplug(unsigned int cpu)
|
|
{
|
|
return false;
|
|
}
|
|
#endif
|
|
|
|
#endif /* _ASM_RISCV_SMP_H */
|