arm64: perf: move to shared arm_pmu framework
Now that the arm_pmu framework has been factored out to drivers/perf we can make use of it for arm64, gaining support for heterogeneous PMUs and unifying the two codebases before they diverge further. The as yet unused PMU name for PMUv3 is changed to armv8_pmuv3, matching the style previously applied to the 32-bit PMUs. Signed-off-by: Mark Rutland <mark.rutland@arm.com> Acked-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
This commit is contained in:
parent
8f48c06290
commit
6475b2d846
|
@ -454,12 +454,8 @@ config HAVE_ARCH_PFN_VALID
|
||||||
def_bool ARCH_HAS_HOLES_MEMORYMODEL || !SPARSEMEM
|
def_bool ARCH_HAS_HOLES_MEMORYMODEL || !SPARSEMEM
|
||||||
|
|
||||||
config HW_PERF_EVENTS
|
config HW_PERF_EVENTS
|
||||||
bool "Enable hardware performance counter support for perf events"
|
def_bool y
|
||||||
depends on PERF_EVENTS
|
depends on ARM_PMU
|
||||||
default y
|
|
||||||
help
|
|
||||||
Enable hardware performance counter support for perf events. If
|
|
||||||
disabled, perf events will use software events only.
|
|
||||||
|
|
||||||
config SYS_SUPPORTS_HUGETLBFS
|
config SYS_SUPPORTS_HUGETLBFS
|
||||||
def_bool y
|
def_bool y
|
||||||
|
|
|
@ -1,83 +0,0 @@
|
||||||
/*
|
|
||||||
* Based on arch/arm/include/asm/pmu.h
|
|
||||||
*
|
|
||||||
* Copyright (C) 2009 picoChip Designs Ltd, Jamie Iles
|
|
||||||
* Copyright (C) 2012 ARM Ltd.
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License version 2 as
|
|
||||||
* published by the Free Software Foundation.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
#ifndef __ASM_PMU_H
|
|
||||||
#define __ASM_PMU_H
|
|
||||||
|
|
||||||
#ifdef CONFIG_HW_PERF_EVENTS
|
|
||||||
|
|
||||||
/* The events for a given PMU register set. */
|
|
||||||
struct pmu_hw_events {
|
|
||||||
/*
|
|
||||||
* The events that are active on the PMU for the given index.
|
|
||||||
*/
|
|
||||||
struct perf_event **events;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* A 1 bit for an index indicates that the counter is being used for
|
|
||||||
* an event. A 0 means that the counter can be used.
|
|
||||||
*/
|
|
||||||
unsigned long *used_mask;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Hardware lock to serialize accesses to PMU registers. Needed for the
|
|
||||||
* read/modify/write sequences.
|
|
||||||
*/
|
|
||||||
raw_spinlock_t pmu_lock;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct arm_pmu {
|
|
||||||
struct pmu pmu;
|
|
||||||
cpumask_t active_irqs;
|
|
||||||
int *irq_affinity;
|
|
||||||
const char *name;
|
|
||||||
irqreturn_t (*handle_irq)(int irq_num, void *dev);
|
|
||||||
void (*enable)(struct hw_perf_event *evt, int idx);
|
|
||||||
void (*disable)(struct hw_perf_event *evt, int idx);
|
|
||||||
int (*get_event_idx)(struct pmu_hw_events *hw_events,
|
|
||||||
struct hw_perf_event *hwc);
|
|
||||||
int (*set_event_filter)(struct hw_perf_event *evt,
|
|
||||||
struct perf_event_attr *attr);
|
|
||||||
u32 (*read_counter)(int idx);
|
|
||||||
void (*write_counter)(int idx, u32 val);
|
|
||||||
void (*start)(void);
|
|
||||||
void (*stop)(void);
|
|
||||||
void (*reset)(void *);
|
|
||||||
int (*map_event)(struct perf_event *event);
|
|
||||||
int num_events;
|
|
||||||
atomic_t active_events;
|
|
||||||
struct mutex reserve_mutex;
|
|
||||||
u64 max_period;
|
|
||||||
struct platform_device *plat_device;
|
|
||||||
struct pmu_hw_events *(*get_hw_events)(void);
|
|
||||||
};
|
|
||||||
|
|
||||||
#define to_arm_pmu(p) (container_of(p, struct arm_pmu, pmu))
|
|
||||||
|
|
||||||
int __init armpmu_register(struct arm_pmu *armpmu, char *name, int type);
|
|
||||||
|
|
||||||
u64 armpmu_event_update(struct perf_event *event,
|
|
||||||
struct hw_perf_event *hwc,
|
|
||||||
int idx);
|
|
||||||
|
|
||||||
int armpmu_event_set_period(struct perf_event *event,
|
|
||||||
struct hw_perf_event *hwc,
|
|
||||||
int idx);
|
|
||||||
|
|
||||||
#endif /* CONFIG_HW_PERF_EVENTS */
|
|
||||||
#endif /* __ASM_PMU_H */
|
|
File diff suppressed because it is too large
Load Diff
|
@ -5,7 +5,7 @@
|
||||||
menu "Performance monitor support"
|
menu "Performance monitor support"
|
||||||
|
|
||||||
config ARM_PMU
|
config ARM_PMU
|
||||||
depends on PERF_EVENTS && ARM
|
depends on PERF_EVENTS && (ARM || ARM64)
|
||||||
bool "ARM PMU framework"
|
bool "ARM PMU framework"
|
||||||
default y
|
default y
|
||||||
help
|
help
|
||||||
|
|
Loading…
Reference in New Issue