Commit 28c01dc9 authored May 14, 2018 by Robin Murphy Committed by Will Deacon May 21, 2018

perf/arm-cci: Remove pointless PMU disabling



The CCI PMU driver bears some legacy remnants of the arm_pmu framework
from when it was split in c6f85cb4 ("bus: cci: move away from
arm_pmu framework"). In particular this perf_pmu_{dis,en}able() dance
around pmu->add which was fixed for arm_pmu in a9e469d1
("drivers/perf: arm_pmu: remove pointless PMU disabling").

For the exact same reasons (i.e. perf core already does this around the
call anyway), give cci_pmu_add() the exact same change, which also
prevents having to export those core functions to build it as a module.

Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>

parent 75dc3441

drivers/perf/arm-cci.c

+3 −10

Original line number	Diff line number	Diff line
		@@ -1184,16 +1184,11 @@ static int cci_pmu_add(struct perf_event *event, int flags)
		struct cci_pmu_hw_events *hw_events = &cci_pmu->hw_events;
		struct hw_perf_event *hwc = &event->hw;
		int idx;
		int err = 0;

		perf_pmu_disable(event->pmu);

		/* If we don't have a space for the counter then finish early. */
		idx = pmu_get_event_idx(hw_events, event);
		if (idx < 0) {
		err = idx;
		goto out;
		}
		if (idx < 0)
		return idx;

		event->hw.idx = idx;
		hw_events->events[idx] = event;
		@@ -1205,9 +1200,7 @@ static int cci_pmu_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 void cci_pmu_del(struct perf_event *event, int flags)

Admin message