[2/2] Enable secure monitor on gxl
diff mbox series

Message ID 20190606132439.25182-2-krzysztof.michonski@digitalstrom.com
State Changes Requested
Headers show
Series
  • [1/2] meson_sm: Extend meson_sm driver to be compatible with gxl chip
Related show

Commit Message

Krzysztof Michoński June 6, 2019, 1:24 p.m. UTC
From: Krzysztof Michonski <michonskikrzysztof@gmail.com>

Add secure monitor node in the gxl dtsi file.

Signed-off-by: Krzysztof Michonski <michonskikrzysztof@gmail.com>
---
 arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Martin Blumenstingl June 6, 2019, 8:02 p.m. UTC | #1
Hi Krzysztof,

the subject should start with: "arm64: dts: meson-gxl:", see the git
history (note that there was a rule change to use "arm64" instead of
"ARM64")

On Thu, Jun 6, 2019 at 3:24 PM Krzysztof Michonski
<michonskikrzysztof@gmail.com> wrote:
>
> From: Krzysztof Michonski <michonskikrzysztof@gmail.com>
>
> Add secure monitor node in the gxl dtsi file.
I assume that this is to enable the GXL and GXM specific commands?

> Signed-off-by: Krzysztof Michonski <michonskikrzysztof@gmail.com>
> ---
>  arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
> index 3093ae421b17..fd75538ee9f9 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
> @@ -37,6 +37,10 @@
>                         };
>                 };
>         };
> +
> +       sm: secure-monitor {
> +               compatible = "amlogic,meson-gxl-sm";
> +       };
>  };
if you keep the secure-monitor node in meson-gx.dtsi then you can use
something like:
&sm {
    compatible = "amlogic,meson-gxl-sm";
};

the compatible string has to be added to the documentation in
Documentation/devicetree/bindings/firmware/meson/meson_sm.txt with a
separate patch
devicetree bindings should be backwards compatible (at least that's
the rule of thumb)
you can use a fallback compatible string so this new .dts/.dtb also
works with old kernels (which don't support the new, GXL specific,
compatible string yet):
  compatible = "amlogic,meson-gxl-sm", "amlogic,meson-gxbb-sm";


Martin
Martin Blumenstingl June 7, 2019, 8:23 p.m. UTC | #2
(adding back the linux-amlogic@lists.infradead.org mailing list)

On Fri, Jun 7, 2019 at 9:13 AM Krzysztof Michoński
<michonskikrzysztof@gmail.com> wrote:
>
> Hi Martin,
> > the subject should start with: "arm64: dts: meson-gxl:", see the git
> > history (note that there was a rule change to use "arm64" instead of
> > "ARM64")
> Thanks, so I will resend the patches with correct topic soon.
thank you!

> > you can use a fallback compatible string so this new .dts/.dtb also
> > works with old kernels (which don't support the new, GXL specific,
> > compatible string yet):
> The secure monitor then will not be compatible with gxl since
> the share_in/out storage addresses in the gxl struct differ from gxbb.
I missed that, thank you for clarifying this. I'll reply with a
specific question to your other patch

> Should I still add the fallback string then?
assuming GXBB and GXL aren't compatible then I would do it like this:
- move the existing secure monitor node from meson-gx.dtsi to
meson-gxbb.dtsi (because based on your description it doesn't work on
GXL/GXM anyways)
- like your patch already does: introduce a new secure monitor node in
meson-gxl.dtsi


Martin

Patch
diff mbox series

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
index 3093ae421b17..fd75538ee9f9 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
@@ -37,6 +37,10 @@ 
 			};
 		};
 	};
+
+	sm: secure-monitor {
+		compatible = "amlogic,meson-gxl-sm";
+	};
 };
 
 &apb {