]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
perf: apple_m1: Don't disable counter in m1_pmu_enable_event()
authorRob Herring (Arm) <robh@kernel.org>
Tue, 18 Feb 2025 20:40:01 +0000 (14:40 -0600)
committerWill Deacon <will@kernel.org>
Sat, 1 Mar 2025 05:08:10 +0000 (05:08 +0000)
Currently m1_pmu_enable_event() starts by disabling the event counter
it has been asked to enable. This should not be necessary as the
counter (and the PMU as a whole) should not be active when
m1_pmu_enable_event() is called.

Cc: Marc Zyngier <maz@kernel.org>
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
Tested-by: James Clark <james.clark@linaro.org>
Link: https://lore.kernel.org/r/20250218-arm-brbe-v19-v20-6-4e9922fc2e8e@kernel.org
Signed-off-by: Will Deacon <will@kernel.org>
drivers/perf/apple_m1_cpu_pmu.c

index 06fd317529fcbab0f1485228efe8470be565407c..39349ecec3c1dfec0d26a3731c09d2f71fffcd2b 100644 (file)
@@ -396,10 +396,6 @@ static void m1_pmu_enable_event(struct perf_event *event)
        user = event->hw.config_base & M1_PMU_CFG_COUNT_USER;
        kernel = event->hw.config_base & M1_PMU_CFG_COUNT_KERNEL;
 
-       m1_pmu_disable_counter_interrupt(event->hw.idx);
-       m1_pmu_disable_counter(event->hw.idx);
-       isb();
-
        m1_pmu_configure_counter(event->hw.idx, evt, user, kernel);
        m1_pmu_enable_counter(event->hw.idx);
        m1_pmu_enable_counter_interrupt(event->hw.idx);