Scorpion PMU support
Subsystems (5)
v3 cover Scorpion PMU support
These patches add support for the Scorpion PMU found on devices such as msm8660, qsd8x50, etc. The first patch is some groundwork to make functions more "generic". Even then we end up copying quite a bit of code from the Krait part into the Scorpion part with only subtle tweaks because two things happen:
1. We gain another "region" register, L2LPM
2. The way to access the region registers are with different cp15 instructions
I'm not sure how to make this better, suggestions are welcome. The second patch is an optimization for an implementation defined register. The final patch is the one that actually adds support for Scorpion.
Changes from v2:
* New patch 2
* Macros instead of an inline function for patch 1
Changes from v1:
* Added stub functions for CONFIG_CPU_V7=n
* Fixed L2LPM register accessors
* Exposed mp and !mp versions of PMU to userspace differently (mrutland)
* Dropped I-cache events that shouldn't be there (mrutland)
* Fixed branch misprediction event (mrutland)
Stephen Boyd (3):
ARM: perf: Preparatory work for Scorpion PMU support
ARM: perf: Only reset PMxEVCNTCR registers on reset
ARM: perf: Add support for Scorpion PMUs
Documentation/devicetree/bindings/arm/pmu.txt | 2 + arch/arm/kernel/perf_event_cpu.c | 2 + arch/arm/kernel/perf_event_v7.c | 525 +++++++++++++++++++++++--- 3 files changed, 470 insertions(+), 59 deletions(-)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v3 1/3 ARM: perf: Preparatory work for Scorpion PMU support
Do some things to make the Krait PMU support code generic enough to be used by the Scorpion PMU support code.
* Rename the venum register functions to be venum instead of krait specific because the same registers exist on Scorpion
* Add some macros to decode our Krait specific event encoding that's the same on Scorpion (modulo an extra region).
* Drop 'krait' from krait_clear_pmresrn_group() so it can be used by Scorpion code
--- arch/arm/kernel/perf_event_v7.c | 100 +++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 57 deletions(-)
arch/arm/kernel/perf_event_v7.c +43 -57
@@ -1103,6 +1103,12 @@ static int armv7_a17_pmu_init(struct arm_pmu *cpu_pmu)#define KRAIT_EVENT_MASK (KRAIT_EVENT | VENUM_EVENT)#define PMRESRn_EN BIT(31) +#define EVENT_REGION (event) (((event) >> 12) & 0xf)/* R */ +#define EVENT_GROUP (event) ((event) & 0xf)/* G */ +#define EVENT_CODE (event) (((event) >> 4) & 0xff)/* CC */ +#define EVENT_VENUM (event) (!!(event & VENUM_EVENT))/* N=2 */ +#define EVENT_CPU (event) (!!(event & KRAIT_EVENT))/* N=1 */ +static u32 krait_read_pmresrn (int n) {u32 val;
@@ -1141,19 +1147,19 @@ static void krait_write_pmresrn(int n, u32 val) } } -static u32 krait_read_vpmresr0 (void ) +static u32 venum_read_pmresr (void ) {u32 val; asmvolatile ("mrc p10, 7, %0, c11, c0, 0" :"=r" (val));return val; } -static void krait_write_vpmresr0 (u32 val) +static void venum_write_pmresr (u32 val) { asmvolatile ("mcr p10, 7, %0, c11, c0, 0" : :"r" (val)); } -static void krait_pre_vpmresr0 (u32 *venum_orig_val,u32 *fp_orig_val) +static void venum_pre_pmresr (u32 *venum_orig_val,u32 *fp_orig_val) {u32 venum_new_val;u32 fp_new_val;
@@ -1170,7 +1176,7 @@ static void krait_pre_vpmresr0(u32 *venum_orig_val, u32 *fp_orig_val)fmxr (FPEXC , fp_new_val); } -static void krait_post_vpmresr0 (u32 venum_orig_val,u32 fp_orig_val) +static void venum_post_pmresr (u32 venum_orig_val,u32 fp_orig_val) {BUG_ON (preemptible ());/* Restore FPEXC */
@@ -1193,16 +1199,11 @@ static void krait_evt_setup(int idx, u32 config_base)u32 val;u32 mask;u32 vval, fval; -unsigned int region; -unsigned int group; -unsigned int code; +unsigned int region =EVENT_REGION (config_base); +unsigned int group =EVENT_GROUP (config_base); +unsigned int code =EVENT_CODE (config_base);unsigned int group_shift; -bool venum_event; - - venum_event = !!(config_base &VENUM_EVENT ); - region = (config_base >>12 ) &0xf ; - code = (config_base >>4 ) &0xff ; - group = (config_base >>0 ) &0xf ; +bool venum_event =EVENT_VENUM (config_base); group_shift = group *8 ; mask =0xff << group_shift;
@@ -1220,13 +1221,13 @@ static void krait_evt_setup(int idx, u32 config_base) asmvolatile ("mcr p15, 0, %0, c9, c15, 0" : :"r" (0 ));if (venum_event) { -krait_pre_vpmresr0 (&vval, &fval); - val =krait_read_vpmresr0 (); +venum_pre_pmresr (&vval, &fval); + val =venum_read_pmresr (); val &= ~mask; val |= code << group_shift; val |= PMRESRn_EN; -krait_write_vpmresr0 (val); -krait_post_vpmresr0 (vval, fval); +venum_write_pmresr (val); +venum_post_pmresr (vval, fval); }else { val =krait_read_pmresrn (region); val &= ~mask;
@@ -1236,7 +1237,7 @@ static void krait_evt_setup(int idx, u32 config_base) } } -static u32 krait_clear_pmresrn_group (u32 val,int group) +static u32 clear_pmresrn_group (u32 val,int group) {u32 mask;int group_shift;
@@ -1256,23 +1257,19 @@ static void krait_clearpmu(u32 config_base) {u32 val;u32 vval, fval; -unsigned int region; -unsigned int group; -bool venum_event; - - venum_event = !!(config_base &VENUM_EVENT ); - region = (config_base >>12 ) &0xf ; - group = (config_base >>0 ) &0xf ; +unsigned int region =EVENT_REGION (config_base); +unsigned int group =EVENT_GROUP (config_base); +bool venum_event =EVENT_VENUM (config_base);if (venum_event) { -krait_pre_vpmresr0 (&vval, &fval); - val =krait_read_vpmresr0 (); - val =krait_clear_pmresrn_group (val, group); -krait_write_vpmresr0 (val); -krait_post_vpmresr0 (vval, fval); +venum_pre_pmresr (&vval, &fval); + val =venum_read_pmresr (); + val =clear_pmresrn_group (val, group); +venum_write_pmresr (val); +venum_post_pmresr (vval, fval); }else { val =krait_read_pmresrn (region); - val =krait_clear_pmresrn_group (val, group); + val =clear_pmresrn_group (val, group);krait_write_pmresrn (region, val); } }
@@ -1350,9 +1347,9 @@ static void krait_pmu_reset(void *info)krait_write_pmresrn (1 ,0 );krait_write_pmresrn (2 ,0 ); -krait_pre_vpmresr0 (&vval, &fval); -krait_write_vpmresr0 (0 ); -krait_post_vpmresr0 (vval, fval); +venum_pre_pmresr (&vval, &fval); +venum_write_pmresr (0 ); +venum_post_pmresr (vval, fval); } static int krait_event_to_bit(struct perf_event *event, unsigned int region,
@@ -1386,26 +1383,18 @@ static int krait_pmu_get_event_idx(struct pmu_hw_events *cpuc, {int idx;int bit =-1 ; -unsigned int prefix; -unsigned int region; -unsigned int code; -unsigned int group; -bool krait_event;struct hw_perf_event *hwc = &event->hw; +unsigned int region =EVENT_REGION (hwc->config_base); +unsigned int code =EVENT_CODE (hwc->config_base); +unsigned int group =EVENT_GROUP (hwc->config_base); +bool venum_event =EVENT_VENUM (hwc->config_base); +bool krait_event =EVENT_CPU (hwc->config_base); - region = (hwc->config_base >>12 ) &0xf ; - code = (hwc->config_base >>4 ) &0xff ; - group = (hwc->config_base >>0 ) &0xf ; - krait_event = !!(hwc->config_base &KRAIT_EVENT_MASK ); - -if (krait_event) { +if (venum_event || krait_event) {/* Ignore invalid events */ if (group >3 || region >2 )return -EINVAL ; - prefix = hwc->config_base &KRAIT_EVENT_MASK ; -if (prefix !=KRAIT_EVENT && prefix !=VENUM_EVENT ) -return -EINVAL ; -if (prefix ==VENUM_EVENT && (code &0xe0 )) +if (venum_event && (code &0xe0 ))return -EINVAL ; bit =krait_event_to_bit (event, region, group);
@@ -1425,15 +1414,12 @@ static void krait_pmu_clear_event_idx(struct pmu_hw_events *cpuc, {int bit;struct hw_perf_event *hwc = &event->hw; -unsigned int region; -unsigned int group; -bool krait_event; - - region = (hwc->config_base >>12 ) &0xf ; - group = (hwc->config_base >>0 ) &0xf ; - krait_event = !!(hwc->config_base &KRAIT_EVENT_MASK ); +unsigned int region =EVENT_REGION (hwc->config_base); +unsigned int group =EVENT_GROUP (hwc->config_base); +bool venum_event =EVENT_VENUM (hwc->config_base); +bool krait_event =EVENT_CPU (hwc->config_base); -if (krait_event) { +if (venum_event || krait_event) { bit =krait_event_to_bit (event, region, group);clear_bit (bit, cpuc->used_mask); }
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v3 2/3 ARM: perf: Only reset PMxEVCNTCR registers on reset
In reply to Stephen BoydThe Krait specific PMxEVCNTCR register is unpredictable upon reset. Currently we clear the register before we setup an event, but we don't need to do that. Instead, we can iterate through all the events and clear them once when we reset the PMU, saving a write in the event setup path.
--- arch/arm/kernel/perf_event_v7.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
arch/arm/kernel/perf_event_v7.c +9 -2
@@ -1218,8 +1218,6 @@ static void krait_evt_setup(int idx, u32 config_base) val |= config_base & (ARMV7_EXCLUDE_USER |ARMV7_EXCLUDE_PL1 );armv7_pmnc_write_evtsel (idx, val); - asmvolatile ("mcr p15, 0, %0, c9, c15, 0" : :"r" (0 )); -if (venum_event) {venum_pre_pmresr (&vval, &fval); val =venum_read_pmresr ();
@@ -1339,6 +1337,8 @@ static void krait_pmu_enable_event(struct perf_event *event)static void krait_pmu_reset (void *info) {u32 vval, fval; +struct arm_pmu *cpu_pmu = info; +u32 idx, nb_cnt = cpu_pmu->num_events;armv7pmu_reset (info);
@@ -1350,6 +1350,13 @@ static void krait_pmu_reset(void *info)venum_pre_pmresr (&vval, &fval);venum_write_pmresr (0 );venum_post_pmresr (vval, fval); + +/* Reset PMxEVNCTCR to sane default */ +for (idx =ARMV7_IDX_CYCLE_COUNTER ; idx < nb_cnt; ++idx) { +armv7_pmnc_select_counter (idx); + asmvolatile ("mcr p15, 0, %0, c9, c15, 0" : :"r" (0 )); + } + } static int krait_event_to_bit(struct perf_event *event, unsigned int region,
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v3 3/3 ARM: perf: Add support for Scorpion PMUs
In reply to Stephen BoydScorpion supports a set of local performance monitor event selection registers (LPM) sitting behind a cp15 based interface that extend the architected PMU events to include Scorpion CPU and Venum VFP specific events. To use these events the user is expected to program the lpm register with the event code shifted into the group they care about and then point the PMNx event at that region+group combo by writing a LPMn_GROUPx event. Add support for this hardware.
Note: the raw event number is a pure software construct that allows us to map the multi-dimensional number space of regions, groups, and event codes into a flat event number space suitable for use by the perf framework.
This is based on code originally written by Sheetal Sahasrabudhe, Ashwin Chaugule, and Neil Leeder [1].
[1] https://www.codeaurora.org/cgit/quic/la/kernel/msm/tree/arch/arm/kernel/perf_event_msm.c?h=msm-3.4
--- Documentation/devicetree/bindings/arm/pmu.txt | 2 + arch/arm/kernel/perf_event_cpu.c | 2 + arch/arm/kernel/perf_event_v7.c | 414 ++++++++++++++++++++++++++ 3 files changed, 418 insertions(+)
Documentation/devicetree/bindings/arm/pmu.txt +2 -0
@@ -18,6 +18,8 @@ Required properties: "arm,arm11mpcore-pmu" "arm,arm1176-pmu" "arm,arm1136-pmu" + "qcom,scorpion-pmu" + "qcom,scorpion-mp-pmu" "qcom,krait-pmu" - interrupts : 1 combined interrupt or 1 per core. If the interrupt is a per-cpu interrupt (PPI) then 1 interrupt should be specified.
arch/arm/kernel/perf_event_cpu.c +2 -0
@@ -243,6 +243,8 @@ static struct of_device_id cpu_pmu_of_device_ids[] = { {.compatible = "arm,arm1176-pmu", .data = armv6_1176_pmu_init}, {.compatible = "arm,arm1136-pmu", .data = armv6_1136_pmu_init}, {.compatible = "qcom,krait-pmu", .data = krait_pmu_init}, + {.compatible = "qcom,scorpion-pmu", .data = scorpion_pmu_init}, + {.compatible = "qcom,scorpion-mp-pmu", .data = scorpion_mp_pmu_init}, {}, };
arch/arm/kernel/perf_event_v7.c +414 -0
442 lines not on this page · raw message
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Quoted 9 lines · Stephen Boyd
These patches add support for the Scorpion PMU found on devices such as msm8660, qsd8x50, etc. The first patch is some groundwork to make functions more "generic". Even then we end up copying quite a bit of code from the Krait part into the Scorpion part with only subtle tweaks because two things happen:
1. We gain another "region" register, L2LPM
2. The way to access the region registers are with different cp15 instructions
Quoted 7 lines
I'm not sure how to make this better, suggestions are welcome. The second patch is an optimization for an implementation defined register. The final patch is the one that actually adds support for Scorpion.
Changes from v2:
* New patch 2
* Macros instead of an inline function for patch 1
Thanks, Stephen. I'll queue this for 4.1.
Will