Add parsing for Zacas ISA extension which was ratified recently in the riscv-zacas manual. The tests are based on the 6.9 version of the kernel Signed-off-by: Shaoqing Qin <qinshaoqing@xxxxxxxxxx> --- Changed from v1: 1. modify ZACAS enum number. 2. modify the code location,just for formatting. --- riscv/fdt.c | 1 + riscv/include/asm/kvm.h | 1 + riscv/include/kvm/kvm-config-arch.h | 3 +++ 3 files changed, 5 insertions(+) diff --git a/riscv/fdt.c b/riscv/fdt.c index cc8070d..6dfc25b 100644 --- a/riscv/fdt.c +++ b/riscv/fdt.c @@ -22,6 +22,7 @@ struct isa_ext_info isa_info_arr[] = { {"svinval", KVM_RISCV_ISA_EXT_SVINVAL}, {"svnapot", KVM_RISCV_ISA_EXT_SVNAPOT}, {"svpbmt", KVM_RISCV_ISA_EXT_SVPBMT}, + {"zacas", KVM_RISCV_ISA_EXT_ZACAS}, {"zba", KVM_RISCV_ISA_EXT_ZBA}, {"zbb", KVM_RISCV_ISA_EXT_ZBB}, {"zbc", KVM_RISCV_ISA_EXT_ZBC}, diff --git a/riscv/include/asm/kvm.h b/riscv/include/asm/kvm.h index 7499e88..6b2cbe7 100644 --- a/riscv/include/asm/kvm.h +++ b/riscv/include/asm/kvm.h @@ -135,6 +135,7 @@ enum KVM_RISCV_ISA_EXT_ID { KVM_RISCV_ISA_EXT_ZBS, KVM_RISCV_ISA_EXT_ZICNTR, KVM_RISCV_ISA_EXT_ZICSR, + KVM_RISCV_ISA_EXT_ZACAS, KVM_RISCV_ISA_EXT_ZIFENCEI, KVM_RISCV_ISA_EXT_ZIHPM, KVM_RISCV_ISA_EXT_SMSTATEEN, diff --git a/riscv/include/kvm/kvm-config-arch.h b/riscv/include/kvm/kvm-config-arch.h index e562d71..e5343a6 100644 --- a/riscv/include/kvm/kvm-config-arch.h +++ b/riscv/include/kvm/kvm-config-arch.h @@ -43,6 +43,9 @@ struct kvm_config_arch { OPT_BOOLEAN('\0', "disable-svpbmt", \ &(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_SVPBMT], \ "Disable Svpbmt Extension"), \ + OPT_BOOLEAN('\0', "disable-zacas", \ + &(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_ZACAS], \ + "Disable Zacas Extension"), \ OPT_BOOLEAN('\0', "disable-zba", \ &(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_ZBA], \ "Disable Zba Extension"), \ -- 2.43.0