Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9e469d1 authored by Mark Rutland's avatar Mark Rutland Committed by Will Deacon
Browse files

drivers/perf: arm_pmu: remove pointless PMU disabling 



We currently disable the PMU temporarily in armpmu_add(). We may have
required this historically, but the perf core always disables an event's
PMU when calling event::pmu::add(), so this is not necessary.

We don't do similarly in armpmu_del(), or elsewhere, so this is
unnecessary and inconsistent, and only serves to confuse the reader.

Remove the pointless disable, simplifying armpmu_add() in the process.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Tested-by: default avatarJeremy Linton <jeremy.linton@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 3071f13d

drivers/perf/arm_pmu.c

+3 −10
Original line number Diff line number Diff line
@@ -235,20 +235,15 @@ armpmu_add(struct perf_event *event, int flags) 
	struct pmu_hw_events *hw_events = this_cpu_ptr(armpmu->hw_events);

	struct hw_perf_event *hwc = &event->hw;

	int idx;

	int err = 0;



	/* An event following a process won't be stopped earlier */

	if (!cpumask_test_cpu(smp_processor_id(), &armpmu->supported_cpus))

		return -ENOENT;



	perf_pmu_disable(event->pmu);



	/* If we don't have a space for the counter then finish early. */

	idx = armpmu->get_event_idx(hw_events, event);

	if (idx < 0) {

		err = idx;

		goto out;

	}

	if (idx < 0)

		return idx;



	/*

	 * If there is an event in the counter we are going to use then make
@@ -265,9 +260,7 @@ armpmu_add(struct perf_event *event, int flags) 
	/* Propagate our changes to the userspace mapping. */

	perf_event_update_userpage(event);



out:

	perf_pmu_enable(event->pmu);

	return err;

	return 0;

}



static int