ARM: pmu: provide a registration mechanism for IRQs [v2]
Subsystems (6)
cover ARM: pmu: provide a registration mechanism for IRQs [v2]
This is version 2 of the patch series originally posted here:
http://lists.infradead.org/pipermail/linux-arm-kernel/2010-March/011162.html
Changes from the original version include:
- Removal of const keyword from IRQs to make it easier to select the IRQs to register at runtime.
- Support for all the relevant Realview boards
- Support for OMAP2, OMAP3, BCMRING, iop and PXA platforms
The main reason for submitting this is to get some feedback on the registration code I've added to the board files because I'm not familiar with how the omap / bcmring / pxa / iop trees are structured.
All feedback welcome [including the results of any testing for the platforms I've mentioned].
Will Deacon (6):
ARM: pmu: register IRQs at runtime
ARM: Realview: register PMU IRQs during board initialisation
ARM: OMAP: register PMU IRQs during board initialisation
ARM: BCMRING: register PMU IRQ during board initialisation
ARM: iop3xx: register PMU IRQs during board initialisation
ARM: pxa: register PMU IRQs during board initialisation
arch/arm/include/asm/pmu.h | 36 ++++++++--- arch/arm/kernel/perf_event.c | 6 +- arch/arm/kernel/pmu.c | 103 ++++++++++++++++------------- arch/arm/mach-bcmring/arch.c | 13 ++++ arch/arm/mach-omap2/devices.c | 30 +++++++++ arch/arm/mach-pxa/pxa25x.c | 14 ++++ arch/arm/mach-pxa/pxa27x.c | 13 ++++ arch/arm/mach-pxa/pxa3xx.c | 14 ++++ arch/arm/mach-realview/realview_eb.c | 15 ++++ arch/arm/mach-realview/realview_pb1176.c | 12 ++++ arch/arm/mach-realview/realview_pb11mp.c | 15 ++++ arch/arm/mach-realview/realview_pba8.c | 12 ++++ arch/arm/mach-realview/realview_pbx.c | 15 ++++ arch/arm/plat-iop/Makefile | 2 + arch/arm/plat-iop/pmu.c | 37 +++++++++++ 15 files changed, 278 insertions(+), 59 deletions(-) create mode 100644 arch/arm/plat-iop/pmu.c
RFC PATCH 1/6 ARM: pmu: register IRQs at runtime
The current PMU infrastructure for ARM requires that the IRQs for the PMU device are fixed at compile time and are selected based on the ARCH_ or MACH_ flags. This has the disadvantage of tying the Kernel down to a particular board as far as profiling is concerned.
This patch replaces the compile-time IRQ registration with a runtime mechanism which allows the IRQs to be passed in from the board initialisation files using the pmu_device_register() function.
A further advantage of this change is that there is scope for registering different types of performance counters in the future by adding a new field to the arm_pmu_type enumeration.
--- arch/arm/include/asm/pmu.h | 36 +++++++++++---- arch/arm/kernel/perf_event.c | 6 +- arch/arm/kernel/pmu.c | 103 +++++++++++++++++++++++------------------- 3 files changed, 86 insertions(+), 59 deletions(-)
arch/arm/include/asm/pmu.h +26 -10
@@ -12,22 +12,38 @@#ifndef __ARM_PMU_H__#define __ARM_PMU_H__ +enum arm_pmu_type { +ARM_PMU_DEVICE_CPU =0 , +ARM_NUM_PMU_DEVICES , +}; +#ifdef CONFIG_CPU_HAS_PMU struct pmu_irqs { -const int *irqs; -int num_irqs; +enum arm_pmu_type device_type; +int *irqs; +int num_irqs; };/** +* pmu_device_register() - register a new counter source with the kernel +* +* Register a new PMU device and its corresponding IRQs. Only one instance +* of each device type may be registered at once, but multiple IRQs can be +* specified in the corresponding struct pmu_irqs. +*/ +void +pmu_device_register (struct pmu_irqs *device); + +/** * reserve_pmu() - reserve the hardware performance counters * * Reserve the hardware performance counters in the system for exclusive use. * The 'struct pmu_irqs' for the system is returned on success, ERR_PTR() * encoded error on failure. */ -extern const struct pmu_irqs * -reserve_pmu (void ); +extern struct pmu_irqs * +reserve_pmu (enum arm_pmu_type device);/** * release_pmu() - Relinquish control of the performance counters
@@ -38,7 +54,7 @@ reserve_pmu(void);* a cookie. */ extern int -release_pmu (const struct pmu_irqs *irqs); +release_pmu (struct pmu_irqs *irqs);/** * init_pmu() - Initialise the PMU.
@@ -48,24 +64,24 @@ release_pmu(const struct pmu_irqs *irqs);* the actual hardware initialisation. */ extern int -init_pmu (void ); +init_pmu (enum arm_pmu_type device);#else /* CONFIG_CPU_HAS_PMU */ -static inline const struct pmu_irqs * -reserve_pmu (void ) +static inline struct pmu_irqs * +reserve_pmu (enum arm_pmu_type device) {return ERR_PTR (-ENODEV ); }static inline int -release_pmu (const struct pmu_irqs *irqs) +release_pmu (struct pmu_irqs *irqs) {return -ENODEV ; }static inline int -init_pmu (void ) +init_pmu (enum arm_pmu_type device) {return -ENODEV ; }
arch/arm/kernel/perf_event.c +3 -3
@@ -26,7 +26,7 @@#include <asm/pmu.h> #include <asm/stacktrace.h> -static const struct pmu_irqs *pmu_irqs; +static struct pmu_irqs *pmu_irqs;/* * Hardware lock to serialize accesses to PMU registers. Needed for the
@@ -317,13 +317,13 @@ armpmu_reserve_hardware(void)int i;int err; - pmu_irqs =reserve_pmu (); + pmu_irqs =reserve_pmu (ARM_PMU_DEVICE_CPU );if (IS_ERR (pmu_irqs)) {pr_warning ("unable to reserve pmu\n" );return PTR_ERR (pmu_irqs); } -init_pmu (); +init_pmu (ARM_PMU_DEVICE_CPU );if (pmu_irqs->num_irqs <1 ) {pr_err ("no irqs for PMUs defined\n" );
arch/arm/kernel/pmu.c +57 -46
137 lines not on this page · raw message
Signature · 1 line
1.6.3.3
RFC PATCH 2/6 ARM: Realview: register PMU IRQs during board initialisation
This patch updates the initialisation routines for the Realview boards so that they register their PMU IRQs with the PMU framework in the Kernel.
--- arch/arm/mach-realview/realview_eb.c | 15 +++++++++++++++ arch/arm/mach-realview/realview_pb1176.c | 12 ++++++++++++ arch/arm/mach-realview/realview_pb11mp.c | 15 +++++++++++++++ arch/arm/mach-realview/realview_pba8.c | 12 ++++++++++++ arch/arm/mach-realview/realview_pbx.c | 15 +++++++++++++++ 5 files changed, 69 insertions(+), 0 deletions(-)
arch/arm/mach-realview/realview_eb.c +15 -0
@@ -31,6 +31,7 @@#include <asm/irq.h> #include <asm/leds.h> #include <asm/mach-types.h> +#include <asm/pmu.h> #include <asm/hardware/gic.h> #include <asm/hardware/icst307.h> #include <asm/hardware/cache-l2x0.h>
@@ -294,6 +295,19 @@ static struct resource realview_eb_isp1761_resources[] = { }, }; +static int pmu_irqs[] = { +IRQ_EB11MP_PMU_CPU0 , +IRQ_EB11MP_PMU_CPU1 , +IRQ_EB11MP_PMU_CPU2 , +IRQ_EB11MP_PMU_CPU3 , +}; + +static struct pmu_irqs cpu_pmu_device = { + .device_type =ARM_PMU_DEVICE_CPU , + .irqs = pmu_irqs, + .num_irqs =ARRAY_SIZE (pmu_irqs), +}; +static void __init gic_init_irq (void ) {if (core_tile_eb11mp () ||core_tile_a9mp ()) {
@@ -413,6 +427,7 @@ static void __init realview_eb_init(void)platform_device_register (&realview_i2c_device);eth_device_register ();realview_usb_register (realview_eb_isp1761_resources); +pmu_device_register (&cpu_pmu_device);for (i =0 ; i <ARRAY_SIZE (amba_devs); i++) {struct amba_device *d = amba_devs[i];
arch/arm/mach-realview/realview_pb1176.c +12 -0
@@ -31,6 +31,7 @@#include <asm/irq.h> #include <asm/leds.h> #include <asm/mach-types.h> +#include <asm/pmu.h> #include <asm/hardware/gic.h> #include <asm/hardware/icst307.h> #include <asm/hardware/cache-l2x0.h>
@@ -263,6 +264,16 @@ static struct resource realview_pb1176_isp1761_resources[] = { }, }; +static int pmu_irqs[] = { +IRQ_DC1176_CORE_PMU , +}; + +static struct pmu_irqs cpu_pmu_device = { + .device_type =ARM_PMU_DEVICE_CPU , + .irqs = pmu_irqs, + .num_irqs =ARRAY_SIZE (pmu_irqs), +}; +static void __init gic_init_irq (void ) {/* ARM1176 DevChip GIC, primary */
@@ -324,6 +335,7 @@ static void __init realview_pb1176_init(void)realview_eth_register (NULL , realview_pb1176_smsc911x_resources);platform_device_register (&realview_i2c_device);realview_usb_register (realview_pb1176_isp1761_resources); +pmu_device_register (&cpu_pmu_device);for (i =0 ; i <ARRAY_SIZE (amba_devs); i++) {struct amba_device *d = amba_devs[i];
arch/arm/mach-realview/realview_pb11mp.c +15 -0
@@ -31,6 +31,7 @@#include <asm/irq.h> #include <asm/leds.h> #include <asm/mach-types.h> +#include <asm/pmu.h> #include <asm/hardware/gic.h> #include <asm/hardware/icst307.h> #include <asm/hardware/cache-l2x0.h>
@@ -260,6 +261,19 @@ static struct resource realview_pb11mp_isp1761_resources[] = { }, }; +static int pmu_irqs[] = { +IRQ_TC11MP_PMU_CPU0 , +IRQ_TC11MP_PMU_CPU1 , +IRQ_TC11MP_PMU_CPU2 , +IRQ_TC11MP_PMU_CPU3 , +}; + +static struct pmu_irqs cpu_pmu_device = { + .device_type =ARM_PMU_DEVICE_CPU , + .irqs = pmu_irqs, + .num_irqs =ARRAY_SIZE (pmu_irqs), +}; +static void __init gic_init_irq (void ) {unsigned int pldctrl;
@@ -329,6 +343,7 @@ static void __init realview_pb11mp_init(void)platform_device_register (&realview_i2c_device);platform_device_register (&realview_cf_device);realview_usb_register (realview_pb11mp_isp1761_resources); +pmu_device_register (&cpu_pmu_device);for (i =0 ; i <ARRAY_SIZE (amba_devs); i++) {struct amba_device *d = amba_devs[i];
arch/arm/mach-realview/realview_pba8.c +12 -0
@@ -30,6 +30,7 @@#include <asm/irq.h> #include <asm/leds.h> #include <asm/mach-types.h> +#include <asm/pmu.h> #include <asm/hardware/gic.h> #include <asm/hardware/icst307.h>
@@ -250,6 +251,16 @@ static struct resource realview_pba8_isp1761_resources[] = { }, }; +static int pmu_irqs[] = { +IRQ_PBA8_PMU , +}; + +static struct pmu_irqs cpu_pmu_device = { + .device_type =ARM_PMU_DEVICE_CPU , + .irqs = pmu_irqs, + .num_irqs =ARRAY_SIZE (pmu_irqs), +}; +static void __init gic_init_irq (void ) {/* ARM PB-A8 on-board GIC */
@@ -296,6 +307,7 @@ static void __init realview_pba8_init(void)platform_device_register (&realview_i2c_device);platform_device_register (&realview_cf_device);realview_usb_register (realview_pba8_isp1761_resources); +pmu_device_register (&cpu_pmu_device);for (i =0 ; i <ARRAY_SIZE (amba_devs); i++) {struct amba_device *d = amba_devs[i];
arch/arm/mach-realview/realview_pbx.c +15 -0
@@ -29,6 +29,7 @@#include <asm/irq.h> #include <asm/leds.h> #include <asm/mach-types.h> +#include <asm/pmu.h> #include <asm/smp_twd.h> #include <asm/hardware/gic.h> #include <asm/hardware/cache-l2x0.h>
@@ -270,6 +271,19 @@ static struct resource realview_pbx_isp1761_resources[] = { }, }; +static int pmu_irqs[] = { +IRQ_PBX_PMU_CPU0 , +IRQ_PBX_PMU_CPU1 , +IRQ_PBX_PMU_CPU2 , +IRQ_PBX_PMU_CPU3 , +}; + +static struct pmu_irqs cpu_pmu_device = { + .device_type =ARM_PMU_DEVICE_CPU , + .irqs = pmu_irqs, + .num_irqs =ARRAY_SIZE (pmu_irqs), +}; +static void __init gic_init_irq (void ) {/* ARM PBX on-board GIC */
@@ -363,6 +377,7 @@ static void __init realview_pbx_init(void)platform_device_register (&realview_i2c_device);platform_device_register (&realview_cf_device);realview_usb_register (realview_pbx_isp1761_resources); +pmu_device_register (&cpu_pmu_device);for (i =0 ; i <ARRAY_SIZE (amba_devs); i++) {struct amba_device *d = amba_devs[i];
Signature · 1 line
1.6.3.3
RFC PATCH 3/6 ARM: OMAP: register PMU IRQs during board initialisation
This patch updates the initialisation routines for the OMAP2 and OMAP3 boards so that they register their PMU IRQs with the PMU framework in the Kernel.
--- arch/arm/mach-omap2/devices.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/devices.c +30 -0
@@ -17,8 +17,10 @@#include <linux/clk.h> #include <mach/hardware.h> +#include <mach/irqs.h> #include <asm/mach-types.h> #include <asm/mach/map.h> +#include <asm/pmu.h> #include <plat/control.h> #include <plat/tc.h>
@@ -435,6 +437,33 @@ static void omap_init_mcspi(void)static inline void omap_init_mcspi (void ) {}#endif +static int omap2_pmu_irqs[] = { +3 , +}; + +static int omap3_pmu_irqs[] = { +INT_34XX_BENCH_MPU_EMUL , +}; + +static struct pmu_irqs cpu_pmu_device = { + .device_type =ARM_PMU_DEVICE_CPU , +}; + +static void omap_init_pmu (void ) +{ +if (cpu_is_omap24xx ()) { + cpu_pmu_device.irqs = omap2_pmu_irqs;; + cpu_pmu_device.num_irqs =ARRAY_SIZE (omap2_pmu_irqs); + }else if (cpu_is_omap34xx ()) { + cpu_pmu_device.irqs = omap3_pmu_irqs; + cpu_pmu_device.num_irqs =ARRAY_SIZE (omap3_pmu_irqs); + }else { +return ; + } + +pmu_device_register (&cpu_pmu_device); +} + #ifdef CONFIG_OMAP_SHA1_MD5 static struct resource sha1_md5_resources[] = { {
@@ -774,6 +803,7 @@ static int __init omap2_init_devices(void)omap_init_camera ();omap_init_mbox ();omap_init_mcspi (); +omap_init_pmu ();omap_hdq_init ();omap_init_sti ();omap_init_sha1_md5 ();
Signature · 1 line
1.6.3.3
RFC PATCH 4/6 ARM: BCMRING: register PMU IRQ during board initialisation
This patch updates the initialisation routine for the BCMRING platform so that it registers its PMU IRQ with the PMU framework in the Kernel.
--- arch/arm/mach-bcmring/arch.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-)
arch/arm/mach-bcmring/arch.c +13 -0
@@ -26,6 +26,7 @@#include <linux/sysctl.h> #include <asm/irq.h> +#include <asm/pmu.h> #include <asm/setup.h> #include <asm/mach-types.h> #include <asm/mach/time.h>
@@ -89,6 +90,16 @@ static struct platform_device *devices[] __initdata = { &nand_device, }; +static int pmu_irqs[] = { +IRQ_PMUIRQ , +}; + +static struct pmu_irqs cpu_pmu_device = { + .device_type =ARM_PMU_DEVICE_CPU , + .irqs = pmu_irqs, + .num_irqs =ARRAY_SIZE (pmu_irqs), +}; +/**************************************************************************** * * Called from the customize_machine function in arch/arm/kernel/setup.c
@@ -108,6 +119,8 @@ static void __init bcmring_init_machine(void)platform_add_devices (devices,ARRAY_SIZE (devices)); +pmu_device_register (&cpu_pmu_device); +bcmring_amba_init ();dma_init ();
Signature · 1 line
1.6.3.3
RFC PATCH 5/6 ARM: iop3xx: register PMU IRQs during board initialisation
This patch adds an initcall for the iop3xx platforms so that they register their PMU IRQS with the PMU framework in the Kernel.
--- arch/arm/plat-iop/Makefile | 2 ++ arch/arm/plat-iop/pmu.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) create mode 100644 arch/arm/plat-iop/pmu.c
arch/arm/plat-iop/Makefile +2 -0
@@ -13,6 +13,7 @@ obj-$(CONFIG_ARCH_IOP32X) += time.o obj-$(CONFIG_ARCH_IOP32X) += io.o obj-$(CONFIG_ARCH_IOP32X) += cp6.o obj-$(CONFIG_ARCH_IOP32X) += adma.o +obj-$(CONFIG_ARCH_IOP32X) += pmu.o # IOP33X obj-$(CONFIG_ARCH_IOP33X) += gpio.o
@@ -23,6 +24,7 @@ obj-$(CONFIG_ARCH_IOP33X) += time.o obj-$(CONFIG_ARCH_IOP33X) += io.o obj-$(CONFIG_ARCH_IOP33X) += cp6.o obj-$(CONFIG_ARCH_IOP33X) += adma.o +obj-$(CONFIG_ARCH_IOP33X) += pmu.o # IOP13XX obj-$(CONFIG_ARCH_IOP13XX) += cp6.o
arch/arm/plat-iop/pmu.c new file +37 -0
@@ -0,0 +1,37 @@ +/* +* PMU IRQ registration for the iop3xx xscale PMU families. +* Copyright (C) 2010 Will Deacon, 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. +* +*/ + +#include <asm/pmu.h> +#include <mach/irqs.h> + +#ifdef CONFIG_ARCH_IOP32X +static int pmu_irqs[] = { +IRQ_IOP32X_CORE_PMU , +}; +#endif +#ifdef CONFIG_ARCH_IOP33X +static int pmu_irqs[] = { +IRQ_IOP33X_CORE_PMU , +}; +#endif + +static struct pmu_irqs cpu_pmu_device = { + .device_type =ARM_PMU_DEVICE_CPU , + .irqs = pmu_irqs, + .num_irqs =ARRAY_SIZE (pmu_irqs), +}; + +static int __init iop3xx_pmu_init (void ) +{ +pmu_device_register (&cpu_pmu_device); +return 0 ; +} + +arch_initcall (iop3xx_pmu_init);
Signature · 1 line
1.6.3.3
RFC PATCH 6/6 ARM: pxa: register PMU IRQs during board initialisation
This patch modifies the initialisation routines for the PXA25x, PXA27x and PXA3xx platforms so that they register their PMU IRQs with the PMU framework in the Kernel.
--- arch/arm/mach-pxa/pxa25x.c | 14 ++++++++++++++ arch/arm/mach-pxa/pxa27x.c | 13 +++++++++++++ arch/arm/mach-pxa/pxa3xx.c | 14 ++++++++++++++ 3 files changed, 41 insertions(+), 0 deletions(-)
arch/arm/mach-pxa/pxa25x.c +14 -0
@@ -23,6 +23,8 @@#include <linux/suspend.h> #include <linux/sysdev.h> +#include <asm/pmu.h> +#include <mach/hardware.h> #include <mach/irqs.h> #include <mach/gpio.h>
@@ -341,6 +343,16 @@ static struct sys_device pxa25x_sysdev[] = { }, }; +static int pmu_irqs[] = { +IRQ_PMU , +}; + +static struct pmu_irqs cpu_pmu_device = { + .device_type =ARM_PMU_DEVICE_CPU , + .irqs = pmu_irqs, + .num_irqs =ARRAY_SIZE (pmu_irqs), +}; +static int __init pxa25x_init (void ) {int i, ret =0 ;
@@ -366,6 +378,8 @@ static int __init pxa25x_init(void) ARRAY_SIZE(pxa25x_devices));if (ret)return ret; + +pmu_device_register (&cpu_pmu_device); }/* Only add HWUART for PXA255/26x; PXA210/250 do not have it. */
arch/arm/mach-pxa/pxa27x.c +13 -0
@@ -18,6 +18,8 @@#include <linux/platform_device.h> #include <linux/sysdev.h> +#include <asm/pmu.h> +#include <mach/hardware.h> #include <asm/irq.h> #include <mach/irqs.h>
@@ -384,6 +386,16 @@ static struct sys_device pxa27x_sysdev[] = { }, }; +static int pmu_irqs[] = { +IRQ_PMU , +}; + +static struct pmu_irqs cpu_pmu_device = { + .device_type =ARM_PMU_DEVICE_CPU , + .irqs = pmu_irqs, + .num_irqs =ARRAY_SIZE (pmu_irqs), +}; +static int __init pxa27x_init (void ) {int i, ret =0 ;
@@ -406,6 +418,7 @@ static int __init pxa27x_init(void) } ret =platform_add_devices (devices,ARRAY_SIZE (devices)); +pmu_device_register (&cpu_pmu_device); }return ret;
arch/arm/mach-pxa/pxa3xx.c +14 -0
@@ -22,8 +22,11 @@#include <linux/io.h> #include <linux/sysdev.h> +#include <asm/pmu.h> +#include <mach/hardware.h> #include <mach/gpio.h> +#include <mach/irqs.h> #include <mach/pxa3xx-regs.h> #include <mach/reset.h> #include <mach/ohci.h>
@@ -618,6 +621,16 @@ static struct sys_device pxa3xx_sysdev[] = { }, }; +static int pmu_irqs[] = { +IRQ_PMU , +}; + +static struct pmu_irqs cpu_pmu_device = { + .device_type =ARM_PMU_DEVICE_CPU , + .irqs = pmu_irqs, + .num_irqs =ARRAY_SIZE (pmu_irqs), +}; +static int __init pxa3xx_init (void ) {int i, ret =0 ;
@@ -648,6 +661,7 @@ static int __init pxa3xx_init(void) } ret =platform_add_devices (devices,ARRAY_SIZE (devices)); +pmu_device_register (&cpu_pmu_device); }return ret;
Signature · 1 line
1.6.3.3
RFC PATCH 1/6 ARM: pmu: register IRQs at runtime
In reply to Will DeaconQuoted 9 lines · Will Deacon
The current PMU infrastructure for ARM requires that the IRQs for the PMU device are fixed at compile time and are selected based on the
ARCH_orMACH_flags. This has the disadvantage of tying the Kernel down to a particular board as far as profiling is concerned.This patch replaces the compile-time IRQ registration with a runtime mechanism which allows the IRQs to be passed in from the board initialisation files using the
pmu_device_register()function.
Quoted 7 lines
A further advantage of this change is that there is scope for registering different types of performance counters in the future by adding a new field to the
arm_pmu_typeenumeration.Cc Russell King - ARM Linux <[email protected]>Cc Jamie Iles <[email protected]>Signed-off-by Will Deacon <[email protected]>
Hi Will,
I much prefer this rather than the old static list that we had before. As an aside, do you know of any ARM PMU's that need memory resources in addition to the IRQ's? If so perhaps a platform_device might be an easy way of extending this.
Anyway,
Jamie
RFC PATCH 1/6 ARM: pmu: register IRQs at runtime
Hi Jamie,
Quoted 4 lines
I much prefer this rather than the old static list that we had before. As an aside, do you know of any ARM PMU's that need memory resources in addition to the IRQ's? If so perhaps a
platform_devicemight be an easy way of extending this.
Well, the ARM11MPCore SCU counters are memory mapped and I have a feeling that anything [counter-wise] outside the CPU core will likely be memory mapped in the future.
I've had a go at using a platform_device instead of the struct pmu_irqs, I'll post the changes for you to take a look at.
Quoted 1 line
Acked-by Jamie Iles <[email protected]>
Thanks for that. Please take a look at the platform_device version and see what you reckon.
Cheers,
Will
RFC PATCH 1/6 ARM: pmu: register IRQs at runtime
In reply to Jamie IlesThe current PMU infrastructure for ARM requires that the IRQs for the PMU device are fixed at compile time and are selected based on the ARCH_ or MACH_ flags. This has the disadvantage of tying the Kernel down to a particular board as far as profiling is concerned.
This patch replaces the compile-time IRQ registration with a runtime mechanism which allows the IRQs to be registered with the framework as a platform_device.
A further advantage of this change is that there is scope for registering different types of performance counters in the future by changing the id of the platform_device and attaching different resources to it.
--- arch/arm/include/asm/pmu.h | 30 +++++----- arch/arm/kernel/perf_event.c | 36 +++++++------ arch/arm/kernel/pmu.c | 121 ++++++++++++++++++++++++++---------------- 3 files changed, 110 insertions(+), 77 deletions(-)
arch/arm/include/asm/pmu.h +15 -15
@@ -12,33 +12,33 @@#ifndef __ARM_PMU_H__#define __ARM_PMU_H__ -#ifdef CONFIG_CPU_HAS_PMU - -struct pmu_irqs { -const int *irqs; -int num_irqs; +enum arm_pmu_type { +ARM_PMU_DEVICE_CPU =0 , +ARM_NUM_PMU_DEVICES , }; +#ifdef CONFIG_CPU_HAS_PMU +/** * reserve_pmu() - reserve the hardware performance counters * * Reserve the hardware performance counters in the system for exclusive use. -* The 'struct pmu_irqs' for the system is returned on success, ERR_PTR() +* The platform_device for the system is returned on success, ERR_PTR() * encoded error on failure. */ -extern const struct pmu_irqs * -reserve_pmu (void ); +extern struct platform_device * +reserve_pmu (enum arm_pmu_type device);/** * release_pmu() - Relinquish control of the performance counters * * Release the performance counters and allow someone else to use them. * Callers must have disabled the counters and released IRQs before calling -* this. The 'struct pmu_irqs' returned from reserve_pmu() must be passed as +* this. The platform_device returned from reserve_pmu() must be passed as * a cookie. */ extern int -release_pmu (const struct pmu_irqs *irqs); +release_pmu (struct platform_device *pdev);/** * init_pmu() - Initialise the PMU.
@@ -48,24 +48,24 @@ release_pmu(const struct pmu_irqs *irqs);* the actual hardware initialisation. */ extern int -init_pmu (void ); +init_pmu (enum arm_pmu_type device);#else /* CONFIG_CPU_HAS_PMU */ -static inline const struct pmu_irqs * -reserve_pmu (void ) +static inline struct platform_device * +reserve_pmu (enum arm_pmu_type device) {return ERR_PTR (-ENODEV ); }static inline int -release_pmu (const struct pmu_irqs *irqs) +release_pmu (struct platform_device *pdev) {return -ENODEV ; }static inline int -init_pmu (void ) +init_pmu (enum arm_pmu_type device) {return -ENODEV ; }
arch/arm/kernel/perf_event.c +19 -17
@@ -17,6 +17,7 @@#include <linux/interrupt.h> #include <linux/kernel.h> #include <linux/perf_event.h> +#include <linux/platform_device.h> #include <linux/spinlock.h> #include <linux/uaccess.h>
@@ -26,7 +27,7 @@#include <asm/pmu.h> #include <asm/stacktrace.h> -static const struct pmu_irqs *pmu_irqs; +static struct platform_device *pmu_device;/* * Hardware lock to serialize accesses to PMU registers. Needed for the
@@ -317,35 +318,36 @@ armpmu_reserve_hardware(void)int i;int err; - pmu_irqs =reserve_pmu (); -if (IS_ERR (pmu_irqs)) { + pmu_device =reserve_pmu (ARM_PMU_DEVICE_CPU ); +if (IS_ERR (pmu_device)) {pr_warning ("unable to reserve pmu\n" ); -return PTR_ERR (pmu_irqs); +return PTR_ERR (pmu_device); } -init_pmu (); +init_pmu (ARM_PMU_DEVICE_CPU ); -if (pmu_irqs->num_irqs <1 ) { +if (pmu_device->num_resources <1 ) {pr_err ("no irqs for PMUs defined\n" );return -ENODEV ; } -for (i =0 ; i < pmu_irqs->num_irqs; ++i) { - err =request_irq (pmu_irqs->irqs[i], armpmu->handle_irq, +for (i =0 ; i < pmu_device->num_resources; ++i) { + err =request_irq (platform_get_irq (pmu_device, i), + armpmu->handle_irq,IRQF_DISABLED |IRQF_NOBALANCING ,"armpmu" ,NULL );if (err) { -pr_warning ("unable to request IRQ%d for ARM " -"perf counters\n" , pmu_irqs->irqs[i]); +pr_warning ("unable to request IRQ%d for ARM perf " +"counters\n" ,platform_get_irq (pmu_device, i));break ; } }if (err) {for (i = i -1 ; i >=0 ; --i) -free_irq (pmu_irqs->irqs[i],NULL ); -release_pmu (pmu_irqs); - pmu_irqs =NULL ; +free_irq (platform_get_irq (pmu_device, i),NULL ); +release_pmu (pmu_device); + pmu_device =NULL ; }return err;
@@ -356,12 +358,12 @@ armpmu_release_hardware(void) {int i; -for (i = pmu_irqs->num_irqs -1 ; i >=0 ; --i) -free_irq (pmu_irqs->irqs[i],NULL ); +for (i = pmu_device->num_resources -1 ; i >=0 ; --i) +free_irq (platform_get_irq (pmu_device, i),NULL ); armpmu->stop (); -release_pmu (pmu_irqs); - pmu_irqs =NULL ; +release_pmu (pmu_device); + pmu_device =NULL ; }static atomic_t active_events =ATOMIC_INIT (0 );
arch/arm/kernel/pmu.c +76 -45
166 lines not on this page · raw message
Signature · 1 line
1.6.3.3
RFC PATCH 2/6 ARM: Realview: register PMU IRQs during board initialisation
This patch updates the initialisation routines for the Realview boards so that they register their PMU IRQs with the PMU framework in the Kernel.
--- arch/arm/mach-realview/realview_eb.c | 32 ++++++++++++++++++++++++++++++ arch/arm/mach-realview/realview_pb1176.c | 15 ++++++++++++++ arch/arm/mach-realview/realview_pb11mp.c | 32 ++++++++++++++++++++++++++++++ arch/arm/mach-realview/realview_pba8.c | 15 ++++++++++++++ arch/arm/mach-realview/realview_pbx.c | 32 ++++++++++++++++++++++++++++++ 5 files changed, 126 insertions(+), 0 deletions(-)
arch/arm/mach-realview/realview_eb.c +32 -0
@@ -31,6 +31,7 @@#include <asm/irq.h> #include <asm/leds.h> #include <asm/mach-types.h> +#include <asm/pmu.h> #include <asm/hardware/gic.h> #include <asm/hardware/icst307.h> #include <asm/hardware/cache-l2x0.h>
@@ -294,6 +295,36 @@ static struct resource realview_eb_isp1761_resources[] = { }, }; +static struct resource pmu_resources[] = { + [0 ] = { + .start =IRQ_EB11MP_PMU_CPU0 , + .end =IRQ_EB11MP_PMU_CPU0 , + .flags =IORESOURCE_IRQ , + }, + [1 ] = { + .start =IRQ_EB11MP_PMU_CPU1 , + .end =IRQ_EB11MP_PMU_CPU1 , + .flags =IORESOURCE_IRQ , + }, + [2 ] = { + .start =IRQ_EB11MP_PMU_CPU2 , + .end =IRQ_EB11MP_PMU_CPU2 , + .flags =IORESOURCE_IRQ , + }, + [3 ] = { + .start =IRQ_EB11MP_PMU_CPU3 , + .end =IRQ_EB11MP_PMU_CPU3 , + .flags =IORESOURCE_IRQ , + }, +}; + +static struct platform_device pmu_device = { + .name ="arm-pmu" , + .id =ARM_PMU_DEVICE_CPU , + .num_resources =ARRAY_SIZE (pmu_resources), + .resource = pmu_resources, +}; +static void __init gic_init_irq (void ) {if (core_tile_eb11mp () ||core_tile_a9mp ()) {
@@ -407,6 +438,7 @@ static void __init realview_eb_init(void)* Bits: .... ...0 0111 1001 0000 .... .... .... */ l2x0_init (__io_address (REALVIEW_EB11MP_L220_BASE ),0x00790000 ,0xfe000fff );#endif +platform_device_register (&pmu_device); }realview_flash_register (&realview_eb_flash_resource,1 );
arch/arm/mach-realview/realview_pb1176.c +15 -0
@@ -31,6 +31,7 @@#include <asm/irq.h> #include <asm/leds.h> #include <asm/mach-types.h> +#include <asm/pmu.h> #include <asm/hardware/gic.h> #include <asm/hardware/icst307.h> #include <asm/hardware/cache-l2x0.h>
@@ -263,6 +264,19 @@ static struct resource realview_pb1176_isp1761_resources[] = { }, }; +static struct resource pmu_resource = { + .start =IRQ_DC1176_PMU_CPU0 , + .end =IRQ_DC1176_PMU_CPU0 , + .flags =IORESOURCE_IRQ , +}; + +static struct platform_device pmu_device = { + .name ="arm-pmu" , + .id =ARM_PMU_DEVICE_CPU , + .num_resources =1 , + .resource = &pmu_resource, +}; +static void __init gic_init_irq (void ) {/* ARM1176 DevChip GIC, primary */
@@ -324,6 +338,7 @@ static void __init realview_pb1176_init(void)realview_eth_register (NULL , realview_pb1176_smsc911x_resources);platform_device_register (&realview_i2c_device);realview_usb_register (realview_pb1176_isp1761_resources); +platform_device_register (&pmu_device);for (i =0 ; i <ARRAY_SIZE (amba_devs); i++) {struct amba_device *d = amba_devs[i];
arch/arm/mach-realview/realview_pb11mp.c +32 -0
@@ -31,6 +31,7 @@#include <asm/irq.h> #include <asm/leds.h> #include <asm/mach-types.h> +#include <asm/pmu.h> #include <asm/hardware/gic.h> #include <asm/hardware/icst307.h> #include <asm/hardware/cache-l2x0.h>
@@ -260,6 +261,36 @@ static struct resource realview_pb11mp_isp1761_resources[] = { }, }; +static struct resource pmu_resources[] = { + [0 ] = { + .start =IRQ_TC11MP_PMU_CPU0 , + .end =IRQ_TC11MP_PMU_CPU0 , + .flags =IORESOURCE_IRQ , + }, + [1 ] = { + .start =IRQ_TC11MP_PMU_CPU1 , + .end =IRQ_TC11MP_PMU_CPU1 , + .flags =IORESOURCE_IRQ , + }, + [2 ] = { + .start =IRQ_TC11MP_PMU_CPU2 , + .end =IRQ_TC11MP_PMU_CPU2 , + .flags =IORESOURCE_IRQ , + }, + [3 ] = { + .start =IRQ_TC11MP_PMU_CPU3 , + .end =IRQ_TC11MP_PMU_CPU3 , + .flags =IORESOURCE_IRQ , + }, +}; + +static struct platform_device pmu_device = { + .name ="arm-pmu" , + .id =ARM_PMU_DEVICE_CPU , + .num_resources =ARRAY_SIZE (pmu_resources), + .resource = pmu_resources, +}; +static void __init gic_init_irq (void ) {unsigned int pldctrl;
@@ -329,6 +360,7 @@ static void __init realview_pb11mp_init(void)platform_device_register (&realview_i2c_device);platform_device_register (&realview_cf_device);realview_usb_register (realview_pb11mp_isp1761_resources); +platform_device_register (&pmu_device);for (i =0 ; i <ARRAY_SIZE (amba_devs); i++) {struct amba_device *d = amba_devs[i];
arch/arm/mach-realview/realview_pba8.c +15 -0
@@ -30,6 +30,7 @@#include <asm/irq.h> #include <asm/leds.h> #include <asm/mach-types.h> +#include <asm/pmu.h> #include <asm/hardware/gic.h> #include <asm/hardware/icst307.h>
@@ -250,6 +251,19 @@ static struct resource realview_pba8_isp1761_resources[] = { }, }; +static struct resource pmu_resource = { + .start =IRQ_PBA8_PMU , + .end =IRQ_PBA8_PMU , + .flags =IORESOURCE_IRQ , +}; + +static struct platform_device pmu_device = { + .name ="arm-pmu" , + .id =ARM_PMU_DEVICE_CPU , + .num_resources =1 , + .resource = &pmu_resource, +}; +static void __init gic_init_irq (void ) {/* ARM PB-A8 on-board GIC */
@@ -296,6 +310,7 @@ static void __init realview_pba8_init(void)platform_device_register (&realview_i2c_device);platform_device_register (&realview_cf_device);realview_usb_register (realview_pba8_isp1761_resources); +platform_device_register (&pmu_device);for (i =0 ; i <ARRAY_SIZE (amba_devs); i++) {struct amba_device *d = amba_devs[i];
arch/arm/mach-realview/realview_pbx.c +32 -0
@@ -29,6 +29,7 @@#include <asm/irq.h> #include <asm/leds.h> #include <asm/mach-types.h> +#include <asm/pmu.h> #include <asm/smp_twd.h> #include <asm/hardware/gic.h> #include <asm/hardware/cache-l2x0.h>
@@ -270,6 +271,36 @@ static struct resource realview_pbx_isp1761_resources[] = { }, }; +static struct resource pmu_resources[] = { + [0 ] = { + .start =IRQ_PBX_PMU_CPU0 , + .end =IRQ_PBX_PMU_CPU0 , + .flags =IORESOURCE_IRQ , + }, + [1 ] = { + .start =IRQ_PBX_PMU_CPU1 , + .end =IRQ_PBX_PMU_CPU1 , + .flags =IORESOURCE_IRQ , + }, + [2 ] = { + .start =IRQ_PBX_PMU_CPU2 , + .end =IRQ_PBX_PMU_CPU2 , + .flags =IORESOURCE_IRQ , + }, + [3 ] = { + .start =IRQ_PBX_PMU_CPU3 , + .end =IRQ_PBX_PMU_CPU3 , + .flags =IORESOURCE_IRQ , + }, +}; + +static struct platform_device pmu_device = { + .name ="arm-pmu" , + .id =ARM_PMU_DEVICE_CPU , + .num_resources =ARRAY_SIZE (pmu_resources), + .resource = pmu_resources, +}; +static void __init gic_init_irq (void ) {/* ARM PBX on-board GIC */
@@ -354,6 +385,7 @@ static void __init realview_pbx_init(void)/* 16KB way size, 8-way associativity, parity disabled * Bits: .. 0 0 0 0 1 00 1 0 1 001 0 000 0 .... .... .... */ l2x0_init (l2x0_base,0x02520000 ,0xc0000fff ); + platform_device_register(&pmu_device); }#endif
Signature · 1 line
1.6.3.3
RFC PATCH 1/6 ARM: pmu: register IRQs at runtime
In reply to Will DeaconQuoted 11 lines · Will Deacon
The current PMU infrastructure for ARM requires that the IRQs for the PMU device are fixed at compile time and are selected based on the
ARCH_orMACH_flags. This has the disadvantage of tying the Kernel down to a particular board as far as profiling is concerned.This patch replaces the compile-time IRQ registration with a runtime mechanism which allows the IRQs to be registered with the framework as a
platform_device.A further advantage of this change is that there is scope for registering different types of performance counters in the future by changing the id of the
platform_deviceand attaching different resources to it.
Hi Will,
This seems like a nice approach to the problem. A couple of pedantic comments inline!
Jamie
Quoted 7 lines
Cc Linux ARM Kernel <[email protected]>Signed-off-by Will Deacon <[email protected]>--- arch/arm/include/asm/pmu.h | 30 +++++----- arch/arm/kernel/perf_event.c | 36 +++++++------ arch/arm/kernel/pmu.c | 121 ++++++++++++++++++++++++++---------------- 3 files changed, 110 insertions(+), 77 deletions(-)
[snip]
Quoted 7 lines
arch/arm/kernel/pmu.c +7
-0+static int __devinit pmu_device_probe (struct platform_device *pdev) +{ + +if (pdev->id >=ARM_NUM_PMU_DEVICES ) { +pr_warning ("PMU: Received registration request for unknown " +"device %d\n" , pdev->id); +return -EINVAL ;
arch/arm/kernel/pmu.c line 42
Quoted 10 lines
arch/arm/kernel/pmu.c +10
-0+ } + +if (pmu_devices[pdev->id]) +pr_warning ("PMU: Registering new PMU device type %d overwrites " +"previous registration!\n" , pdev->id); +else +pr_info ("PMU: Registered new PMU device of type %d\n" , + pdev->id); + + pmu_devices[pdev->id] = pdev;
struct pdev->id is a signed integer so we should check that it's not less than 0 so we don't overrun pmu_devices..
arch/arm/kernel/pmu.c set_irq_affinity(int irq, · line 95
Quoted 7 lines
arch/arm/kernel/pmu.c +1
-1@@ -79,7 +91,7 @@ set_irq_affinity(int irq,#ifdef CONFIG_SMP int err =irq_set_affinity (irq,cpumask_of (cpu));if (err) -pr_warning ("unable to set irq affinity (irq=%d, cpu=%u)\n" , +pr_warning ("PMU: Unable to set irq affinity (irq=%d, cpu=%u)\n" , irq, cpu);
How about we stick a '#define pr_fmt(fmt) "PMU: " fmt' before the includes so we get consistent naming if we add more pr_*() statements?
arch/arm/kernel/pmu.c set_irq_affinity(int irq, · line 106
Quoted 13 lines
arch/arm/kernel/pmu.c +3
-2return err;#else @@ -87,17 +99,36 @@ set_irq_affinity(int irq,#endif } -int -init_pmu (void ) +static int +init_cpu_pmu (void ) {int i, err =0 ; +struct platform_device *pdev = pmu_devices[ARM_PMU_DEVICE_CPU ];
Just to be safe:
if (!pdev)
return -ENODEV;
Quoted 10 lines
arch/arm/kernel/pmu.c +2
-2-for (i =0 ; i < pmu_irqs.num_irqs; ++i) { - err =set_irq_affinity (pmu_irqs.irqs[i], i); +for (i =0 ; i < pdev->num_resources; ++i) { + err =set_irq_affinity (platform_get_irq (pdev, i), i);if (err)break ; }return err; }
RFC PATCH 1/6 ARM: pmu: register IRQs at runtime
Hi Jamie,
Quoted 2 lines
This seems like a nice approach to the problem. A couple of pedantic comments inline!
Thanks for the feedback. I agree with all of the comments, so I'll submit an updated version in a bit.
Cheers,
Will