Skip to content

Commit fc369f9

Browse files
committed
Merge branch 'for-next/perf-cmn' into for-next/perf
* for-next/perf-cmn: perf/arm-cmn: Add debugfs topology info perf/arm-cmn: Add CI-700 Support dt-bindings: perf: arm-cmn: Add CI-700 perf/arm-cmn: Support new IP features perf/arm-cmn: Demarcate CMN-600 specifics perf/arm-cmn: Move group validation data off-stack perf/arm-cmn: Optimise DTC counter accesses perf/arm-cmn: Optimise DTM counter reads perf/arm-cmn: Refactor DTM handling perf/arm-cmn: Streamline node iteration perf/arm-cmn: Refactor node ID handling perf/arm-cmn: Drop compile-test restriction perf/arm-cmn: Account for NUMA affinity perf/arm-cmn: Fix CPU hotplug unregistration
2 parents d58071a + a88fa6c commit fc369f9

File tree

3 files changed

+767
-367
lines changed

3 files changed

+767
-367
lines changed

Documentation/devicetree/bindings/perf/arm,cmn.yaml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@ maintainers:
1212

1313
properties:
1414
compatible:
15-
const: arm,cmn-600
15+
enum:
16+
- arm,cmn-600
17+
- arm,ci-700
1618

1719
reg:
1820
items:
1921
- description: Physical address of the base (PERIPHBASE) and
20-
size (up to 64MB) of the configuration address space.
22+
size of the configuration address space.
2123

2224
interrupts:
2325
minItems: 1
@@ -31,14 +33,23 @@ properties:
3133

3234
arm,root-node:
3335
$ref: /schemas/types.yaml#/definitions/uint32
34-
description: Offset from PERIPHBASE of the configuration
35-
discovery node (see TRM definition of ROOTNODEBASE).
36+
description: Offset from PERIPHBASE of CMN-600's configuration
37+
discovery node (see TRM definition of ROOTNODEBASE). Not
38+
relevant for newer CMN/CI products.
3639

3740
required:
3841
- compatible
3942
- reg
4043
- interrupts
41-
- arm,root-node
44+
45+
if:
46+
properties:
47+
compatible:
48+
contains:
49+
const: arm,cmn-600
50+
then:
51+
required:
52+
- arm,root-node
4253

4354
additionalProperties: false
4455

drivers/perf/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ config ARM_CCN
4343

4444
config ARM_CMN
4545
tristate "Arm CMN-600 PMU support"
46-
depends on ARM64 || (COMPILE_TEST && 64BIT)
46+
depends on ARM64 || COMPILE_TEST
4747
help
4848
Support for PMU events monitoring on the Arm CMN-600 Coherent Mesh
4949
Network interconnect.

0 commit comments

Comments
 (0)