* [PATCH] arm64: dts: ls1028a: fix optee node
@ 2021-03-18 8:34 Michael Walle
2021-03-18 9:20 ` Michael Walle
2021-03-22 23:12 ` Li Yang
0 siblings, 2 replies; 6+ messages in thread
From: Michael Walle @ 2021-03-18 8:34 UTC (permalink / raw)
To: linux-arm-kernel, devicetree, linux-kernel
Cc: Shawn Guo, Li Yang, Rob Herring, Sahil Malhotra, Michael Walle,
Guillaume Tucker, kernelci.org bot
Don't enable the optee node in the SoC include. It is an optional
component and actually, if enabled, breaks boards which doesn't have it.
This reverts commit 48787485f8de ("arm64: dts: ls1028a: enable optee
node") and enables the node per board, assuming the intend of the
original author was to enable OPTEE for the LS1028A-RDB and the
LS1028A-QDS.
Fixes: 48787485f8de ("arm64: dts: ls1028a: enable optee node")
Reported-by: Guillaume Tucker <guillaume.tucker@collabora.com>
Reported-by: "kernelci.org bot" <bot@kernelci.org>
Tested-by: Michael Walle <michael@walle.cc>
Signed-off-by: Michael Walle <michael@walle.cc>
---
arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 4 ++++
arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 4 ++++
arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 3 ++-
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
index fbcba9cb8503..060d3c79244d 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
@@ -327,6 +327,10 @@
status = "okay";
};
+&optee {
+ status = "okay";
+};
+
&sai1 {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts
index 41ae6e7675ba..1bdf0104d492 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts
@@ -274,6 +274,10 @@
status = "okay";
};
+&optee {
+ status = "okay";
+};
+
&sai4 {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
index 50d277eb2a54..e2007ebacd69 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -92,9 +92,10 @@
};
firmware {
- optee {
+ optee: optee {
compatible = "linaro,optee-tz";
method = "smc";
+ status = "disabled";
};
};
--
2.20.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] arm64: dts: ls1028a: fix optee node
2021-03-18 8:34 [PATCH] arm64: dts: ls1028a: fix optee node Michael Walle
@ 2021-03-18 9:20 ` Michael Walle
2021-03-22 23:12 ` Li Yang
1 sibling, 0 replies; 6+ messages in thread
From: Michael Walle @ 2021-03-18 9:20 UTC (permalink / raw)
To: linux-arm-kernel, devicetree, linux-kernel
Cc: Shawn Guo, Li Yang, Rob Herring, Sahil Malhotra,
Guillaume Tucker, kernelci.org bot
Am 2021-03-18 09:34, schrieb Michael Walle:
> Don't enable the optee node in the SoC include. It is an optional
> component and actually, if enabled, breaks boards which doesn't have
> it.
>
> This reverts commit 48787485f8de ("arm64: dts: ls1028a: enable optee
> node") and enables the node per board, assuming the intend of the
> original author was to enable OPTEE for the LS1028A-RDB and the
> LS1028A-QDS.
>
> Fixes: 48787485f8de ("arm64: dts: ls1028a: enable optee node")
> Reported-by: Guillaume Tucker <guillaume.tucker@collabora.com>
> Reported-by: "kernelci.org bot" <bot@kernelci.org>
> Tested-by: Michael Walle <michael@walle.cc>
> Signed-off-by: Michael Walle <michael@walle.cc>
> ---
Please disregard this patch, because the offending patch was
already dropped:
https://lore.kernel.org/lkml/20210318084029.GY11246@dragon/
Sahil, if you like you can pick it up to enable the nodes for
your ls1028a boards.
-michael
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] arm64: dts: ls1028a: fix optee node
2021-03-18 8:34 [PATCH] arm64: dts: ls1028a: fix optee node Michael Walle
2021-03-18 9:20 ` Michael Walle
@ 2021-03-22 23:12 ` Li Yang
2021-03-29 0:38 ` Shawn Guo
1 sibling, 1 reply; 6+ messages in thread
From: Li Yang @ 2021-03-22 23:12 UTC (permalink / raw)
To: Michael Walle
Cc: moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, lkml,
Shawn Guo, Rob Herring, Sahil Malhotra, Guillaume Tucker,
kernelci.org bot
On Thu, Mar 18, 2021 at 3:36 AM Michael Walle <michael@walle.cc> wrote:
>
> Don't enable the optee node in the SoC include. It is an optional
> component and actually, if enabled, breaks boards which doesn't have it.
Hi Shawn,
Shall we make this a general rule? I see quite a few SoC dtsi files
are having the optee node enabled by default.
Regards,
Leo
>
> This reverts commit 48787485f8de ("arm64: dts: ls1028a: enable optee
> node") and enables the node per board, assuming the intend of the
> original author was to enable OPTEE for the LS1028A-RDB and the
> LS1028A-QDS.
>
> Fixes: 48787485f8de ("arm64: dts: ls1028a: enable optee node")
> Reported-by: Guillaume Tucker <guillaume.tucker@collabora.com>
> Reported-by: "kernelci.org bot" <bot@kernelci.org>
> Tested-by: Michael Walle <michael@walle.cc>
> Signed-off-by: Michael Walle <michael@walle.cc>
> ---
> arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 4 ++++
> arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 4 ++++
> arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 3 ++-
> 3 files changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
> index fbcba9cb8503..060d3c79244d 100644
> --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
> +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
> @@ -327,6 +327,10 @@
> status = "okay";
> };
>
> +&optee {
> + status = "okay";
> +};
> +
> &sai1 {
> status = "okay";
> };
> diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts
> index 41ae6e7675ba..1bdf0104d492 100644
> --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts
> +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts
> @@ -274,6 +274,10 @@
> status = "okay";
> };
>
> +&optee {
> + status = "okay";
> +};
> +
> &sai4 {
> status = "okay";
> };
> diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
> index 50d277eb2a54..e2007ebacd69 100644
> --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
> +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
> @@ -92,9 +92,10 @@
> };
>
> firmware {
> - optee {
> + optee: optee {
> compatible = "linaro,optee-tz";
> method = "smc";
> + status = "disabled";
> };
> };
>
> --
> 2.20.1
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] arm64: dts: ls1028a: fix optee node
2021-03-22 23:12 ` Li Yang
@ 2021-03-29 0:38 ` Shawn Guo
0 siblings, 0 replies; 6+ messages in thread
From: Shawn Guo @ 2021-03-29 0:38 UTC (permalink / raw)
To: Li Yang
Cc: Michael Walle,
moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, lkml,
Rob Herring, Sahil Malhotra, Guillaume Tucker, kernelci.org bot
On Mon, Mar 22, 2021 at 06:12:06PM -0500, Li Yang wrote:
> On Thu, Mar 18, 2021 at 3:36 AM Michael Walle <michael@walle.cc> wrote:
> >
> > Don't enable the optee node in the SoC include. It is an optional
> > component and actually, if enabled, breaks boards which doesn't have it.
>
> Hi Shawn,
>
> Shall we make this a general rule? I see quite a few SoC dtsi files
> are having the optee node enabled by default.
Yeah, we should probably make it a general rule considering the issue
reported here. I thought that optee driver is smart enough to stop
probing if there is no optee os/firmware support found on given platform.
Shawn
^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <DB7PR04MB53222C26DD58E81FEAE4A27982659@DB7PR04MB5322.eurprd04.prod.outlook.com>]
* Re: [PATCH] arm64: dts: ls1028a: fix optee node
[not found] <DB7PR04MB53222C26DD58E81FEAE4A27982659@DB7PR04MB5322.eurprd04.prod.outlook.com>
@ 2021-03-22 11:39 ` Michael Walle
0 siblings, 0 replies; 6+ messages in thread
From: Michael Walle @ 2021-03-22 11:39 UTC (permalink / raw)
To: Sahil Malhotra
Cc: linux-arm-kernel, devicetree, linux-kernel, Shawn Guo, Leo Li,
Rob Herring, Guillaume Tucker, kernelci.org bot
Hi Sahil,
Am 2021-03-22 12:33, schrieb Sahil Malhotra:
> Thanks for the fix, and currently we support optee only on ls1028a-rdb
> boards.
> Does enabling the optee node this way, solves the issue ?
What do you mean? Please note, that Shawn already reverted your commit.
Therefore, I suggest you make a new commit where you enable optee only
for the ls1028a-rdb board.
-michael
^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <DB7PR04MB53223015C17DCD6DBCCACE5382659@DB7PR04MB5322.eurprd04.prod.outlook.com>]
* Re: [PATCH] arm64: dts: ls1028a: fix optee node
[not found] <DB7PR04MB53223015C17DCD6DBCCACE5382659@DB7PR04MB5322.eurprd04.prod.outlook.com>
@ 2021-03-22 13:35 ` Michael Walle
0 siblings, 0 replies; 6+ messages in thread
From: Michael Walle @ 2021-03-22 13:35 UTC (permalink / raw)
To: Sahil Malhotra
Cc: linux-arm-kernel, devicetree, linux-kernel, Sahil Malhotra (OSS),
Shawn Guo, Leo Li, Rob Herring, Guillaume Tucker,
kernelci.org bot
Am 2021-03-22 14:04, schrieb Sahil Malhotra:
>> Sahil, if you like you can pick it up to enable the nodes for your
>> ls1028a boards.
> Michael, If we enable the optee node like this, will this gets resolved
> ?
I don't know what you mean. This was a fix for the initial patch. So,
I guess the answer is yes it will not break my board if you don't
enable optee globally, but just for your board.
-michael
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-03-29 0:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-18 8:34 [PATCH] arm64: dts: ls1028a: fix optee node Michael Walle
2021-03-18 9:20 ` Michael Walle
2021-03-22 23:12 ` Li Yang
2021-03-29 0:38 ` Shawn Guo
[not found] <DB7PR04MB53222C26DD58E81FEAE4A27982659@DB7PR04MB5322.eurprd04.prod.outlook.com>
2021-03-22 11:39 ` Michael Walle
[not found] <DB7PR04MB53223015C17DCD6DBCCACE5382659@DB7PR04MB5322.eurprd04.prod.outlook.com>
2021-03-22 13:35 ` Michael Walle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).