Unverified Commit 70114560 authored Apr 24, 2019 by Atish Patra Committed by Palmer Dabbelt Apr 30, 2019

RISC-V: Add RISC-V specific arch_match_cpu_phys_id



OF/DT core has a hook for architecture specific logical cpuid to hartid
mapping. By implementing this, we can pass the logical cpu id to cpu
node parsing functions.

Fix the instances where logical cpuid is expected as an argument in
of_get_cpu_node.

Signed-off-by: Atish Patra <atish.patra@wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Palmer Dabbelt <palmer@sifive.com>

parent fd7f744c

arch/riscv/kernel/cpu.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -136,8 +136,7 @@ static void c_stop(struct seq_file m, void v)
		static int c_show(struct seq_file m, void v)
		{
		unsigned long cpu_id = (unsigned long)v - 1;
		struct device_node *node = of_get_cpu_node(cpuid_to_hartid_map(cpu_id),
		NULL);
		struct device_node *node = of_get_cpu_node(cpu_id, NULL);
		const char compat, isa, *mmu;

		seq_printf(m, "processor\t: %lu\n", cpu_id);

arch/riscv/kernel/smp.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -70,6 +70,12 @@ void riscv_cpuid_to_hartid_mask(const struct cpumask in, struct cpumask out)
		for_each_cpu(cpu, in)
		cpumask_set_cpu(cpuid_to_hartid_map(cpu), out);
		}

		bool arch_match_cpu_phys_id(int cpu, u64 phys_id)
		{
		return phys_id == cpuid_to_hartid_map(cpu);
		}

		/* Unsupported */
		int setup_profiling_timer(unsigned int multiplier)
		{