Skip to content

Commit d964e8f

Browse files
clementlegerpalmer-dabbelt
authored andcommitted
RISC-V: KVM: Allow Zca, Zcf, Zcd and Zcb extensions for Guest/VM
Extend the KVM ISA extension ONE_REG interface to allow KVM user space to detect and enable Zca, Zcf, Zcd and Zcb extensions for Guest/VM. Signed-off-by: Clément Léger <[email protected]> Reviewed-by: Anup Patel <[email protected]> Acked-by: Anup Patel <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Palmer Dabbelt <[email protected]>
1 parent 0ad70db commit d964e8f

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,10 @@ enum KVM_RISCV_ISA_EXT_ID {
169169
KVM_RISCV_ISA_EXT_ZACAS,
170170
KVM_RISCV_ISA_EXT_SSCOFPMF,
171171
KVM_RISCV_ISA_EXT_ZIMOP,
172+
KVM_RISCV_ISA_EXT_ZCA,
173+
KVM_RISCV_ISA_EXT_ZCB,
174+
KVM_RISCV_ISA_EXT_ZCD,
175+
KVM_RISCV_ISA_EXT_ZCF,
172176
KVM_RISCV_ISA_EXT_MAX,
173177
};
174178

arch/riscv/kvm/vcpu_onereg.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ static const unsigned long kvm_isa_ext_arr[] = {
4949
KVM_ISA_EXT_ARR(ZBKC),
5050
KVM_ISA_EXT_ARR(ZBKX),
5151
KVM_ISA_EXT_ARR(ZBS),
52+
KVM_ISA_EXT_ARR(ZCA),
53+
KVM_ISA_EXT_ARR(ZCB),
54+
KVM_ISA_EXT_ARR(ZCD),
55+
KVM_ISA_EXT_ARR(ZCF),
5256
KVM_ISA_EXT_ARR(ZFA),
5357
KVM_ISA_EXT_ARR(ZFH),
5458
KVM_ISA_EXT_ARR(ZFHMIN),
@@ -134,6 +138,10 @@ static bool kvm_riscv_vcpu_isa_disable_allowed(unsigned long ext)
134138
case KVM_RISCV_ISA_EXT_ZBKC:
135139
case KVM_RISCV_ISA_EXT_ZBKX:
136140
case KVM_RISCV_ISA_EXT_ZBS:
141+
case KVM_RISCV_ISA_EXT_ZCA:
142+
case KVM_RISCV_ISA_EXT_ZCB:
143+
case KVM_RISCV_ISA_EXT_ZCD:
144+
case KVM_RISCV_ISA_EXT_ZCF:
137145
case KVM_RISCV_ISA_EXT_ZFA:
138146
case KVM_RISCV_ISA_EXT_ZFH:
139147
case KVM_RISCV_ISA_EXT_ZFHMIN:

0 commit comments

Comments
 (0)