Received-SPF: pass (google.com: domain of linux-kernel+bounces-157369-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Content-Type: multipart/signed;
 boundary=27a536f2ded1841e1102a6eb72a0909ec5f63895e697412a751d7f830ae9;
 micalg=pgp-sha256; protocol="application/pgp-signature"
Precedence: bulk
Mime-Version: 1.0
Date: Wed, 24 Apr 2024 19:04:42 +0200
Message-Id: <D0SILCYU98EV.1XW7NZFC9013K@gmail.com>
Cc: <devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
 <linux-tegra@vger.kernel.org>, <amhetre@nvidia.com>, <bbasu@nvidia.com>
Subject: Re: [Patch v3 1/2] dt-bindings: make sid and broadcast reg optional
From: "Thierry Reding" <thierry.reding@gmail.com>
To: "Thierry Reding" <thierry.reding@gmail.com>, "Krzysztof Kozlowski"
 <krzysztof.kozlowski@linaro.org>, "Sumit Gupta" <sumitg@nvidia.com>,
 <robh@kernel.org>, <conor+dt@kernel.org>, <maz@kernel.org>,
 <mark.rutland@arm.com>, <treding@nvidia.com>, <jonathanh@nvidia.com>
References: <20240412130540.28447-1-sumitg@nvidia.com>
 <20240412130540.28447-2-sumitg@nvidia.com>
 <d26f9661-3e50-4a72-9097-fe63a27503f1@linaro.org>
 <D0SHRQVCGJBY.2DPLX9K6VXEYM@gmail.com>
In-Reply-To: <D0SHRQVCGJBY.2DPLX9K6VXEYM@gmail.com>

--27a536f2ded1841e1102a6eb72a0909ec5f63895e697412a751d7f830ae9
Mime-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8

On Wed Apr 24, 2024 at 6:26 PM CEST, Thierry Reding wrote:
> On Mon Apr 22, 2024 at 9:02 AM CEST, Krzysztof Kozlowski wrote:
> > On 12/04/2024 15:05, Sumit Gupta wrote:
> > > MC SID and Broadbast channel register access is restricted for Guest =
VM.
> >
> > Broadcast
> >
> > > Make both the regions as optional for SoC's from Tegra186 onwards.
> >
> > onward?
> >
> > > Tegra MC driver will skip access to the restricted registers from Gue=
st
> > > if the respective regions are not present in the memory-controller no=
de
> > > of Guest DT.
> > >=20
> > > Suggested-by: Thierry Reding <treding@nvidia.com>
> > > Signed-off-by: Sumit Gupta <sumitg@nvidia.com>
> > > ---
> > >  .../nvidia,tegra186-mc.yaml                   | 95 ++++++++++-------=
--
> > >  1 file changed, 49 insertions(+), 46 deletions(-)
> > >=20
> > > diff --git a/Documentation/devicetree/bindings/memory-controllers/nvi=
dia,tegra186-mc.yaml b/Documentation/devicetree/bindings/memory-controllers=
/nvidia,tegra186-mc.yaml
> > > index 935d63d181d9..e0bd013ecca3 100644
> > > --- a/Documentation/devicetree/bindings/memory-controllers/nvidia,teg=
ra186-mc.yaml
> > > +++ b/Documentation/devicetree/bindings/memory-controllers/nvidia,teg=
ra186-mc.yaml
> > > @@ -34,11 +34,11 @@ properties:
> > >            - nvidia,tegra234-mc
> > > =20
> > >    reg:
> > > -    minItems: 6
> > > +    minItems: 4
> > >      maxItems: 18
> > > =20
> > >    reg-names:
> > > -    minItems: 6
> > > +    minItems: 4
> > >      maxItems: 18
> > > =20
> > >    interrupts:
> > > @@ -151,12 +151,13 @@ allOf:
> > > =20
> > >          reg-names:
> > >            items:
> > > -            - const: sid
> > > -            - const: broadcast
> > > -            - const: ch0
> > > -            - const: ch1
> > > -            - const: ch2
> > > -            - const: ch3
> > > +            enum:
> > > +              - sid
> > > +              - broadcast
> > > +              - ch0
> > > +              - ch1
> > > +              - ch2
> > > +              - ch3
> >
> > I understand why sid and broadcast are becoming optional, but why order
> > of the rest is now fully flexible?
>
> The reason why the order of the rest doesn't matter is because we have
> both reg and reg-names properties and so the order in which they appear
> in the list doesn't matter. The only thing that matters is that the
> entries of the reg and reg-names properties match.
>
> > This does not even make sid/broadcast optional, but ch0!
>
> Yeah, this ends up making all entries optional, which isn't what we
> want. I don't know of a way to accurately express this in json-schema,
> though. Do you?
>
> If not, then maybe we need to resort to something like this and also
> mention explicitly in some comment that it is sid and broadcast that are
> optional.

Actually, here's another variant that is a bit closer to what we want:

--- >8 ---
diff --git a/Documentation/devicetree/bindings/memory-controllers/nvidia,te=
gra186-mc.yaml b/Documentation/devicetree/bindings/memory-controllers/nvidi=
a,tegra186-mc.yaml
index 935d63d181d9..86f1475926e4 100644
--- a/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra186-=
mc.yaml
+++ b/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra186-=
mc.yaml
@@ -34,11 +34,11 @@ properties:
           - nvidia,tegra234-mc
=20
   reg:
-    minItems: 6
+    minItems: 4
     maxItems: 18
=20
   reg-names:
-    minItems: 6
+    minItems: 4
     maxItems: 18
=20
   interrupts:
@@ -146,17 +146,21 @@ allOf:
     then:
       properties:
         reg:
+          minItems: 4
           maxItems: 6
           description: 5 memory controller channels and 1 for stream-id re=
gisters
=20
         reg-names:
-          items:
-            - const: sid
-            - const: broadcast
-            - const: ch0
-            - const: ch1
-            - const: ch2
-            - const: ch3
+          anyOf:
+            - items:
+                enum: [ sid, broadcast, ch0, ch1, ch2, ch3 ]
+              uniqueItems: true
+              minItems: 6
+
+            - items:
+                enum: [ ch0, ch1, ch2, ch3 ]
+              uniqueItems: true
+              minItems: 4
=20
   - if:
       properties:
@@ -165,29 +169,22 @@ allOf:
     then:
       properties:
         reg:
-          minItems: 18
+          minItems: 16
           description: 17 memory controller channels and 1 for stream-id r=
egisters
=20
         reg-names:
-          items:
-            - const: sid
-            - const: broadcast
-            - const: ch0
-            - const: ch1
-            - const: ch2
-            - const: ch3
-            - const: ch4
-            - const: ch5
-            - const: ch6
-            - const: ch7
-            - const: ch8
-            - const: ch9
-            - const: ch10
-            - const: ch11
-            - const: ch12
-            - const: ch13
-            - const: ch14
-            - const: ch15
+          anyOf:
+            - items:
+                enum: [ sid, broadcast, ch0, ch1, ch2, ch3, ch4, ch5, ch6,=
 ch7,
+                        ch8, ch9, ch10, ch11, ch12, ch13, ch14, ch15 ]
+              minItems: 18
+              uniqueItems: true
+
+            - items:
+                enum: [ ch0, ch1, ch2, ch3, ch4, ch5, ch6, ch7, ch8, ch9, =
ch10,
+                        ch11, ch12, ch13, ch14, ch15 ]
+              minItems: 16
+              uniqueItems: true
=20
   - if:
       properties:
@@ -196,29 +193,22 @@ allOf:
     then:
       properties:
         reg:
-          minItems: 18
+          minItems: 16
           description: 17 memory controller channels and 1 for stream-id r=
egisters
=20
         reg-names:
-          items:
-            - const: sid
-            - const: broadcast
-            - const: ch0
-            - const: ch1
-            - const: ch2
-            - const: ch3
-            - const: ch4
-            - const: ch5
-            - const: ch6
-            - const: ch7
-            - const: ch8
-            - const: ch9
-            - const: ch10
-            - const: ch11
-            - const: ch12
-            - const: ch13
-            - const: ch14
-            - const: ch15
+          anyOf:
+            - items:
+                enum: [ sid, broadcast, ch0, ch1, ch2, ch3, ch4, ch5, ch6,=
 ch7,
+                        ch8, ch9, ch10, ch11, ch12, ch13, ch14, ch15 ]
+              minItems: 18
+              uniqueItems: true
+
+            - items:
+                enum: [ ch0, ch1, ch2, ch3, ch4, ch5, ch6, ch7, ch8, ch9, =
ch10,
+                        ch11, ch12, ch13, ch14, ch15 ]
+              minItems: 16
+              uniqueItems: true
=20
 additionalProperties: false
=20
--- >8 ---

The one restriction that it has is that "sid" and "broadcast" must be
optional together. So you can't have just "sid" or "broadcast", but they
either must both be there, or they must both not be there.

I suppose we could technically make that work by adding more
alternatives, but perhaps it can be avoided for sanity?

Thierry

--27a536f2ded1841e1102a6eb72a0909ec5f63895e697412a751d7f830ae9
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAmYpO6sACgkQ3SOs138+
s6E9cRAAjCRwwdVpQJHJctBbfyUouIMgwaXBsvwGWIRhimQ/Fv2+aXm/Q7ZLTVB3
iomc+xyJtSaeb/NlUEkdnBqZh7VKbVTvyz96p1qRdBTg/JjsugulaLu/XK3tmkZ9
F30XWq2pgeDle33fH5SmE835RR4rQHT+C3+yrIUlk+psq8haNv7b7FT+eOI+O33z
p3Fmb2BluyHBW6I4AiuD06CbWjyX26X2N/OLKDNRJvpJQo0yt3Io9S5E6c+/kfcN
xyhsMma4s3f4VzRG3kLAWrm4keOitLRllN6IlILfWYI49fIusPYlIRR4O9OwUGxF
aGn+w2Nr7e795wCYPZkDI02brGoTS8kRaDw+x/bGRuWMAzglERF6yfuHsbvnveR6
mi8LNAWBzldS4//SetaICYbdvkVMCoqi86a1Zm2dKIQa5+tmDfvxzj6Ca9LFuiCm
Ehz3RmplCaMXp2Du77Plrhs2/GALnAUshXJFa6H/e5CpgASjC9eI6ca5iVlVkY0+
V3zCO/bVlFP1ulBEUpFz07ZtCbni6RPQLzMisCIYiNjD8lGv8iq8pWYY2gNzmSfJ
8MPqJ2EN9Kf1LKWqe5YGEG1jFOtjZ1GfsLfxyAlNe3SJN7FVIbJs73EpkdVBYJ21
TBcTyrjPsuQBi/wje26yYa7p9+uXDKtWO/571hRTCtmq4bRETD0=
=FoYA
-----END PGP SIGNATURE-----

--27a536f2ded1841e1102a6eb72a0909ec5f63895e697412a751d7f830ae9--