Skip to content

Commit 1507376

Browse files
Kan LiangPeter Zijlstra
authored andcommitted
perf/arm: Remove driver-specific throttle support
The throttle support has been added in the generic code. Remove the driver-specific throttle support. Besides the throttle, perf_event_overflow may return true because of event_limit. It already does an inatomic event disable. The pmu->stop is not required either. Signed-off-by: Kan Liang <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Tested-by: Leo Yan <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 6792f74 commit 1507376

File tree

4 files changed

+5
-10
lines changed

4 files changed

+5
-10
lines changed

drivers/perf/arm_pmuv3.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -887,8 +887,7 @@ static irqreturn_t armv8pmu_handle_irq(struct arm_pmu *cpu_pmu)
887887
* an irq_work which will be taken care of in the handling of
888888
* IPI_IRQ_WORK.
889889
*/
890-
if (perf_event_overflow(event, &data, regs))
891-
cpu_pmu->disable(event);
890+
perf_event_overflow(event, &data, regs);
892891
}
893892
armv8pmu_start(cpu_pmu);
894893

drivers/perf/arm_v6_pmu.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,7 @@ armv6pmu_handle_irq(struct arm_pmu *cpu_pmu)
276276
if (!armpmu_event_set_period(event))
277277
continue;
278278

279-
if (perf_event_overflow(event, &data, regs))
280-
cpu_pmu->disable(event);
279+
perf_event_overflow(event, &data, regs);
281280
}
282281

283282
/*

drivers/perf/arm_v7_pmu.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -930,8 +930,7 @@ static irqreturn_t armv7pmu_handle_irq(struct arm_pmu *cpu_pmu)
930930
if (!armpmu_event_set_period(event))
931931
continue;
932932

933-
if (perf_event_overflow(event, &data, regs))
934-
cpu_pmu->disable(event);
933+
perf_event_overflow(event, &data, regs);
935934
}
936935

937936
/*

drivers/perf/arm_xscale_pmu.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,7 @@ xscale1pmu_handle_irq(struct arm_pmu *cpu_pmu)
186186
if (!armpmu_event_set_period(event))
187187
continue;
188188

189-
if (perf_event_overflow(event, &data, regs))
190-
cpu_pmu->disable(event);
189+
perf_event_overflow(event, &data, regs);
191190
}
192191

193192
irq_work_run();
@@ -519,8 +518,7 @@ xscale2pmu_handle_irq(struct arm_pmu *cpu_pmu)
519518
if (!armpmu_event_set_period(event))
520519
continue;
521520

522-
if (perf_event_overflow(event, &data, regs))
523-
cpu_pmu->disable(event);
521+
perf_event_overflow(event, &data, regs);
524522
}
525523

526524
irq_work_run();

0 commit comments

Comments
 (0)