diff options
author | Jamie Iles <jamie.iles@picochip.com> | 2010-02-02 14:23:15 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-12 12:23:43 -0500 |
commit | 0f4f0672ac950c96cffaf84a666d35e817d7c3ca (patch) | |
tree | cb4c1ec72f7842622c636a76f5ca519f3f3e8ea8 /arch/arm | |
parent | 74d2e4f8d79ae0c4b6ec027958d5b18058662eea (diff) |
ARM: 5899/2: arm: provide a mechanism to reserve performance counters
To add support for perf events and to allow the hardware counters to be
shared with oprofile, we need a way to reserve access to the pmu
(performance monitor unit). Platforms with PMU interrupts should
register the interrupts in arch/arm/kernel/pmu.c
Signed-off-by: Jamie Iles <jamie.iles@picochip.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/Kconfig | 5 | ||||
-rw-r--r-- | arch/arm/include/asm/pmu.h | 75 | ||||
-rw-r--r-- | arch/arm/kernel/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/kernel/pmu.c | 103 |
4 files changed, 184 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 233a222752c0..9e08891062bf 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -863,6 +863,11 @@ config XSCALE_PMU | |||
863 | depends on CPU_XSCALE && !XSCALE_PMU_TIMER | 863 | depends on CPU_XSCALE && !XSCALE_PMU_TIMER |
864 | default y | 864 | default y |
865 | 865 | ||
866 | config CPU_HAS_PMU | ||
867 | depends on CPU_V6 || CPU_V7 || XSCALE_PMU | ||
868 | default y | ||
869 | bool | ||
870 | |||
866 | if !MMU | 871 | if !MMU |
867 | source "arch/arm/Kconfig-nommu" | 872 | source "arch/arm/Kconfig-nommu" |
868 | endif | 873 | endif |
diff --git a/arch/arm/include/asm/pmu.h b/arch/arm/include/asm/pmu.h new file mode 100644 index 000000000000..2829b9f981a1 --- /dev/null +++ b/arch/arm/include/asm/pmu.h | |||
@@ -0,0 +1,75 @@ | |||
1 | /* | ||
2 | * linux/arch/arm/include/asm/pmu.h | ||
3 | * | ||
4 | * Copyright (C) 2009 picoChip Designs Ltd, Jamie Iles | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | * | ||
10 | */ | ||
11 | |||
12 | #ifndef __ARM_PMU_H__ | ||
13 | #define __ARM_PMU_H__ | ||
14 | |||
15 | #ifdef CONFIG_CPU_HAS_PMU | ||
16 | |||
17 | struct pmu_irqs { | ||
18 | const int *irqs; | ||
19 | int num_irqs; | ||
20 | }; | ||
21 | |||
22 | /** | ||
23 | * reserve_pmu() - reserve the hardware performance counters | ||
24 | * | ||
25 | * Reserve the hardware performance counters in the system for exclusive use. | ||
26 | * The 'struct pmu_irqs' for the system is returned on success, ERR_PTR() | ||
27 | * encoded error on failure. | ||
28 | */ | ||
29 | extern const struct pmu_irqs * | ||
30 | reserve_pmu(void); | ||
31 | |||
32 | /** | ||
33 | * release_pmu() - Relinquish control of the performance counters | ||
34 | * | ||
35 | * Release the performance counters and allow someone else to use them. | ||
36 | * Callers must have disabled the counters and released IRQs before calling | ||
37 | * this. The 'struct pmu_irqs' returned from reserve_pmu() must be passed as | ||
38 | * a cookie. | ||
39 | */ | ||
40 | extern int | ||
41 | release_pmu(const struct pmu_irqs *irqs); | ||
42 | |||
43 | /** | ||
44 | * init_pmu() - Initialise the PMU. | ||
45 | * | ||
46 | * Initialise the system ready for PMU enabling. This should typically set the | ||
47 | * IRQ affinity and nothing else. The users (oprofile/perf events etc) will do | ||
48 | * the actual hardware initialisation. | ||
49 | */ | ||
50 | extern int | ||
51 | init_pmu(void); | ||
52 | |||
53 | #else /* CONFIG_CPU_HAS_PMU */ | ||
54 | |||
55 | static inline const struct pmu_irqs * | ||
56 | reserve_pmu(void) | ||
57 | { | ||
58 | return ERR_PTR(-ENODEV); | ||
59 | } | ||
60 | |||
61 | static inline int | ||
62 | release_pmu(const struct pmu_irqs *irqs) | ||
63 | { | ||
64 | return -ENODEV; | ||
65 | } | ||
66 | |||
67 | static inline int | ||
68 | init_pmu(void) | ||
69 | { | ||
70 | return -ENODEV; | ||
71 | } | ||
72 | |||
73 | #endif /* CONFIG_CPU_HAS_PMU */ | ||
74 | |||
75 | #endif /* __ARM_PMU_H__ */ | ||
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index dd00f747e2ad..216890d804c2 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile | |||
@@ -46,6 +46,7 @@ obj-$(CONFIG_CPU_XSCALE) += xscale-cp0.o | |||
46 | obj-$(CONFIG_CPU_XSC3) += xscale-cp0.o | 46 | obj-$(CONFIG_CPU_XSC3) += xscale-cp0.o |
47 | obj-$(CONFIG_CPU_MOHAWK) += xscale-cp0.o | 47 | obj-$(CONFIG_CPU_MOHAWK) += xscale-cp0.o |
48 | obj-$(CONFIG_IWMMXT) += iwmmxt.o | 48 | obj-$(CONFIG_IWMMXT) += iwmmxt.o |
49 | obj-$(CONFIG_CPU_HAS_PMU) += pmu.o | ||
49 | AFLAGS_iwmmxt.o := -Wa,-mcpu=iwmmxt | 50 | AFLAGS_iwmmxt.o := -Wa,-mcpu=iwmmxt |
50 | 51 | ||
51 | ifneq ($(CONFIG_ARCH_EBSA110),y) | 52 | ifneq ($(CONFIG_ARCH_EBSA110),y) |
diff --git a/arch/arm/kernel/pmu.c b/arch/arm/kernel/pmu.c new file mode 100644 index 000000000000..a124312e343f --- /dev/null +++ b/arch/arm/kernel/pmu.c | |||
@@ -0,0 +1,103 @@ | |||
1 | /* | ||
2 | * linux/arch/arm/kernel/pmu.c | ||
3 | * | ||
4 | * Copyright (C) 2009 picoChip Designs Ltd, Jamie Iles | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | * | ||
10 | */ | ||
11 | |||
12 | #include <linux/cpumask.h> | ||
13 | #include <linux/err.h> | ||
14 | #include <linux/interrupt.h> | ||
15 | #include <linux/kernel.h> | ||
16 | #include <linux/module.h> | ||
17 | |||
18 | #include <asm/pmu.h> | ||
19 | |||
20 | /* | ||
21 | * Define the IRQs for the system. We could use something like a platform | ||
22 | * device but that seems fairly heavyweight for this. Also, the performance | ||
23 | * counters can't be removed or hotplugged. | ||
24 | * | ||
25 | * Ordering is important: init_pmu() will use the ordering to set the affinity | ||
26 | * to the corresponding core. e.g. the first interrupt will go to cpu 0, the | ||
27 | * second goes to cpu 1 etc. | ||
28 | */ | ||
29 | static const int irqs[] = { | ||
30 | #if defined(CONFIG_ARCH_OMAP2) | ||
31 | 3, | ||
32 | #elif defined(CONFIG_ARCH_BCMRING) | ||
33 | IRQ_PMUIRQ, | ||
34 | #elif defined(CONFIG_MACH_REALVIEW_EB) | ||
35 | IRQ_EB11MP_PMU_CPU0, | ||
36 | IRQ_EB11MP_PMU_CPU1, | ||
37 | IRQ_EB11MP_PMU_CPU2, | ||
38 | IRQ_EB11MP_PMU_CPU3, | ||
39 | #elif defined(CONFIG_ARCH_OMAP3) | ||
40 | INT_34XX_BENCH_MPU_EMUL, | ||
41 | #elif defined(CONFIG_ARCH_IOP32X) | ||
42 | IRQ_IOP32X_CORE_PMU, | ||
43 | #elif defined(CONFIG_ARCH_IOP33X) | ||
44 | IRQ_IOP33X_CORE_PMU, | ||
45 | #elif defined(CONFIG_ARCH_PXA) | ||
46 | IRQ_PMU, | ||
47 | #endif | ||
48 | }; | ||
49 | |||
50 | static const struct pmu_irqs pmu_irqs = { | ||
51 | .irqs = irqs, | ||
52 | .num_irqs = ARRAY_SIZE(irqs), | ||
53 | }; | ||
54 | |||
55 | static volatile long pmu_lock; | ||
56 | |||
57 | const struct pmu_irqs * | ||
58 | reserve_pmu(void) | ||
59 | { | ||
60 | return test_and_set_bit_lock(0, &pmu_lock) ? ERR_PTR(-EBUSY) : | ||
61 | &pmu_irqs; | ||
62 | } | ||
63 | EXPORT_SYMBOL_GPL(reserve_pmu); | ||
64 | |||
65 | int | ||
66 | release_pmu(const struct pmu_irqs *irqs) | ||
67 | { | ||
68 | if (WARN_ON(irqs != &pmu_irqs)) | ||
69 | return -EINVAL; | ||
70 | clear_bit_unlock(0, &pmu_lock); | ||
71 | return 0; | ||
72 | } | ||
73 | EXPORT_SYMBOL_GPL(release_pmu); | ||
74 | |||
75 | static int | ||
76 | set_irq_affinity(int irq, | ||
77 | unsigned int cpu) | ||
78 | { | ||
79 | #ifdef CONFIG_SMP | ||
80 | int err = irq_set_affinity(irq, cpumask_of(cpu)); | ||
81 | if (err) | ||
82 | pr_warning("unable to set irq affinity (irq=%d, cpu=%u)\n", | ||
83 | irq, cpu); | ||
84 | return err; | ||
85 | #else | ||
86 | return 0; | ||
87 | #endif | ||
88 | } | ||
89 | |||
90 | int | ||
91 | init_pmu(void) | ||
92 | { | ||
93 | int i, err = 0; | ||
94 | |||
95 | for (i = 0; i < pmu_irqs.num_irqs; ++i) { | ||
96 | err = set_irq_affinity(pmu_irqs.irqs[i], i); | ||
97 | if (err) | ||
98 | break; | ||
99 | } | ||
100 | |||
101 | return err; | ||
102 | } | ||
103 | EXPORT_SYMBOL_GPL(init_pmu); | ||