Unverified Commit ff77cf5b authored by Evan Green's avatar Evan Green Committed by Palmer Dabbelt
Browse files

RISC-V: Move struct riscv_cpuinfo to new header 



In preparation for tracking and exposing microarchitectural details to
userspace (like whether or not unaligned accesses are fast), move the
riscv_cpuinfo struct out to its own new cpufeatures.h header. It will
need to be used by more than just cpu.c.

Signed-off-by: default avatarEvan Green <evan@rivosinc.com>
Reviewed-by: default avatarConor Dooley <conor.dooley@microchip.com>
Reviewed-by: default avatarHeiko Stuebner <heiko.stuebner@vrull.eu>
Tested-by: default avatarHeiko Stuebner <heiko.stuebner@vrull.eu>
Reviewed-by: default avatarPaul Walmsley <paul.walmsley@sifive.com>
Link: https://lore.kernel.org/r/20230407231103.2622178-2-evan@rivosinc.com


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent fe15c26e

arch/riscv/include/asm/cpufeature.h

0 → 100644
+21 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright 2022-2023 Rivos, Inc

 */



#ifndef _ASM_CPUFEATURE_H

#define _ASM_CPUFEATURE_H



/*

 * These are probed via a device_initcall(), via either the SBI or directly

 * from the corresponding CSRs.

 */

struct riscv_cpuinfo {

	unsigned long mvendorid;

	unsigned long marchid;

	unsigned long mimpid;

};



DECLARE_PER_CPU(struct riscv_cpuinfo, riscv_cpuinfo);



#endif

arch/riscv/kernel/cpu.c

+2 −6
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/init.h>

#include <linux/seq_file.h>

#include <linux/of.h>

#include <asm/cpufeature.h>

#include <asm/csr.h>

#include <asm/hwcap.h>

#include <asm/sbi.h>
@@ -70,12 +71,7 @@ int riscv_of_parent_hartid(struct device_node *node, unsigned long *hartid) 
	return -1;

}



struct riscv_cpuinfo {

	unsigned long mvendorid;

	unsigned long marchid;

	unsigned long mimpid;

};

static DEFINE_PER_CPU(struct riscv_cpuinfo, riscv_cpuinfo);

DEFINE_PER_CPU(struct riscv_cpuinfo, riscv_cpuinfo);



unsigned long riscv_cached_mvendorid(unsigned int cpu_id)

{