[PATCH] arm64: dts: ls1028a: fix optee node

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 <redacted>
Reported-by: "kernelci.org bot" <redacted>
Tested-by: Michael Walle <redacted>
Signed-off-by: Michael Walle <redacted>
---
 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


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

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 <redacted>
Reported-by: "kernelci.org bot" <redacted>
Tested-by: Michael Walle <redacted>
Signed-off-by: Michael Walle <redacted>
---

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

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

On Thu, Mar 18, 2021 at 3:36 AM Michael Walle [off-list ref] 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

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

On Mon, Mar 22, 2021 at 06:12:06PM -0500, Li Yang wrote:

On Thu, Mar 18, 2021 at 3:36 AM Michael Walle [off-list ref] wrote:

quoted

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

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel