| Message ID | b9364dc5dd31cea84a58c156cfce5b90b9248d7d.1638900542.git.robin.murphy@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: DT binding/PMU updates | expand |
On Tue, Dec 07, 2021 at 06:20:43PM +0000, Robin Murphy wrote: > DSU-110 is the newest and shiniest for Armv9. Its programmer's model is > largely identical to the previous generation of DSUs, so we can treat it > as compatible, but it does have a a handful of extra IMP-DEF PMU events > to call its own. Thanks to the new notion of core complexes, the maximum > number of supported CPUs goes up as well. > > Signed-off-by: Robin Murphy <robin.murphy@arm.com> > --- > Documentation/devicetree/bindings/perf/arm,dsu-pmu.yaml | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/Documentation/devicetree/bindings/perf/arm,dsu-pmu.yaml b/Documentation/devicetree/bindings/perf/arm,dsu-pmu.yaml > index b78b6b0fce66..b623520ad302 100644 > --- a/Documentation/devicetree/bindings/perf/arm,dsu-pmu.yaml > +++ b/Documentation/devicetree/bindings/perf/arm,dsu-pmu.yaml > @@ -21,7 +21,11 @@ description: > > properties: > compatible: > - const: "arm,dsu-pmu" > + oneof: 'oneOf' and should be a list. jsonschema is case sensitive yet the tools are silent on wrong case (but handled by dtschema). > + const: "arm,dsu-pmu" > + items: > + const: "arm,dsu-110-pmu" > + const: "arm,dsu-pmu" 'items' needs to be a list here (Use '-'). > > interrupts: > items: > @@ -30,7 +34,7 @@ properties: > cpus: > $ref: /schemas/types.yaml#/definitions/phandle-array > minitems: 1 > - maxitems: 8 > + maxitems: 12 > description: List of phandles for the CPUs connected to this DSU instance. > > required: > -- > 2.28.0.dirty > >
On 2021-12-08 18:21, Rob Herring wrote: > On Tue, Dec 07, 2021 at 06:20:43PM +0000, Robin Murphy wrote: >> DSU-110 is the newest and shiniest for Armv9. Its programmer's model is >> largely identical to the previous generation of DSUs, so we can treat it >> as compatible, but it does have a a handful of extra IMP-DEF PMU events >> to call its own. Thanks to the new notion of core complexes, the maximum >> number of supported CPUs goes up as well. >> >> Signed-off-by: Robin Murphy <robin.murphy@arm.com> >> --- >> Documentation/devicetree/bindings/perf/arm,dsu-pmu.yaml | 8 ++++++-- >> 1 file changed, 6 insertions(+), 2 deletions(-) >> >> diff --git a/Documentation/devicetree/bindings/perf/arm,dsu-pmu.yaml b/Documentation/devicetree/bindings/perf/arm,dsu-pmu.yaml >> index b78b6b0fce66..b623520ad302 100644 >> --- a/Documentation/devicetree/bindings/perf/arm,dsu-pmu.yaml >> +++ b/Documentation/devicetree/bindings/perf/arm,dsu-pmu.yaml >> @@ -21,7 +21,11 @@ description: >> >> properties: >> compatible: >> - const: "arm,dsu-pmu" >> + oneof: > > 'oneOf' and should be a list. > > jsonschema is case sensitive yet the tools are silent on wrong case (but > handled by dtschema). > >> + const: "arm,dsu-pmu" >> + items: >> + const: "arm,dsu-110-pmu" >> + const: "arm,dsu-pmu" > > 'items' needs to be a list here (Use '-'). Oof, I probably deserved little more than a "go away and test these patches" for the monumental cock-up on show here - thanks for all the pointers and apologies for testing your patience. That'll be the danger of picking commits off an old branch in a hurry despite not remembering exactly how complete they were, and assuming the "WIP:" must just be because they still need commit messages writing... I've stopped being a lazy git and installed the schema tooling locally now too. Cheers, Robin. > >> >> interrupts: >> items: >> @@ -30,7 +34,7 @@ properties: >> cpus: >> $ref: /schemas/types.yaml#/definitions/phandle-array >> minitems: 1 >> - maxitems: 8 >> + maxitems: 12 >> description: List of phandles for the CPUs connected to this DSU instance. >> >> required: >> -- >> 2.28.0.dirty >> >>
diff --git a/Documentation/devicetree/bindings/perf/arm,dsu-pmu.yaml b/Documentation/devicetree/bindings/perf/arm,dsu-pmu.yaml index b78b6b0fce66..b623520ad302 100644 --- a/Documentation/devicetree/bindings/perf/arm,dsu-pmu.yaml +++ b/Documentation/devicetree/bindings/perf/arm,dsu-pmu.yaml @@ -21,7 +21,11 @@ description: properties: compatible: - const: "arm,dsu-pmu" + oneof: + const: "arm,dsu-pmu" + items: + const: "arm,dsu-110-pmu" + const: "arm,dsu-pmu" interrupts: items: @@ -30,7 +34,7 @@ properties: cpus: $ref: /schemas/types.yaml#/definitions/phandle-array minitems: 1 - maxitems: 8 + maxitems: 12 description: List of phandles for the CPUs connected to this DSU instance. required:
DSU-110 is the newest and shiniest for Armv9. Its programmer's model is largely identical to the previous generation of DSUs, so we can treat it as compatible, but it does have a a handful of extra IMP-DEF PMU events to call its own. Thanks to the new notion of core complexes, the maximum number of supported CPUs goes up as well. Signed-off-by: Robin Murphy <robin.murphy@arm.com> --- Documentation/devicetree/bindings/perf/arm,dsu-pmu.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)