Commit aac64ad3 authored by Fuad Tabba's avatar Fuad Tabba Committed by Marc Zyngier
Browse files

KVM: arm64: Use kvm_vcpu_has_feature() directly for struct kvm 



Now that we have introduced kvm_vcpu_has_feature(), use it in the
remaining code that checks for features in struct kvm, instead of
using the __vcpu_has_feature() helper.

No functional change intended.

Suggested-by: default avatarQuentin Perret <qperret@google.com>
Signed-off-by: default avatarFuad Tabba <tabba@google.com>
Link: https://lore.kernel.org/r/20241216105057.579031-18-tabba@google.com


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

arch/arm64/kvm/nested.c

+4 −4
Original line number Diff line number Diff line
@@ -1021,8 +1021,8 @@ int kvm_init_nv_sysregs(struct kvm *kvm) 
		res0 |= HCR_NV2;

	if (!kvm_has_feat(kvm, ID_AA64MMFR2_EL1, NV, IMP))

		res0 |= (HCR_AT | HCR_NV1 | HCR_NV);

	if (!(__vcpu_has_feature(&kvm->arch, KVM_ARM_VCPU_PTRAUTH_ADDRESS) &&

	      __vcpu_has_feature(&kvm->arch, KVM_ARM_VCPU_PTRAUTH_GENERIC)))

	if (!(kvm_vcpu_has_feature(kvm, KVM_ARM_VCPU_PTRAUTH_ADDRESS) &&

	      kvm_vcpu_has_feature(kvm, KVM_ARM_VCPU_PTRAUTH_GENERIC)))

		res0 |= (HCR_API | HCR_APK);

	if (!kvm_has_feat(kvm, ID_AA64ISAR0_EL1, TME, IMP))

		res0 |= BIT(39);
@@ -1078,8 +1078,8 @@ int kvm_init_nv_sysregs(struct kvm *kvm) 


	/* HFG[RW]TR_EL2 */

	res0 = res1 = 0;

	if (!(__vcpu_has_feature(&kvm->arch, KVM_ARM_VCPU_PTRAUTH_ADDRESS) &&

	      __vcpu_has_feature(&kvm->arch, KVM_ARM_VCPU_PTRAUTH_GENERIC)))

	if (!(kvm_vcpu_has_feature(kvm, KVM_ARM_VCPU_PTRAUTH_ADDRESS) &&

	      kvm_vcpu_has_feature(kvm, KVM_ARM_VCPU_PTRAUTH_GENERIC)))

		res0 |= (HFGxTR_EL2_APDAKey | HFGxTR_EL2_APDBKey |

			 HFGxTR_EL2_APGAKey | HFGxTR_EL2_APIAKey |

			 HFGxTR_EL2_APIBKey);