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

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

arm: perf: factor arm_pmu core out to drivers 



To enable sharing of the arm_pmu code with arm64, this patch factors it
out to drivers/perf/. A new drivers/perf directory is added for
performance monitor drivers to live under.

MAINTAINERS is updated accordingly. Files added previously without a
corresponsing MAINTAINERS update (perf_regs.c, perf_callchain.c, and
perf_event.h) are also added.

Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
[will: augmented Kconfig help slightly]
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent bc1e3c46

MAINTAINERS

+4 −2
Original line number Diff line number Diff line
@@ -799,11 +799,13 @@ F: arch/arm/include/asm/floppy.h 
ARM PMU PROFILING AND DEBUGGING

M:	Will Deacon <will.deacon@arm.com>

S:	Maintained

F:	arch/arm/kernel/perf_event*

F:	arch/arm/kernel/perf_*

F:	arch/arm/oprofile/common.c

F:	arch/arm/include/asm/pmu.h

F:	arch/arm/kernel/hw_breakpoint.c

F:	arch/arm/include/asm/hw_breakpoint.h

F:	arch/arm/include/asm/perf_event.h

F:	drivers/perf/arm_pmu.c

F:	include/linux/perf/arm_pmu.h



ARM PORT

M:	Russell King <linux@arm.linux.org.uk>

arch/arm/Kconfig

+2 −6
Original line number Diff line number Diff line
@@ -1701,12 +1701,8 @@ config HIGHPTE 
	  user-space 2nd level page tables to reside in high memory.



config HW_PERF_EVENTS

	bool "Enable hardware performance counter support for perf events"

	depends on PERF_EVENTS

	default y

	help

	  Enable hardware performance counter support for perf events. If

	  disabled, perf events will use software events only.

	def_bool y

	depends on ARM_PMU



config SYS_SUPPORTS_HUGETLBFS

       def_bool y

arch/arm/kernel/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -71,8 +71,7 @@ obj-$(CONFIG_CPU_PJ4) += pj4-cp0.o 
obj-$(CONFIG_CPU_PJ4B)		+= pj4-cp0.o

obj-$(CONFIG_IWMMXT)		+= iwmmxt.o

obj-$(CONFIG_PERF_EVENTS)	+= perf_regs.o perf_callchain.o

obj-$(CONFIG_HW_PERF_EVENTS)	+= perf_event.o \

				   perf_event_xscale.o perf_event_v6.o \

obj-$(CONFIG_HW_PERF_EVENTS)	+= perf_event_xscale.o perf_event_v6.o \

				   perf_event_v7.o

CFLAGS_pj4-cp0.o		:= -marm

AFLAGS_iwmmxt.o			:= -Wa,-mcpu=iwmmxt

arch/arm/kernel/perf_event_v6.c

+1 −1
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ 


#include <asm/cputype.h>

#include <asm/irq_regs.h>

#include <asm/pmu.h>



#include <linux/of.h>

#include <linux/perf/arm_pmu.h>

#include <linux/platform_device.h>



enum armv6_perf_types {

arch/arm/kernel/perf_event_v7.c

+1 −1
Original line number Diff line number Diff line
@@ -21,11 +21,11 @@ 
#include <asm/cp15.h>

#include <asm/cputype.h>

#include <asm/irq_regs.h>

#include <asm/pmu.h>

#include <asm/vfp.h>

#include "../vfp/vfpinstr.h"



#include <linux/of.h>

#include <linux/perf/arm_pmu.h>

#include <linux/platform_device.h>



/*