Skip to content

Commit 144dfe4

Browse files
zcxGGmuavpatel
authored andcommitted
KVM: riscv: selftests: Add Svvptc/Zabha/Ziccrse exts to get-reg-list test
The KVM RISC-V allows Svvptc/Zabha/Ziccrse extensions for Guest/VM so add them to get-reg-list test. Signed-off-by: Quan Zhou <zhouquan@iscas.ac.cn> Reviewed-by: Andrew Jones <ajones@ventanamicro.com> Link: https://lore.kernel.org/r/35163f0443993a942e0a021c6006bc5d2f0f5d5f.1732854096.git.zhouquan@iscas.ac.cn Signed-off-by: Anup Patel <anup@brainfault.org>
1 parent 79be257 commit 144dfe4

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

tools/testing/selftests/kvm/riscv/get-reg-list.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ bool filter_reg(__u64 reg)
5252
case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_SVINVAL:
5353
case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_SVNAPOT:
5454
case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_SVPBMT:
55+
case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_SVVPTC:
56+
case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZABHA:
5557
case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZACAS:
5658
case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZAWRS:
5759
case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZBA:
@@ -71,6 +73,7 @@ bool filter_reg(__u64 reg)
7173
case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZFHMIN:
7274
case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZICBOM:
7375
case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZICBOZ:
76+
case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZICCRSE:
7477
case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZICNTR:
7578
case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZICOND:
7679
case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZICSR:
@@ -430,6 +433,8 @@ static const char *isa_ext_single_id_to_str(__u64 reg_off)
430433
KVM_ISA_EXT_ARR(SVINVAL),
431434
KVM_ISA_EXT_ARR(SVNAPOT),
432435
KVM_ISA_EXT_ARR(SVPBMT),
436+
KVM_ISA_EXT_ARR(SVVPTC),
437+
KVM_ISA_EXT_ARR(ZABHA),
433438
KVM_ISA_EXT_ARR(ZACAS),
434439
KVM_ISA_EXT_ARR(ZAWRS),
435440
KVM_ISA_EXT_ARR(ZBA),
@@ -449,6 +454,7 @@ static const char *isa_ext_single_id_to_str(__u64 reg_off)
449454
KVM_ISA_EXT_ARR(ZFHMIN),
450455
KVM_ISA_EXT_ARR(ZICBOM),
451456
KVM_ISA_EXT_ARR(ZICBOZ),
457+
KVM_ISA_EXT_ARR(ZICCRSE),
452458
KVM_ISA_EXT_ARR(ZICNTR),
453459
KVM_ISA_EXT_ARR(ZICOND),
454460
KVM_ISA_EXT_ARR(ZICSR),
@@ -967,6 +973,8 @@ KVM_ISA_EXT_SIMPLE_CONFIG(svadu, SVADU);
967973
KVM_ISA_EXT_SIMPLE_CONFIG(svinval, SVINVAL);
968974
KVM_ISA_EXT_SIMPLE_CONFIG(svnapot, SVNAPOT);
969975
KVM_ISA_EXT_SIMPLE_CONFIG(svpbmt, SVPBMT);
976+
KVM_ISA_EXT_SIMPLE_CONFIG(svvptc, SVVPTC);
977+
KVM_ISA_EXT_SIMPLE_CONFIG(zabha, ZABHA);
970978
KVM_ISA_EXT_SIMPLE_CONFIG(zacas, ZACAS);
971979
KVM_ISA_EXT_SIMPLE_CONFIG(zawrs, ZAWRS);
972980
KVM_ISA_EXT_SIMPLE_CONFIG(zba, ZBA);
@@ -986,6 +994,7 @@ KVM_ISA_EXT_SIMPLE_CONFIG(zfh, ZFH);
986994
KVM_ISA_EXT_SIMPLE_CONFIG(zfhmin, ZFHMIN);
987995
KVM_ISA_EXT_SUBLIST_CONFIG(zicbom, ZICBOM);
988996
KVM_ISA_EXT_SUBLIST_CONFIG(zicboz, ZICBOZ);
997+
KVM_ISA_EXT_SIMPLE_CONFIG(ziccrse, ZICCRSE);
989998
KVM_ISA_EXT_SIMPLE_CONFIG(zicntr, ZICNTR);
990999
KVM_ISA_EXT_SIMPLE_CONFIG(zicond, ZICOND);
9911000
KVM_ISA_EXT_SIMPLE_CONFIG(zicsr, ZICSR);
@@ -1035,6 +1044,8 @@ struct vcpu_reg_list *vcpu_configs[] = {
10351044
&config_svinval,
10361045
&config_svnapot,
10371046
&config_svpbmt,
1047+
&config_svvptc,
1048+
&config_zabha,
10381049
&config_zacas,
10391050
&config_zawrs,
10401051
&config_zba,
@@ -1054,6 +1065,7 @@ struct vcpu_reg_list *vcpu_configs[] = {
10541065
&config_zfhmin,
10551066
&config_zicbom,
10561067
&config_zicboz,
1068+
&config_ziccrse,
10571069
&config_zicntr,
10581070
&config_zicond,
10591071
&config_zicsr,

0 commit comments

Comments
 (0)