Commit 396c0183 authored by Sunil V L's avatar Sunil V L Committed by Palmer Dabbelt

RISC-V: cpufeature: Add ACPI support in riscv_fill_hwcap()

On ACPI based systems, the information about the hart
like ISA is provided by the RISC-V Hart Capabilities Table (RHCT).
Enable filling up hwcap structure based on the information in RHCT.
Signed-off-by: default avatarSunil V L <sunilvl@ventanamicro.com>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarAndrew Jones <ajones@ventanamicro.com>
Reviewed-by: default avatarConor Dooley <conor.dooley@microchip.com>
Link: https://lore.kernel.org/r/20230515054928.2079268-15-sunilvl@ventanamicro.comSigned-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent 914d6f44
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
* Copyright (C) 2017 SiFive * Copyright (C) 2017 SiFive
*/ */
#include <linux/acpi.h>
#include <linux/bitmap.h> #include <linux/bitmap.h>
#include <linux/ctype.h> #include <linux/ctype.h>
#include <linux/log2.h> #include <linux/log2.h>
...@@ -13,6 +14,7 @@ ...@@ -13,6 +14,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <asm/acpi.h>
#include <asm/alternative.h> #include <asm/alternative.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/cpufeature.h> #include <asm/cpufeature.h>
...@@ -100,6 +102,8 @@ void __init riscv_fill_hwcap(void) ...@@ -100,6 +102,8 @@ void __init riscv_fill_hwcap(void)
char print_str[NUM_ALPHA_EXTS + 1]; char print_str[NUM_ALPHA_EXTS + 1];
int i, j, rc; int i, j, rc;
unsigned long isa2hwcap[26] = {0}; unsigned long isa2hwcap[26] = {0};
struct acpi_table_header *rhct;
acpi_status status;
unsigned int cpu; unsigned int cpu;
isa2hwcap['i' - 'a'] = COMPAT_HWCAP_ISA_I; isa2hwcap['i' - 'a'] = COMPAT_HWCAP_ISA_I;
...@@ -113,22 +117,36 @@ void __init riscv_fill_hwcap(void) ...@@ -113,22 +117,36 @@ void __init riscv_fill_hwcap(void)
bitmap_zero(riscv_isa, RISCV_ISA_EXT_MAX); bitmap_zero(riscv_isa, RISCV_ISA_EXT_MAX);
if (!acpi_disabled) {
status = acpi_get_table(ACPI_SIG_RHCT, 0, &rhct);
if (ACPI_FAILURE(status))
return;
}
for_each_possible_cpu(cpu) { for_each_possible_cpu(cpu) {
unsigned long this_hwcap = 0; unsigned long this_hwcap = 0;
DECLARE_BITMAP(this_isa, RISCV_ISA_EXT_MAX); DECLARE_BITMAP(this_isa, RISCV_ISA_EXT_MAX);
const char *temp; const char *temp;
node = of_cpu_device_node_get(cpu); if (acpi_disabled) {
if (!node) { node = of_cpu_device_node_get(cpu);
pr_warn("Unable to find cpu node\n"); if (!node) {
continue; pr_warn("Unable to find cpu node\n");
} continue;
}
rc = of_property_read_string(node, "riscv,isa", &isa); rc = of_property_read_string(node, "riscv,isa", &isa);
of_node_put(node); of_node_put(node);
if (rc) { if (rc) {
pr_warn("Unable to find \"riscv,isa\" devicetree entry\n"); pr_warn("Unable to find \"riscv,isa\" devicetree entry\n");
continue; continue;
}
} else {
rc = acpi_get_riscv_isa(rhct, cpu, &isa);
if (rc < 0) {
pr_warn("Unable to get ISA for the hart - %d\n", cpu);
continue;
}
} }
temp = isa; temp = isa;
...@@ -265,6 +283,9 @@ void __init riscv_fill_hwcap(void) ...@@ -265,6 +283,9 @@ void __init riscv_fill_hwcap(void)
bitmap_and(riscv_isa, riscv_isa, this_isa, RISCV_ISA_EXT_MAX); bitmap_and(riscv_isa, riscv_isa, this_isa, RISCV_ISA_EXT_MAX);
} }
if (!acpi_disabled && rhct)
acpi_put_table((struct acpi_table_header *)rhct);
/* We don't support systems with F but without D, so mask those out /* We don't support systems with F but without D, so mask those out
* here. */ * here. */
if ((elf_hwcap & COMPAT_HWCAP_ISA_F) && !(elf_hwcap & COMPAT_HWCAP_ISA_D)) { if ((elf_hwcap & COMPAT_HWCAP_ISA_F) && !(elf_hwcap & COMPAT_HWCAP_ISA_D)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment