| Message ID | 20230404-tractor-confusing-8852e552539a@spud |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | [v1] dt-bindings: perf: riscv,pmu: fix property dependencies | expand |
| Context | Check | Description |
|---|---|---|
| robh/checkpatch | warning | total: 0 errors, 1 warnings, 7 lines checked |
| robh/patch-applied | success | |
| robh/dtbs-check | warning | build log |
| robh/dt-meta-schema | success |
On Tue, Apr 04, 2023 at 07:03:22PM +0100, Conor Dooley wrote: > From: Conor Dooley <conor.dooley@microchip.com> > > Seemingly I mis-implemented the dependencies here. The OpenSBI docs only > point out that the "riscv,event-to-mhpmcounters property is mandatory if > riscv,event-to-mhpmevent is present". It never claims that > riscv,event-to-mhpmcounters requires riscv,event-to-mhpmevent. > > Drop the dependency of riscv,event-to-mhpmcounters on > riscv,event-to-mhpmevent. > > Fixes: 7e38085d9c59 ("dt-bindings: riscv: add SBI PMU event mappings") > Signed-off-by: Conor Dooley <conor.dooley@microchip.com> > --- > > Atish, I'm not 100% on this one but I noticed it while doing dt-validate > on a dump of the qemu virt machine which doesn't use the > event-to-mhpmevent property. Waiting for comments before I apply this... > > CC: Rob Herring <robh+dt@kernel.org> > CC: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org> > CC: Paul Walmsley <paul.walmsley@sifive.com> > CC: Palmer Dabbelt <palmer@dabbelt.com> > CC: Atish Patra <atishp@rivosinc.com> > CC: Andrew Jones <ajones@ventanamicro.com> > CC: devicetree@vger.kernel.org > CC: linux-riscv@lists.infradead.org > CC: linux-kernel@vger.kernel.org > --- > Documentation/devicetree/bindings/perf/riscv,pmu.yaml | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/perf/riscv,pmu.yaml b/Documentation/devicetree/bindings/perf/riscv,pmu.yaml > index a55a4d047d3f..c8448de2f2a0 100644 > --- a/Documentation/devicetree/bindings/perf/riscv,pmu.yaml > +++ b/Documentation/devicetree/bindings/perf/riscv,pmu.yaml > @@ -91,7 +91,6 @@ properties: > > dependencies: > "riscv,event-to-mhpmevent": [ "riscv,event-to-mhpmcounters" ] > - "riscv,event-to-mhpmcounters": [ "riscv,event-to-mhpmevent" ] > > required: > - compatible > -- > 2.39.2 >
On Fri, May 5, 2023 at 1:51 AM Rob Herring <robh@kernel.org> wrote: > > On Tue, Apr 04, 2023 at 07:03:22PM +0100, Conor Dooley wrote: > > From: Conor Dooley <conor.dooley@microchip.com> > > > > Seemingly I mis-implemented the dependencies here. The OpenSBI docs only > > point out that the "riscv,event-to-mhpmcounters property is mandatory if > > riscv,event-to-mhpmevent is present". It never claims that > > riscv,event-to-mhpmcounters requires riscv,event-to-mhpmevent. > > > > Drop the dependency of riscv,event-to-mhpmcounters on > > riscv,event-to-mhpmevent. > > > > Fixes: 7e38085d9c59 ("dt-bindings: riscv: add SBI PMU event mappings") > > Signed-off-by: Conor Dooley <conor.dooley@microchip.com> > > --- > > > > Atish, I'm not 100% on this one but I noticed it while doing dt-validate > > on a dump of the qemu virt machine which doesn't use the > > event-to-mhpmevent property. Yes. That's correct. virt machine uses default encoding specified by the SBI PMU spec. Hence, event-to-mhpmevent is not used. > > Waiting for comments before I apply this... > Sorry for the delay. Not sure why this did not show up in my gmail. Probably due to all the bouncing issues going on. Reviewed-by: Atish Patra <atishp@rivosinc.com> > > > > CC: Rob Herring <robh+dt@kernel.org> > > CC: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org> > > CC: Paul Walmsley <paul.walmsley@sifive.com> > > CC: Palmer Dabbelt <palmer@dabbelt.com> > > CC: Atish Patra <atishp@rivosinc.com> > > CC: Andrew Jones <ajones@ventanamicro.com> > > CC: devicetree@vger.kernel.org > > CC: linux-riscv@lists.infradead.org > > CC: linux-kernel@vger.kernel.org > > --- > > Documentation/devicetree/bindings/perf/riscv,pmu.yaml | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/Documentation/devicetree/bindings/perf/riscv,pmu.yaml b/Documentation/devicetree/bindings/perf/riscv,pmu.yaml > > index a55a4d047d3f..c8448de2f2a0 100644 > > --- a/Documentation/devicetree/bindings/perf/riscv,pmu.yaml > > +++ b/Documentation/devicetree/bindings/perf/riscv,pmu.yaml > > @@ -91,7 +91,6 @@ properties: > > > > dependencies: > > "riscv,event-to-mhpmevent": [ "riscv,event-to-mhpmcounters" ] > > - "riscv,event-to-mhpmcounters": [ "riscv,event-to-mhpmevent" ] > > > > required: > > - compatible > > -- > > 2.39.2 > >
On Tue, 04 Apr 2023 19:03:22 +0100, Conor Dooley wrote: > From: Conor Dooley <conor.dooley@microchip.com> > > Seemingly I mis-implemented the dependencies here. The OpenSBI docs only > point out that the "riscv,event-to-mhpmcounters property is mandatory if > riscv,event-to-mhpmevent is present". It never claims that > riscv,event-to-mhpmcounters requires riscv,event-to-mhpmevent. > > Drop the dependency of riscv,event-to-mhpmcounters on > riscv,event-to-mhpmevent. > > Fixes: 7e38085d9c59 ("dt-bindings: riscv: add SBI PMU event mappings") > Signed-off-by: Conor Dooley <conor.dooley@microchip.com> > --- > > Atish, I'm not 100% on this one but I noticed it while doing dt-validate > on a dump of the qemu virt machine which doesn't use the > event-to-mhpmevent property. > > CC: Rob Herring <robh+dt@kernel.org> > CC: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org> > CC: Paul Walmsley <paul.walmsley@sifive.com> > CC: Palmer Dabbelt <palmer@dabbelt.com> > CC: Atish Patra <atishp@rivosinc.com> > CC: Andrew Jones <ajones@ventanamicro.com> > CC: devicetree@vger.kernel.org > CC: linux-riscv@lists.infradead.org > CC: linux-kernel@vger.kernel.org > --- > Documentation/devicetree/bindings/perf/riscv,pmu.yaml | 1 - > 1 file changed, 1 deletion(-) > Applied, thanks!
Hello: This patch was applied to riscv/linux.git (fixes) by Rob Herring <robh@kernel.org>: On Tue, 4 Apr 2023 19:03:22 +0100 you wrote: > From: Conor Dooley <conor.dooley@microchip.com> > > Seemingly I mis-implemented the dependencies here. The OpenSBI docs only > point out that the "riscv,event-to-mhpmcounters property is mandatory if > riscv,event-to-mhpmevent is present". It never claims that > riscv,event-to-mhpmcounters requires riscv,event-to-mhpmevent. > > [...] Here is the summary with links: - [v1] dt-bindings: perf: riscv,pmu: fix property dependencies https://git.kernel.org/riscv/c/4d276e4d3bb4 You are awesome, thank you!
diff --git a/Documentation/devicetree/bindings/perf/riscv,pmu.yaml b/Documentation/devicetree/bindings/perf/riscv,pmu.yaml index a55a4d047d3f..c8448de2f2a0 100644 --- a/Documentation/devicetree/bindings/perf/riscv,pmu.yaml +++ b/Documentation/devicetree/bindings/perf/riscv,pmu.yaml @@ -91,7 +91,6 @@ properties: dependencies: "riscv,event-to-mhpmevent": [ "riscv,event-to-mhpmcounters" ] - "riscv,event-to-mhpmcounters": [ "riscv,event-to-mhpmevent" ] required: - compatible