Skip to content

Commit df68f4d

Browse files
committed
RISC-V: KVM: Allow Zicond extension for Guest/VM
We extend the KVM ISA extension ONE_REG interface to allow KVM user space to detect and enable Zicond extension for Guest/VM. Signed-off-by: Anup Patel <apatel@ventanamicro.com> Reviewed-by: Andrew Jones <ajones@ventanamicro.com> Signed-off-by: Anup Patel <anup@brainfault.org>
1 parent 6a53a5f commit df68f4d

2 files changed

Lines changed: 3 additions & 0 deletions

File tree

arch/riscv/include/uapi/asm/kvm.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ enum KVM_RISCV_ISA_EXT_ID {
138138
KVM_RISCV_ISA_EXT_ZIFENCEI,
139139
KVM_RISCV_ISA_EXT_ZIHPM,
140140
KVM_RISCV_ISA_EXT_SMSTATEEN,
141+
KVM_RISCV_ISA_EXT_ZICOND,
141142
KVM_RISCV_ISA_EXT_MAX,
142143
};
143144

arch/riscv/kvm/vcpu_onereg.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ static const unsigned long kvm_isa_ext_arr[] = {
4646
KVM_ISA_EXT_ARR(ZICBOM),
4747
KVM_ISA_EXT_ARR(ZICBOZ),
4848
KVM_ISA_EXT_ARR(ZICNTR),
49+
KVM_ISA_EXT_ARR(ZICOND),
4950
KVM_ISA_EXT_ARR(ZICSR),
5051
KVM_ISA_EXT_ARR(ZIFENCEI),
5152
KVM_ISA_EXT_ARR(ZIHINTPAUSE),
@@ -93,6 +94,7 @@ static bool kvm_riscv_vcpu_isa_disable_allowed(unsigned long ext)
9394
case KVM_RISCV_ISA_EXT_ZBB:
9495
case KVM_RISCV_ISA_EXT_ZBS:
9596
case KVM_RISCV_ISA_EXT_ZICNTR:
97+
case KVM_RISCV_ISA_EXT_ZICOND:
9698
case KVM_RISCV_ISA_EXT_ZICSR:
9799
case KVM_RISCV_ISA_EXT_ZIFENCEI:
98100
case KVM_RISCV_ISA_EXT_ZIHINTPAUSE:

0 commit comments

Comments
 (0)