| Message ID | 20240607-arm-pmu-3-9-icntr-v1-1-c7bd2dceff3b@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: Add support for Armv9.4 PMU fixed instruction counter | expand |
On Fri, Jun 07, 2024 at 02:31:26PM -0600, Rob Herring (Arm) wrote: > It is preferred to put drivers under drivers/ rather than under arch/. > The PMU drivers also depend on arm_pmu.c, so it's better to place them > all together. > > Signed-off-by: Rob Herring (Arm) <robh@kernel.org> Acked-by: Mark Rutland <mark.rutland@arm.com> Mark. > --- > arch/arm/kernel/Makefile | 2 -- > drivers/perf/Kconfig | 12 ++++++++++++ > drivers/perf/Makefile | 3 +++ > arch/arm/kernel/perf_event_v6.c => drivers/perf/arm_v6_pmu.c | 3 --- > arch/arm/kernel/perf_event_v7.c => drivers/perf/arm_v7_pmu.c | 3 --- > .../perf_event_xscale.c => drivers/perf/arm_xscale_pmu.c | 3 --- > 6 files changed, 15 insertions(+), 11 deletions(-) > > diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile > index 89a77e3f51d2..aaae31b8c4a5 100644 > --- a/arch/arm/kernel/Makefile > +++ b/arch/arm/kernel/Makefile > @@ -78,8 +78,6 @@ obj-$(CONFIG_CPU_XSC3) += xscale-cp0.o > obj-$(CONFIG_CPU_MOHAWK) += xscale-cp0.o > obj-$(CONFIG_IWMMXT) += iwmmxt.o > obj-$(CONFIG_PERF_EVENTS) += perf_regs.o perf_callchain.o > -obj-$(CONFIG_HW_PERF_EVENTS) += perf_event_xscale.o perf_event_v6.o \ > - perf_event_v7.o > AFLAGS_iwmmxt.o := -Wa,-mcpu=iwmmxt > obj-$(CONFIG_ARM_CPU_TOPOLOGY) += topology.o > obj-$(CONFIG_VDSO) += vdso.o > diff --git a/drivers/perf/Kconfig b/drivers/perf/Kconfig > index 7526a9e714fa..aa9530b4064f 100644 > --- a/drivers/perf/Kconfig > +++ b/drivers/perf/Kconfig > @@ -56,6 +56,18 @@ config ARM_PMU > Say y if you want to use CPU performance monitors on ARM-based > systems. > > +config ARM_V6_PMU > + depends on ARM_PMU && (CPU_V6 || CPU_V6K) > + def_bool y > + > +config ARM_V7_PMU > + depends on ARM_PMU && CPU_V7 > + def_bool y > + > +config ARM_XSCALE_PMU > + depends on ARM_PMU && CPU_XSCALE > + def_bool y > + > config RISCV_PMU > depends on RISCV > bool "RISC-V PMU framework" > diff --git a/drivers/perf/Makefile b/drivers/perf/Makefile > index 29b1c28203ef..d43df81d52f7 100644 > --- a/drivers/perf/Makefile > +++ b/drivers/perf/Makefile > @@ -6,6 +6,9 @@ obj-$(CONFIG_ARM_DSU_PMU) += arm_dsu_pmu.o > obj-$(CONFIG_ARM_PMU) += arm_pmu.o arm_pmu_platform.o > obj-$(CONFIG_ARM_PMU_ACPI) += arm_pmu_acpi.o > obj-$(CONFIG_ARM_PMUV3) += arm_pmuv3.o > +obj-$(CONFIG_ARM_V6_PMU) += arm_v6_pmu.o > +obj-$(CONFIG_ARM_V7_PMU) += arm_v7_pmu.o > +obj-$(CONFIG_ARM_XSCALE_PMU) += arm_xscale_pmu.o > obj-$(CONFIG_ARM_SMMU_V3_PMU) += arm_smmuv3_pmu.o > obj-$(CONFIG_FSL_IMX8_DDR_PMU) += fsl_imx8_ddr_perf.o > obj-$(CONFIG_FSL_IMX9_DDR_PMU) += fsl_imx9_ddr_perf.o > diff --git a/arch/arm/kernel/perf_event_v6.c b/drivers/perf/arm_v6_pmu.c > similarity index 99% > rename from arch/arm/kernel/perf_event_v6.c > rename to drivers/perf/arm_v6_pmu.c > index d9fd53841591..f7593843bb85 100644 > --- a/arch/arm/kernel/perf_event_v6.c > +++ b/drivers/perf/arm_v6_pmu.c > @@ -31,8 +31,6 @@ > * enable the interrupt. > */ > > -#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) > - > #include <asm/cputype.h> > #include <asm/irq_regs.h> > > @@ -445,4 +443,3 @@ static struct platform_driver armv6_pmu_driver = { > }; > > builtin_platform_driver(armv6_pmu_driver); > -#endif /* CONFIG_CPU_V6 || CONFIG_CPU_V6K */ > diff --git a/arch/arm/kernel/perf_event_v7.c b/drivers/perf/arm_v7_pmu.c > similarity index 99% > rename from arch/arm/kernel/perf_event_v7.c > rename to drivers/perf/arm_v7_pmu.c > index a3322e2b3ea4..fdd936fbd188 100644 > --- a/arch/arm/kernel/perf_event_v7.c > +++ b/drivers/perf/arm_v7_pmu.c > @@ -17,8 +17,6 @@ > * counter and all 4 performance counters together can be reset separately. > */ > > -#ifdef CONFIG_CPU_V7 > - > #include <asm/cp15.h> > #include <asm/cputype.h> > #include <asm/irq_regs.h> > @@ -2002,4 +2000,3 @@ static struct platform_driver armv7_pmu_driver = { > }; > > builtin_platform_driver(armv7_pmu_driver); > -#endif /* CONFIG_CPU_V7 */ > diff --git a/arch/arm/kernel/perf_event_xscale.c b/drivers/perf/arm_xscale_pmu.c > similarity index 99% > rename from arch/arm/kernel/perf_event_xscale.c > rename to drivers/perf/arm_xscale_pmu.c > index 7a2ba1c689a7..3d8b72d6b37f 100644 > --- a/arch/arm/kernel/perf_event_xscale.c > +++ b/drivers/perf/arm_xscale_pmu.c > @@ -13,8 +13,6 @@ > * PMU structures. > */ > > -#ifdef CONFIG_CPU_XSCALE > - > #include <asm/cputype.h> > #include <asm/irq_regs.h> > > @@ -745,4 +743,3 @@ static struct platform_driver xscale_pmu_driver = { > }; > > builtin_platform_driver(xscale_pmu_driver); > -#endif /* CONFIG_CPU_XSCALE */ > > -- > 2.43.0 > >
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index 89a77e3f51d2..aaae31b8c4a5 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile @@ -78,8 +78,6 @@ obj-$(CONFIG_CPU_XSC3) += xscale-cp0.o obj-$(CONFIG_CPU_MOHAWK) += xscale-cp0.o obj-$(CONFIG_IWMMXT) += iwmmxt.o obj-$(CONFIG_PERF_EVENTS) += perf_regs.o perf_callchain.o -obj-$(CONFIG_HW_PERF_EVENTS) += perf_event_xscale.o perf_event_v6.o \ - perf_event_v7.o AFLAGS_iwmmxt.o := -Wa,-mcpu=iwmmxt obj-$(CONFIG_ARM_CPU_TOPOLOGY) += topology.o obj-$(CONFIG_VDSO) += vdso.o diff --git a/drivers/perf/Kconfig b/drivers/perf/Kconfig index 7526a9e714fa..aa9530b4064f 100644 --- a/drivers/perf/Kconfig +++ b/drivers/perf/Kconfig @@ -56,6 +56,18 @@ config ARM_PMU Say y if you want to use CPU performance monitors on ARM-based systems. +config ARM_V6_PMU + depends on ARM_PMU && (CPU_V6 || CPU_V6K) + def_bool y + +config ARM_V7_PMU + depends on ARM_PMU && CPU_V7 + def_bool y + +config ARM_XSCALE_PMU + depends on ARM_PMU && CPU_XSCALE + def_bool y + config RISCV_PMU depends on RISCV bool "RISC-V PMU framework" diff --git a/drivers/perf/Makefile b/drivers/perf/Makefile index 29b1c28203ef..d43df81d52f7 100644 --- a/drivers/perf/Makefile +++ b/drivers/perf/Makefile @@ -6,6 +6,9 @@ obj-$(CONFIG_ARM_DSU_PMU) += arm_dsu_pmu.o obj-$(CONFIG_ARM_PMU) += arm_pmu.o arm_pmu_platform.o obj-$(CONFIG_ARM_PMU_ACPI) += arm_pmu_acpi.o obj-$(CONFIG_ARM_PMUV3) += arm_pmuv3.o +obj-$(CONFIG_ARM_V6_PMU) += arm_v6_pmu.o +obj-$(CONFIG_ARM_V7_PMU) += arm_v7_pmu.o +obj-$(CONFIG_ARM_XSCALE_PMU) += arm_xscale_pmu.o obj-$(CONFIG_ARM_SMMU_V3_PMU) += arm_smmuv3_pmu.o obj-$(CONFIG_FSL_IMX8_DDR_PMU) += fsl_imx8_ddr_perf.o obj-$(CONFIG_FSL_IMX9_DDR_PMU) += fsl_imx9_ddr_perf.o diff --git a/arch/arm/kernel/perf_event_v6.c b/drivers/perf/arm_v6_pmu.c similarity index 99% rename from arch/arm/kernel/perf_event_v6.c rename to drivers/perf/arm_v6_pmu.c index d9fd53841591..f7593843bb85 100644 --- a/arch/arm/kernel/perf_event_v6.c +++ b/drivers/perf/arm_v6_pmu.c @@ -31,8 +31,6 @@ * enable the interrupt. */ -#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) - #include <asm/cputype.h> #include <asm/irq_regs.h> @@ -445,4 +443,3 @@ static struct platform_driver armv6_pmu_driver = { }; builtin_platform_driver(armv6_pmu_driver); -#endif /* CONFIG_CPU_V6 || CONFIG_CPU_V6K */ diff --git a/arch/arm/kernel/perf_event_v7.c b/drivers/perf/arm_v7_pmu.c similarity index 99% rename from arch/arm/kernel/perf_event_v7.c rename to drivers/perf/arm_v7_pmu.c index a3322e2b3ea4..fdd936fbd188 100644 --- a/arch/arm/kernel/perf_event_v7.c +++ b/drivers/perf/arm_v7_pmu.c @@ -17,8 +17,6 @@ * counter and all 4 performance counters together can be reset separately. */ -#ifdef CONFIG_CPU_V7 - #include <asm/cp15.h> #include <asm/cputype.h> #include <asm/irq_regs.h> @@ -2002,4 +2000,3 @@ static struct platform_driver armv7_pmu_driver = { }; builtin_platform_driver(armv7_pmu_driver); -#endif /* CONFIG_CPU_V7 */ diff --git a/arch/arm/kernel/perf_event_xscale.c b/drivers/perf/arm_xscale_pmu.c similarity index 99% rename from arch/arm/kernel/perf_event_xscale.c rename to drivers/perf/arm_xscale_pmu.c index 7a2ba1c689a7..3d8b72d6b37f 100644 --- a/arch/arm/kernel/perf_event_xscale.c +++ b/drivers/perf/arm_xscale_pmu.c @@ -13,8 +13,6 @@ * PMU structures. */ -#ifdef CONFIG_CPU_XSCALE - #include <asm/cputype.h> #include <asm/irq_regs.h> @@ -745,4 +743,3 @@ static struct platform_driver xscale_pmu_driver = { }; builtin_platform_driver(xscale_pmu_driver); -#endif /* CONFIG_CPU_XSCALE */
It is preferred to put drivers under drivers/ rather than under arch/. The PMU drivers also depend on arm_pmu.c, so it's better to place them all together. Signed-off-by: Rob Herring (Arm) <robh@kernel.org> --- arch/arm/kernel/Makefile | 2 -- drivers/perf/Kconfig | 12 ++++++++++++ drivers/perf/Makefile | 3 +++ arch/arm/kernel/perf_event_v6.c => drivers/perf/arm_v6_pmu.c | 3 --- arch/arm/kernel/perf_event_v7.c => drivers/perf/arm_v7_pmu.c | 3 --- .../perf_event_xscale.c => drivers/perf/arm_xscale_pmu.c | 3 --- 6 files changed, 15 insertions(+), 11 deletions(-)