Skip to content

Commit 0543371

Browse files
ctmarinasctmarinas
committed
Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux
* 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux: perf: xgene: Remove set but not used variable 'config' arm64: perf: remove misleading comment dt-bindings: arm: Convert PMU binding to json-schema
2 parents a80554f + cf2d65e commit 0543371

File tree

5 files changed

+89
-74
lines changed

5 files changed

+89
-74
lines changed

‎Documentation/devicetree/bindings/arm/pmu.txt

Lines changed: 0 additions & 70 deletions
This file was deleted.

‎Documentation/devicetree/bindings/arm/pmu.yaml

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/arm/pmu.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: ARM Performance Monitor Units
8+
9+
maintainers:
10+
- Mark Rutland <mark.rutland@arm.com>
11+
- Will Deacon <will.deacon@arm.com>
12+
13+
description: |+
14+
ARM cores often have a PMU for counting cpu and cache events like cache misses
15+
and hits. The interface to the PMU is part of the ARM ARM. The ARM PMU
16+
representation in the device tree should be done as under:-
17+
18+
properties:
19+
compatible:
20+
items:
21+
- enum:
22+
- apm,potenza-pmu
23+
- arm,armv8-pmuv3
24+
- arm,cortex-a73-pmu
25+
- arm,cortex-a72-pmu
26+
- arm,cortex-a57-pmu
27+
- arm,cortex-a53-pmu
28+
- arm,cortex-a35-pmu
29+
- arm,cortex-a17-pmu
30+
- arm,cortex-a15-pmu
31+
- arm,cortex-a12-pmu
32+
- arm,cortex-a9-pmu
33+
- arm,cortex-a8-pmu
34+
- arm,cortex-a7-pmu
35+
- arm,cortex-a5-pmu
36+
- arm,arm11mpcore-pmu
37+
- arm,arm1176-pmu
38+
- arm,arm1136-pmu
39+
- brcm,vulcan-pmu
40+
- cavium,thunder-pmu
41+
- qcom,scorpion-pmu
42+
- qcom,scorpion-mp-pmu
43+
- qcom,krait-pmu
44+
45+
interrupts:
46+
# Don't know how many CPUs, so no constraints to specify
47+
description: 1 per-cpu interrupt (PPI) or 1 interrupt per core.
48+
49+
interrupt-affinity:
50+
$ref: /schemas/types.yaml#/definitions/phandle-array
51+
description:
52+
When using SPIs, specifies a list of phandles to CPU
53+
nodes corresponding directly to the affinity of
54+
the SPIs listed in the interrupts property.
55+
56+
When using a PPI, specifies a list of phandles to CPU
57+
nodes corresponding to the set of CPUs which have
58+
a PMU of this type signalling the PPI listed in the
59+
interrupts property, unless this is already specified
60+
by the PPI interrupt specifier itself (in which case
61+
the interrupt-affinity property shouldn't be present).
62+
63+
This property should be present when there is more than
64+
a single SPI.
65+
66+
qcom,no-pc-write:
67+
type: boolean
68+
description:
69+
Indicates that this PMU doesn't support the 0xc and 0xd events.
70+
71+
secure-reg-access:
72+
type: boolean
73+
description:
74+
Indicates that the ARMv7 Secure Debug Enable Register
75+
(SDER) is accessible. This will cause the driver to do
76+
any setup required that is only possible in ARMv7 secure
77+
state. If not present the ARMv7 SDER will not be touched,
78+
which means the PMU may fail to operate unless external
79+
code (bootloader or security monitor) has performed the
80+
appropriate initialisation. Note that this property is
81+
not valid for non-ARMv7 CPUs or ARMv7 CPUs booting Linux
82+
in Non-secure state.
83+
84+
required:
85+
- compatible
86+
87+
...

‎MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1160,7 +1160,7 @@ F: arch/arm*/include/asm/hw_breakpoint.h
11601160
F: arch/arm*/include/asm/perf_event.h
11611161
F: drivers/perf/*
11621162
F: include/linux/perf/arm_pmu.h
1163-
F: Documentation/devicetree/bindings/arm/pmu.txt
1163+
F: Documentation/devicetree/bindings/arm/pmu.yaml
11641164
F: Documentation/devicetree/bindings/perf/
11651165

11661166
ARM PORT

‎arch/arm64/kernel/perf_event.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -810,7 +810,7 @@ static void armv8pmu_clear_event_idx(struct pmu_hw_events *cpuc,
810810
}
811811

812812
/*
813-
* Add an event filter to a given event. This will only work for PMUv2 PMUs.
813+
* Add an event filter to a given event.
814814
*/
815815
static int armv8pmu_set_event_filter(struct hw_perf_event *event,
816816
struct perf_event_attr *attr)

‎drivers/perf/xgene_pmu.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1057,7 +1057,6 @@ static void xgene_perf_start(struct perf_event *event, int flags)
10571057
static void xgene_perf_stop(struct perf_event *event, int flags)
10581058
{
10591059
struct hw_perf_event *hw = &event->hw;
1060-
u64 config;
10611060

10621061
if (hw->state & PERF_HES_UPTODATE)
10631062
return;
@@ -1069,7 +1068,6 @@ static void xgene_perf_stop(struct perf_event *event, int flags)
10691068
if (hw->state & PERF_HES_UPTODATE)
10701069
return;
10711070

1072-
config = hw->config;
10731071
xgene_perf_read(event);
10741072
hw->state |= PERF_HES_UPTODATE;
10751073
}

0 commit comments

Comments
 (0)