Commit 6fadc124 authored by Anshuman Khandual's avatar Anshuman Khandual Committed by Marc Zyngier
Browse files

KVM: arm64: perf: Replace '0xf' instances with ID_AA64DFR0_PMUVER_IMP_DEF 



ID_AA64DFR0_PMUVER_IMP_DEF which indicate implementation defined PMU, never
actually gets used although there are '0xf' instances scattered all around.
Just do the macro replacement to improve readability.

Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Marc Zyngier <maz@kernel.org>
Cc: linux-perf-users@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: kvmarm@lists.cs.columbia.edu
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent 013cc4c6

arch/arm64/kvm/perf.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static struct perf_guest_info_callbacks kvm_guest_cbs = { 


int kvm_perf_init(void)

{

	if (kvm_pmu_probe_pmuver() != 0xf && !is_protected_kvm_enabled())

	if (kvm_pmu_probe_pmuver() != ID_AA64DFR0_PMUVER_IMP_DEF && !is_protected_kvm_enabled())

		static_branch_enable(&kvm_arm_pmu_available);



	return perf_register_guest_info_callbacks(&kvm_guest_cbs);

arch/arm64/kvm/pmu-emul.c

+3 −3
Original line number Diff line number Diff line
@@ -745,7 +745,7 @@ int kvm_pmu_probe_pmuver(void) 
	struct perf_event_attr attr = { };

	struct perf_event *event;

	struct arm_pmu *pmu;

	int pmuver = 0xf;

	int pmuver = ID_AA64DFR0_PMUVER_IMP_DEF;



	/*

	 * Create a dummy event that only counts user cycles. As we'll never
@@ -770,7 +770,7 @@ int kvm_pmu_probe_pmuver(void) 
	if (IS_ERR(event)) {

		pr_err_once("kvm: pmu event creation failed %ld\n",

			    PTR_ERR(event));

		return 0xf;

		return ID_AA64DFR0_PMUVER_IMP_DEF;

	}



	if (event->pmu) {
@@ -923,7 +923,7 @@ int kvm_arm_pmu_v3_set_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr) 
	if (!vcpu->kvm->arch.pmuver)

		vcpu->kvm->arch.pmuver = kvm_pmu_probe_pmuver();



	if (vcpu->kvm->arch.pmuver == 0xf)

	if (vcpu->kvm->arch.pmuver == ID_AA64DFR0_PMUVER_IMP_DEF)

		return -ENODEV;



	switch (attr->attr) {