Unverified Commit 4c540c92 authored by Palmer Dabbelt's avatar Palmer Dabbelt
Browse files

RISC-V: Add mvendorid, marchid, and mimpid to /proc/cpuinfo output 

I'm merging this in as a single commit as it's a dependency for some
other work.

* commit '3baca1a4':
  RISC-V: Add mvendorid, marchid, and mimpid to /proc/cpuinfo output
parents 8aeb7b17 3baca1a4

arch/riscv/kernel/cpu.c

+51 −0
Original line number Diff line number Diff line
@@ -3,10 +3,13 @@ 
 * Copyright (C) 2012 Regents of the University of California

 */



#include <linux/cpu.h>

#include <linux/init.h>

#include <linux/seq_file.h>

#include <linux/of.h>

#include <asm/csr.h>

#include <asm/hwcap.h>

#include <asm/sbi.h>

#include <asm/smp.h>

#include <asm/pgtable.h>
@@ -68,6 +71,50 @@ int riscv_of_parent_hartid(struct device_node *node, unsigned long *hartid) 
}



#ifdef CONFIG_PROC_FS



struct riscv_cpuinfo {

	unsigned long mvendorid;

	unsigned long marchid;

	unsigned long mimpid;

};

static DEFINE_PER_CPU(struct riscv_cpuinfo, riscv_cpuinfo);



static int riscv_cpuinfo_starting(unsigned int cpu)

{

	struct riscv_cpuinfo *ci = this_cpu_ptr(&riscv_cpuinfo);



#if IS_ENABLED(CONFIG_RISCV_SBI)

	ci->mvendorid = sbi_spec_is_0_1() ? 0 : sbi_get_mvendorid();

	ci->marchid = sbi_spec_is_0_1() ? 0 : sbi_get_marchid();

	ci->mimpid = sbi_spec_is_0_1() ? 0 : sbi_get_mimpid();

#elif IS_ENABLED(CONFIG_RISCV_M_MODE)

	ci->mvendorid = csr_read(CSR_MVENDORID);

	ci->marchid = csr_read(CSR_MARCHID);

	ci->mimpid = csr_read(CSR_MIMPID);

#else

	ci->mvendorid = 0;

	ci->marchid = 0;

	ci->mimpid = 0;

#endif



	return 0;

}



static int __init riscv_cpuinfo_init(void)

{

	int ret;



	ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "riscv/cpuinfo:starting",

				riscv_cpuinfo_starting, NULL);

	if (ret < 0) {

		pr_err("cpuinfo: failed to register hotplug callbacks.\n");

		return ret;

	}



	return 0;

}

device_initcall(riscv_cpuinfo_init);



#define __RISCV_ISA_EXT_DATA(UPROP, EXTID) \

	{							\

		.uprop = #UPROP,				\
@@ -185,6 +232,7 @@ 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(cpu_id, NULL);

	struct riscv_cpuinfo *ci = per_cpu_ptr(&riscv_cpuinfo, cpu_id);

	const char *compat, *isa;



	seq_printf(m, "processor\t: %lu\n", cpu_id);
@@ -195,6 +243,9 @@ static int c_show(struct seq_file *m, void *v) 
	if (!of_property_read_string(node, "compatible", &compat)

	    && strcmp(compat, "riscv"))

		seq_printf(m, "uarch\t\t: %s\n", compat);

	seq_printf(m, "mvendorid\t: 0x%lx\n", ci->mvendorid);

	seq_printf(m, "marchid\t\t: 0x%lx\n", ci->marchid);

	seq_printf(m, "mimpid\t\t: 0x%lx\n", ci->mimpid);

	seq_puts(m, "\n");

	of_node_put(node);