Unverified Commit 8916c905 authored by Palmer Dabbelt's avatar Palmer Dabbelt
Browse files

RISC-V: Support for 64bit hartid on RV64 platforms 

The hartid can be a 64bit value on RV64 platforms. This series updates
the code so that 64bit hartid can be supported on RV64 platforms.

* 'riscv-64bit_hartid' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/linux.git:
  riscv/efi_stub: Add 64bit boot-hartid support on RV64
  riscv: cpu: Add 64bit hartid support on RV64
  riscv: smp: Add 64bit hartid support on RV64
  riscv: spinwait: Fix hartid variable type
  riscv: cpu_ops_sbi: Add 64bit hartid support on RV64
parents b4981661 171549f8

arch/riscv/include/asm/processor.h

+2 −2
Original line number Diff line number Diff line
@@ -79,8 +79,8 @@ static inline void wait_for_interrupt(void) 
}



struct device_node;

int riscv_of_processor_hartid(struct device_node *node);

int riscv_of_parent_hartid(struct device_node *node);

int riscv_of_processor_hartid(struct device_node *node, unsigned long *hartid);

int riscv_of_parent_hartid(struct device_node *node, unsigned long *hartid);



extern void riscv_fill_hwcap(void);

extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);

arch/riscv/include/asm/smp.h

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 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);

int riscv_hartid_to_cpuid(unsigned long hartid);



/* Set custom IPI operations */

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)

		return 0;

arch/riscv/kernel/cpu.c

+15 −11
Original line number Diff line number Diff line
@@ -14,37 +14,36 @@ 
 * Returns the hart ID of the given device tree node, or -ENODEV if the node

 * isn't an enabled and valid RISC-V hart node.

 */

int riscv_of_processor_hartid(struct device_node *node)

int riscv_of_processor_hartid(struct device_node *node, unsigned long *hart)

{

	const char *isa;

	u32 hart;



	if (!of_device_is_compatible(node, "riscv")) {

		pr_warn("Found incompatible CPU\n");

		return -ENODEV;

	}



	hart = of_get_cpu_hwid(node, 0);

	if (hart == ~0U) {

	*hart = (unsigned long) of_get_cpu_hwid(node, 0);

	if (*hart == ~0UL) {

		pr_warn("Found CPU without hart ID\n");

		return -ENODEV;

	}



	if (!of_device_is_available(node)) {

		pr_info("CPU with hartid=%d is not available\n", hart);

		pr_info("CPU with hartid=%lu is not available\n", *hart);

		return -ENODEV;

	}



	if (of_property_read_string(node, "riscv,isa", &isa)) {

		pr_warn("CPU with hartid=%d has no \"riscv,isa\" property\n", hart);

		pr_warn("CPU with hartid=%lu has no \"riscv,isa\" property\n", *hart);

		return -ENODEV;

	}

	if (isa[0] != 'r' || isa[1] != 'v') {

		pr_warn("CPU with hartid=%d has an invalid ISA of \"%s\"\n", hart, isa);

		pr_warn("CPU with hartid=%lu has an invalid ISA of \"%s\"\n", *hart, isa);

		return -ENODEV;

	}



	return hart;

	return 0;

}



/*
@@ -53,11 +52,16 @@ int riscv_of_processor_hartid(struct device_node *node) 
 * To achieve this, we walk up the DT tree until we find an active

 * RISC-V core (HART) node and extract the cpuid from it.

 */

int riscv_of_parent_hartid(struct device_node *node)

int riscv_of_parent_hartid(struct device_node *node, unsigned long *hartid)

{

	int rc;



	for (; node; node = node->parent) {

		if (of_device_is_compatible(node, "riscv"))

			return riscv_of_processor_hartid(node);

		if (of_device_is_compatible(node, "riscv")) {

			rc = riscv_of_processor_hartid(node, hartid);

			if (!rc)

				return 0;

		}

	}



	return -1;

arch/riscv/kernel/cpu_ops_sbi.c

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static int sbi_hsm_hart_get_status(unsigned long hartid) 
static int sbi_cpu_start(unsigned int cpuid, struct task_struct *tidle)

{

	unsigned long boot_addr = __pa_symbol(secondary_start_sbi);

	int hartid = cpuid_to_hartid_map(cpuid);

	unsigned long hartid = cpuid_to_hartid_map(cpuid);

	unsigned long hsm_data;

	struct sbi_hart_boot_data *bdata = &per_cpu(boot_data, cpuid);
@@ -107,7 +107,7 @@ static void sbi_cpu_stop(void) 
static int sbi_cpu_is_stopped(unsigned int cpuid)

{

	int rc;

	int hartid = cpuid_to_hartid_map(cpuid);

	unsigned long hartid = cpuid_to_hartid_map(cpuid);



	rc = sbi_hsm_hart_get_status(hartid);

arch/riscv/kernel/cpu_ops_spinwait.c

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ void *__cpu_spinwait_task_pointer[NR_CPUS] __section(".data"); 
static void cpu_update_secondary_bootdata(unsigned int cpuid,

				   struct task_struct *tidle)

{

	int hartid = cpuid_to_hartid_map(cpuid);

	unsigned long hartid = cpuid_to_hartid_map(cpuid);



	/*

	 * The hartid must be less than NR_CPUS to avoid out-of-bound access
@@ -27,7 +27,7 @@ static void cpu_update_secondary_bootdata(unsigned int cpuid, 
	 * spinwait booting is not the recommended approach for any platforms

	 * booting Linux in S-mode and can be disabled in the future.

	 */

	if (hartid == INVALID_HARTID || hartid >= NR_CPUS)

	if (hartid == INVALID_HARTID || hartid >= (unsigned long) NR_CPUS)

		return;



	/* Make sure tidle is updated */