Commit 920f4a55 authored by Raghavendra Rao Ananta's avatar Raghavendra Rao Ananta Committed by Marc Zyngier
Browse files

selftests: KVM: aarch64: Add the bitmap firmware registers to get-reg-list 



Add the psuedo-firmware registers KVM_REG_ARM_STD_BMAP,
KVM_REG_ARM_STD_HYP_BMAP, and KVM_REG_ARM_VENDOR_HYP_BMAP to
the base_regs[] list.

Also, add the COPROC support for KVM_REG_ARM_FW_FEAT_BMAP.

Signed-off-by: default avatarRaghavendra Rao Ananta <rananta@google.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20220502233853.1233742-10-rananta@google.com
parent 5ca24697

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

+8 −0
Original line number Diff line number Diff line
@@ -294,6 +294,11 @@ static void print_reg(struct vcpu_config *c, __u64 id) 
			    "%s: Unexpected bits set in FW reg id: 0x%llx", config_name(c), id);

		printf("\tKVM_REG_ARM_FW_REG(%lld),\n", id & 0xffff);

		break;

	case KVM_REG_ARM_FW_FEAT_BMAP:

		TEST_ASSERT(id == KVM_REG_ARM_FW_FEAT_BMAP_REG(id & 0xffff),

			    "%s: Unexpected bits set in the bitmap feature FW reg id: 0x%llx", config_name(c), id);

		printf("\tKVM_REG_ARM_FW_FEAT_BMAP_REG(%lld),\n", id & 0xffff);

		break;

	case KVM_REG_ARM64_SVE:

		if (has_cap(c, KVM_CAP_ARM_SVE))

			printf("\t%s,\n", sve_id_to_str(c, id));
@@ -692,6 +697,9 @@ static __u64 base_regs[] = { 
	KVM_REG_ARM_FW_REG(1),		/* KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1 */

	KVM_REG_ARM_FW_REG(2),		/* KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2 */

	KVM_REG_ARM_FW_REG(3),		/* KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_3 */

	KVM_REG_ARM_FW_FEAT_BMAP_REG(0),	/* KVM_REG_ARM_STD_BMAP */

	KVM_REG_ARM_FW_FEAT_BMAP_REG(1),	/* KVM_REG_ARM_STD_HYP_BMAP */

	KVM_REG_ARM_FW_FEAT_BMAP_REG(2),	/* KVM_REG_ARM_VENDOR_HYP_BMAP */

	ARM64_SYS_REG(3, 3, 14, 3, 1),	/* CNTV_CTL_EL0 */

	ARM64_SYS_REG(3, 3, 14, 3, 2),	/* CNTV_CVAL_EL0 */

	ARM64_SYS_REG(3, 3, 14, 0, 2),