aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnup Patel <apatel@ventanamicro.com>2023-11-28 20:26:24 +0530
committerWill Deacon <will@kernel.org>2024-02-09 15:45:22 +0000
commit3436684940bc4359d5aed6c28992f5af91448929 (patch)
tree8faa6bf9315312c124eb35652eb2e79e5ad98d26
parent667685691c5dc9a4144feb008ebff71d5f7b1e68 (diff)
downloadkvmtool-3436684940bc4359d5aed6c28992f5af91448929.tar.gz
riscv: Add Zicsr and Zifencei extension support
When the Zicsr and Zifencei extension is available expose it to the guest via device tree so that guest can use it. Signed-off-by: Anup Patel <apatel@ventanamicro.com> Link: https://lore.kernel.org/r/20231128145628.413414-7-apatel@ventanamicro.com Signed-off-by: Will Deacon <will@kernel.org>
-rw-r--r--riscv/fdt.c2
-rw-r--r--riscv/include/kvm/kvm-config-arch.h6
2 files changed, 8 insertions, 0 deletions
diff --git a/riscv/fdt.c b/riscv/fdt.c
index 19786afb..a4d54eb0 100644
--- a/riscv/fdt.c
+++ b/riscv/fdt.c
@@ -27,6 +27,8 @@ struct isa_ext_info isa_info_arr[] = {
{"zicbom", KVM_RISCV_ISA_EXT_ZICBOM},
{"zicboz", KVM_RISCV_ISA_EXT_ZICBOZ},
{"zicntr", KVM_RISCV_ISA_EXT_ZICNTR},
+ {"zicsr", KVM_RISCV_ISA_EXT_ZICSR},
+ {"zifencei", KVM_RISCV_ISA_EXT_ZIFENCEI},
{"zihintpause", KVM_RISCV_ISA_EXT_ZIHINTPAUSE},
{"zihpm", KVM_RISCV_ISA_EXT_ZIHPM},
};
diff --git a/riscv/include/kvm/kvm-config-arch.h b/riscv/include/kvm/kvm-config-arch.h
index af5c4b8b..c5247710 100644
--- a/riscv/include/kvm/kvm-config-arch.h
+++ b/riscv/include/kvm/kvm-config-arch.h
@@ -58,6 +58,12 @@ struct kvm_config_arch {
OPT_BOOLEAN('\0', "disable-zicntr", \
&(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_ZICNTR], \
"Disable Zicntr Extension"), \
+ OPT_BOOLEAN('\0', "disable-zicsr", \
+ &(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_ZICSR], \
+ "Disable Zicsr Extension"), \
+ OPT_BOOLEAN('\0', "disable-zifencei", \
+ &(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_ZIFENCEI], \
+ "Disable Zifencei Extension"), \
OPT_BOOLEAN('\0', "disable-zihintpause", \
&(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_ZIHINTPAUSE],\
"Disable Zihintpause Extension"), \