kevin/linux
1
Fork 0
Code

riscv: Add vendor extensions to /proc/cpuinfo

Browse Source 
All of the supported vendor extensions that have been listed in
riscv_isa_vendor_ext_list can be exported through /proc/cpuinfo.

Signed-off-by: Charlie Jenkins <charlie@rivosinc.com>
Reviewed-by: Evan Green <evan@rivosinc.com>
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
Link: https://lore.kernel.org/r/20240719-support_vendor_extensions-v3-2-0af7587bbec0@rivosinc.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
This commit is contained in:
Charlie Jenkins 2024-07-19 09:15:19 -07:00 committed by Palmer Dabbelt
parent 23c996fc2b
commit 9448d9accd
No known key found for this signature in database
GPG Key ID: 2E1319F35FBB1889
1 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
arch/riscv/kernel/cpu.c
View File

@ -16,6 +16,7 @@
#include <asm/sbi.h> #include <asm/sbi.h>
#include <asm/smp.h> #include <asm/smp.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/vendor_extensions.h>
bool arch_match_cpu_phys_id(int cpu, u64 phys_id) bool arch_match_cpu_phys_id(int cpu, u64 phys_id)
{ {
@ -235,7 +236,33 @@ arch_initcall(riscv_cpuinfo_init);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
static void print_isa(struct seq_file *f, const unsigned long *isa_bitmap) #define ALL_CPUS -1
static void print_vendor_isa(struct seq_file *f, int cpu)
{
struct riscv_isavendorinfo *vendor_bitmap;
struct riscv_isa_vendor_ext_data_list *ext_list;
const struct riscv_isa_ext_data *ext_data;
for (int i = 0; i < riscv_isa_vendor_ext_list_size; i++) {
ext_list = riscv_isa_vendor_ext_list[i];
ext_data = riscv_isa_vendor_ext_list[i]->ext_data;
if (cpu == ALL_CPUS)
vendor_bitmap = &ext_list->all_harts_isa_bitmap;
else
vendor_bitmap = &ext_list->per_hart_isa_bitmap[cpu];
for (int j = 0; j < ext_list->ext_data_count; j++) {
if (!__riscv_isa_extension_available(vendor_bitmap->isa, ext_data[j].id))
continue;
seq_printf(f, "_%s", ext_data[j].name);
}
}
}
static void print_isa(struct seq_file *f, const unsigned long *isa_bitmap, int cpu)
{ {
if (IS_ENABLED(CONFIG_32BIT)) if (IS_ENABLED(CONFIG_32BIT))
@ -254,6 +281,8 @@ static void print_isa(struct seq_file *f, const unsigned long *isa_bitmap)
seq_printf(f, "%s", riscv_isa_ext[i].name); seq_printf(f, "%s", riscv_isa_ext[i].name);
} }
print_vendor_isa(f, cpu);
seq_puts(f, "\n"); seq_puts(f, "\n");
} }
@ -316,7 +345,7 @@ static int c_show(struct seq_file *m, void *v)
* line. * line.
*/ */
seq_puts(m, "isa\t\t: "); seq_puts(m, "isa\t\t: ");
print_isa(m, NULL); print_isa(m, NULL, ALL_CPUS);
print_mmu(m); print_mmu(m);
if (acpi_disabled) { if (acpi_disabled) {
@ -338,7 +367,7 @@ static int c_show(struct seq_file *m, void *v)
* additional extensions not present across all harts. * additional extensions not present across all harts.
*/ */
seq_puts(m, "hart isa\t: "); seq_puts(m, "hart isa\t: ");
print_isa(m, hart_isa[cpu_id].isa); print_isa(m, hart_isa[cpu_id].isa, cpu_id);
seq_puts(m, "\n"); seq_puts(m, "\n");
return 0; return 0;