Commit 892fd259 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm64: Reorder vcpu flag definitions 



The vcpu arch flags are in an interesting, semi random order.
As I have made the mistake of reusing a flag once, let's rework
this in an order that I find a bit less confusing.

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent 13605725

arch/arm64/include/asm/kvm_host.h

+12 −12
Original line number Diff line number Diff line
@@ -417,14 +417,12 @@ struct kvm_vcpu_arch { 
#define KVM_ARM64_VCPU_SVE_FINALIZED	(1 << 6) /* SVE config completed */

#define KVM_ARM64_GUEST_HAS_PTRAUTH	(1 << 7) /* PTRAUTH exposed to guest */

#define KVM_ARM64_PENDING_EXCEPTION	(1 << 8) /* Exception pending */

/*

 * Overlaps with KVM_ARM64_EXCEPT_MASK on purpose so that it can't be

 * set together with an exception...

 */

#define KVM_ARM64_INCREMENT_PC		(1 << 9) /* Increment PC */

#define KVM_ARM64_EXCEPT_MASK		(7 << 9) /* Target EL/MODE */

#define KVM_ARM64_DEBUG_STATE_SAVE_SPE	(1 << 12) /* Save SPE context if active  */

#define KVM_ARM64_DEBUG_STATE_SAVE_TRBE	(1 << 13) /* Save TRBE context if active  */



#define KVM_GUESTDBG_VALID_MASK (KVM_GUESTDBG_ENABLE | \

				 KVM_GUESTDBG_USE_SW_BP | \

				 KVM_GUESTDBG_USE_HW | \

				 KVM_GUESTDBG_SINGLESTEP)

/*

 * When KVM_ARM64_PENDING_EXCEPTION is set, KVM_ARM64_EXCEPT_MASK can

 * take the following values:
@@ -442,11 +440,13 @@ struct kvm_vcpu_arch { 
#define KVM_ARM64_EXCEPT_AA64_EL1	(0 << 11)

#define KVM_ARM64_EXCEPT_AA64_EL2	(1 << 11)



/*

 * Overlaps with KVM_ARM64_EXCEPT_MASK on purpose so that it can't be

 * set together with an exception...

 */

#define KVM_ARM64_INCREMENT_PC		(1 << 9) /* Increment PC */

#define KVM_ARM64_DEBUG_STATE_SAVE_SPE	(1 << 12) /* Save SPE context if active  */

#define KVM_ARM64_DEBUG_STATE_SAVE_TRBE	(1 << 13) /* Save TRBE context if active  */



#define KVM_GUESTDBG_VALID_MASK (KVM_GUESTDBG_ENABLE | \

				 KVM_GUESTDBG_USE_SW_BP | \

				 KVM_GUESTDBG_USE_HW | \

				 KVM_GUESTDBG_SINGLESTEP)



#define vcpu_has_sve(vcpu) (system_supports_sve() &&			\

			    ((vcpu)->arch.flags & KVM_ARM64_GUEST_HAS_SVE))