Commit 0beb14de authored by Marc Zyngier's avatar Marc Zyngier Committed by Oliver Upton
Browse files

KVM: arm64: Unify HDFG[WR]TR_GROUP FGT identifiers 



There is no reason to have separate FGT group identifiers for
the debug fine grain trapping. The sole requirement is to provide
the *names* so that the SR_FGF() macro can do its magic of picking
the correct bit definition.

So let's alias HDFGWTR_GROUP and HDFGRTR_GROUP.

Reviewed-by: default avatarJoey Gouly <joey.gouly@arm.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20240214131827.2856277-9-maz@kernel.org


Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parent 76b457a5

arch/arm64/kvm/emulate-nested.c

+1 −2
Original line number Diff line number Diff line
@@ -1010,7 +1010,7 @@ enum fgt_group_id { 
	__NO_FGT_GROUP__,

	HFGxTR_GROUP,

	HDFGRTR_GROUP,

	HDFGWTR_GROUP,

	HDFGWTR_GROUP = HDFGRTR_GROUP,

	HFGITR_GROUP,

	HAFGRTR_GROUP,
@@ -1938,7 +1938,6 @@ bool __check_nv_sr_forward(struct kvm_vcpu *vcpu) 
		break;



	case HDFGRTR_GROUP:

	case HDFGWTR_GROUP:

		if (is_read)

			val = __vcpu_sys_reg(vcpu, HDFGRTR_EL2);

		else