Commit fc369f92 authored by Will Deacon's avatar Will Deacon
Browse files

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
parents d58071a8 a88fa6c2

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

+16 −5
Original line number Diff line number Diff line
@@ -12,12 +12,14 @@ maintainers: 


properties:

  compatible:

    const: arm,cmn-600

    enum:

      - arm,cmn-600

      - arm,ci-700



  reg:

    items:

      - description: Physical address of the base (PERIPHBASE) and

          size (up to 64MB) of the configuration address space.

          size of the configuration address space.



  interrupts:

    minItems: 1
@@ -31,13 +33,22 @@ properties: 


  arm,root-node:

    $ref: /schemas/types.yaml#/definitions/uint32

    description: Offset from PERIPHBASE of the configuration

      discovery node (see TRM definition of ROOTNODEBASE).

    description: Offset from PERIPHBASE of CMN-600's configuration

      discovery node (see TRM definition of ROOTNODEBASE). Not

      relevant for newer CMN/CI products.



required:

  - compatible

  - reg

  - interrupts



if:

  properties:

    compatible:

      contains:

        const: arm,cmn-600

then:

  required:

    - arm,root-node



additionalProperties: false

drivers/perf/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ config ARM_CCN 


config ARM_CMN

	tristate "Arm CMN-600 PMU support"

	depends on ARM64 || (COMPILE_TEST && 64BIT)

	depends on ARM64 || COMPILE_TEST

	help

	  Support for PMU events monitoring on the Arm CMN-600 Coherent Mesh

	  Network interconnect.

drivers/perf/arm-cmn.c

+750 −361

File changed.

Preview size limit exceeded, changes collapsed.