Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
KVM: riscv: selftests: Add Zicbop extension to get-reg-list test
The KVM RISC-V allows Zicbop extension 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>
Reviewed-by: Nutty Liu <nutty.liu@hotmail.com>
Link: https://lore.kernel.org/r/076908690c15070f907f43d2ff81ba7e95582ec7.1754646071.git.zhouquan@iscas.ac.cn
Signed-off-by: Anup Patel <anup@brainfault.org>
authored by
Quan Zhou
and committed by
Anup Patel
e677fab8
44c3d084
+16
+16
tools/testing/selftests/kvm/riscv/get-reg-list.c
+16
tools/testing/selftests/kvm/riscv/get-reg-list.c
···
83
83
case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZFH:
84
84
case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZFHMIN:
85
85
case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZICBOM:
86
+
case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZICBOP:
86
87
case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZICBOZ:
87
88
case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZICCRSE:
88
89
case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZICNTR:
···
256
255
return "KVM_REG_RISCV_CONFIG_REG(zicbom_block_size)";
257
256
case KVM_REG_RISCV_CONFIG_REG(zicboz_block_size):
258
257
return "KVM_REG_RISCV_CONFIG_REG(zicboz_block_size)";
258
+
case KVM_REG_RISCV_CONFIG_REG(zicbop_block_size):
259
+
return "KVM_REG_RISCV_CONFIG_REG(zicbop_block_size)";
259
260
case KVM_REG_RISCV_CONFIG_REG(mvendorid):
260
261
return "KVM_REG_RISCV_CONFIG_REG(mvendorid)";
261
262
case KVM_REG_RISCV_CONFIG_REG(marchid):
···
538
535
KVM_ISA_EXT_ARR(ZFH),
539
536
KVM_ISA_EXT_ARR(ZFHMIN),
540
537
KVM_ISA_EXT_ARR(ZICBOM),
538
+
KVM_ISA_EXT_ARR(ZICBOP),
541
539
KVM_ISA_EXT_ARR(ZICBOZ),
542
540
KVM_ISA_EXT_ARR(ZICCRSE),
543
541
KVM_ISA_EXT_ARR(ZICNTR),
···
784
780
*/
785
781
static __u64 base_regs[] = {
786
782
KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_CONFIG | KVM_REG_RISCV_CONFIG_REG(isa),
783
+
KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_CONFIG | KVM_REG_RISCV_CONFIG_REG(zicbom_block_size),
787
784
KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_CONFIG | KVM_REG_RISCV_CONFIG_REG(mvendorid),
788
785
KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_CONFIG | KVM_REG_RISCV_CONFIG_REG(marchid),
789
786
KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_CONFIG | KVM_REG_RISCV_CONFIG_REG(mimpid),
787
+
KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_CONFIG | KVM_REG_RISCV_CONFIG_REG(zicboz_block_size),
790
788
KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_CONFIG | KVM_REG_RISCV_CONFIG_REG(satp_mode),
789
+
KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_CONFIG | KVM_REG_RISCV_CONFIG_REG(zicbop_block_size),
791
790
KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_CORE | KVM_REG_RISCV_CORE_REG(regs.pc),
792
791
KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_CORE | KVM_REG_RISCV_CORE_REG(regs.ra),
793
792
KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_CORE | KVM_REG_RISCV_CORE_REG(regs.sp),
···
869
862
static __u64 zicbom_regs[] = {
870
863
KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_CONFIG | KVM_REG_RISCV_CONFIG_REG(zicbom_block_size),
871
864
KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZICBOM,
865
+
};
866
+
867
+
static __u64 zicbop_regs[] = {
868
+
KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_CONFIG | KVM_REG_RISCV_CONFIG_REG(zicbop_block_size),
869
+
KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZICBOP,
872
870
};
873
871
874
872
static __u64 zicboz_regs[] = {
···
1024
1012
.regs = sbi_sta_regs, .regs_n = ARRAY_SIZE(sbi_sta_regs),}
1025
1013
#define SUBLIST_ZICBOM \
1026
1014
{"zicbom", .feature = KVM_RISCV_ISA_EXT_ZICBOM, .regs = zicbom_regs, .regs_n = ARRAY_SIZE(zicbom_regs),}
1015
+
#define SUBLIST_ZICBOP \
1016
+
{"zicbop", .feature = KVM_RISCV_ISA_EXT_ZICBOP, .regs = zicbop_regs, .regs_n = ARRAY_SIZE(zicbop_regs),}
1027
1017
#define SUBLIST_ZICBOZ \
1028
1018
{"zicboz", .feature = KVM_RISCV_ISA_EXT_ZICBOZ, .regs = zicboz_regs, .regs_n = ARRAY_SIZE(zicboz_regs),}
1029
1019
#define SUBLIST_AIA \
···
1144
1130
KVM_ISA_EXT_SIMPLE_CONFIG(zfh, ZFH);
1145
1131
KVM_ISA_EXT_SIMPLE_CONFIG(zfhmin, ZFHMIN);
1146
1132
KVM_ISA_EXT_SUBLIST_CONFIG(zicbom, ZICBOM);
1133
+
KVM_ISA_EXT_SUBLIST_CONFIG(zicbop, ZICBOP);
1147
1134
KVM_ISA_EXT_SUBLIST_CONFIG(zicboz, ZICBOZ);
1148
1135
KVM_ISA_EXT_SIMPLE_CONFIG(ziccrse, ZICCRSE);
1149
1136
KVM_ISA_EXT_SIMPLE_CONFIG(zicntr, ZICNTR);
···
1219
1204
&config_zfh,
1220
1205
&config_zfhmin,
1221
1206
&config_zicbom,
1207
+
&config_zicbop,
1222
1208
&config_zicboz,
1223
1209
&config_ziccrse,
1224
1210
&config_zicntr,