Message-ID: <aa84249b7e099cf23b49016433b22ae541c0a41d.camel@pengutronix.de>
Subject: Re: [PATCH v3 2/2] arm64: dts: imx8m: define proper status for caam
 jr
From:   Rouven Czerwinski <r.czerwinski@pengutronix.de>
To:     Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>,
        linux-kernel@vger.kernel.org
Cc:     peng.fan@nxp.com, ping.bai@nxp.com, alice.guo@nxp.com,
        agx@sigxcpu.org, frieder.schrempf@kontron.de,
        leonard.crestez@nxp.com, festevam@gmail.com, marex@denx.de,
        herbert@gondor.apana.org.au, horia.geanta@nxp.com,
        aford173@gmail.com, krzk@kernel.org, linux-imx@nxp.com,
        devicetree@vger.kernel.org, hongxing.zhu@nxp.com,
        s.hauer@pengutronix.de, pankaj.gupta@nxp.com, robh+dt@kernel.org,
        thunder.leizhen@huawei.com, martink@posteo.de,
        daniel.baluta@nxp.com, linux-arm-kernel@lists.infradead.org,
        gregkh@linuxfoundation.org, shengjiu.wang@nxp.com,
        qiangqing.zhang@nxp.com, michael@walle.cc,
        op-tee@lists.trustedfirmware.org, linux-crypto@vger.kernel.org,
        kernel@pengutronix.de, jun.li@nxp.com, shawnguo@kernel.org,
        davem@davemloft.net, l.stach@pengutronix.de
Date:   Thu, 06 Jan 2022 12:26:30 +0100
In-Reply-To: <20211207230206.14637-3-andrey.zhizhikin@leica-geosystems.com>
References: <20211111164601.13135-1-andrey.zhizhikin@leica-geosystems.com>
         <20211207230206.14637-1-andrey.zhizhikin@leica-geosystems.com>
         <20211207230206.14637-3-andrey.zhizhikin@leica-geosystems.com>
Organization: Pengutronix e.K.
Content-Type: text/plain; charset="UTF-8"
User-Agent: Evolution 3.42.2 
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Precedence: bulk

Hi Andrey,

On Wed, 2021-12-08 at 00:02 +0100, Andrey Zhizhikin wrote:
> CAAM JR nodes are configured by BootROM and are used by various software
> entities during the boot process before they reach the Kernel.
> 
> Default BootROM configuration have JR0 and JR1 reserved for S-only
> access, while JR2 is generally available for both S and NS access. HAB
> feature of i.MX8M family does require that JR0 is reserved exclusively
> in S-only world, while JR1 and JR2 are both released to NS-World. OP-TEE
> can later reclaim the JR2 via dt_enable_secure_status() call, and modify
> the DID to hold it in S-World only.
> 
> The above setup has been discovered during review of CAAM patchset
> presented to U-Boot integration [1], and does not correspond to the
> status on jr nodes in FDT.
> 
> This missing status settings leads to the following error message during
> jr node probing:
> [    1.509894] caam 30900000.crypto: job rings = 3, qi = 0
> [    1.525201] caam_jr 30901000.jr: failed to flush job ring 0
> [    1.525214] caam_jr: probe of 30901000.jr failed with error -5
> 
> JR register readout after BootROM execution shows the following values:
> JR0DID_MS = 0x8011
> JR1DID_MS = 0x8011
> JR2DID_MS = 0x0
> 
> This shows that JR0 and JR1 have TZ_OWN bit set, which marks them to be
> reserved for S-World, while JR2 remains accessible from NS-World.
> 
> Provide the correct status for JR nodes in imx8m derivatives, which have
> a following meaning:
> - JR0: S-only
> - JR1: visible in both
> - JR2: NS-only
> 
> Note, that JR2 is initially marked to be NS-only which does correspond
> to DID readout when OP-TEE is not present. Once present, OP-TEE will
> reclaim the JR2 and set both "status" and "secure-status" to claim JR2
> for S-only access.

While I can understand that you want to fix your use case for when HAB
is enabled, note that this is disabling JR0 in the none-HAB case as
well. IMO this should be handled correctly by the bootloader and/or OP-
TEE. The default upstream configuration for OP-TEE is to not use the
CAAM at runtime as well, since linux runtime PM disablement of the CAAM
will lock up OP-TEE when it tries to access the CAAM.

Kind regards,
Rouven Czerwinski

> 
> Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
> Link: [1]: https://lore.kernel.org/u-boot/AM6PR06MB4691FC905FE5658BE4B15C11A6609@AM6PR06MB4691.eurprd06.prod.outlook.com/
> ---
> Changes in V3:
> - No change, new patch introduced
> 
>  arch/arm64/boot/dts/freescale/imx8mm.dtsi | 4 ++++
>  arch/arm64/boot/dts/freescale/imx8mn.dtsi | 4 ++++
>  arch/arm64/boot/dts/freescale/imx8mp.dtsi | 4 ++++
>  arch/arm64/boot/dts/freescale/imx8mq.dtsi | 4 ++++
>  4 files changed, 16 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/freescale/imx8mm.dtsi b/arch/arm64/boot/dts/freescale/imx8mm.dtsi
> index 5b9c2cca9ac4..51465974c4ea 100644
> --- a/arch/arm64/boot/dts/freescale/imx8mm.dtsi
> +++ b/arch/arm64/boot/dts/freescale/imx8mm.dtsi
> @@ -914,18 +914,22 @@ sec_jr0: jr@1000 {
>  					compatible = "fsl,sec-v4.0-job-ring";
>  					reg = <0x1000 0x1000>;
>  					interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
> +					status = "disabled";
> +					secure-status = "okay";
>  				};
>  
>  				sec_jr1: jr@2000 {
>  					compatible = "fsl,sec-v4.0-job-ring";
>  					reg = <0x2000 0x1000>;
>  					interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
> +					secure-status = "okay";
>  				};
>  
>  				sec_jr2: jr@3000 {
>  					compatible = "fsl,sec-v4.0-job-ring";
>  					reg = <0x3000 0x1000>;
>  					interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
> +					secure-status = "disabled";
>  				};
>  			};
>  
> diff --git a/arch/arm64/boot/dts/freescale/imx8mn.dtsi b/arch/arm64/boot/dts/freescale/imx8mn.dtsi
> index ba23b416b5e6..e5edf14319b1 100644
> --- a/arch/arm64/boot/dts/freescale/imx8mn.dtsi
> +++ b/arch/arm64/boot/dts/freescale/imx8mn.dtsi
> @@ -808,18 +808,22 @@ sec_jr0: jr@1000 {
>  					 compatible = "fsl,sec-v4.0-job-ring";
>  					 reg = <0x1000 0x1000>;
>  					 interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
> +					 status = "disabled";
> +					 secure-status = "okay";
>  				};
>  
>  				sec_jr1: jr@2000 {
>  					 compatible = "fsl,sec-v4.0-job-ring";
>  					 reg = <0x2000 0x1000>;
>  					 interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
> +					 secure-status = "okay";
>  				};
>  
>  				sec_jr2: jr@3000 {
>  					 compatible = "fsl,sec-v4.0-job-ring";
>  					 reg = <0x3000 0x1000>;
>  					 interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
> +					 secure-status = "disabled";
>  				};
>  			};
>  
> diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
> index 977783784342..3c23bf5c3910 100644
> --- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi
> +++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
> @@ -661,18 +661,22 @@ sec_jr0: jr@1000 {
>  					compatible = "fsl,sec-v4.0-job-ring";
>  					reg = <0x1000 0x1000>;
>  					interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
> +					status = "disabled";
> +					secure-status = "okay";
>  				};
>  
>  				sec_jr1: jr@2000 {
>  					compatible = "fsl,sec-v4.0-job-ring";
>  					reg = <0x2000 0x1000>;
>  					interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
> +					secure-status = "okay";
>  				};
>  
>  				sec_jr2: jr@3000 {
>  					compatible = "fsl,sec-v4.0-job-ring";
>  					reg = <0x3000 0x1000>;
>  					interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
> +					secure-status = "disabled";
>  				};
>  			};
>  
> diff --git a/arch/arm64/boot/dts/freescale/imx8mq.dtsi b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
> index 95d8b95d6120..16c4c9110ce7 100644
> --- a/arch/arm64/boot/dts/freescale/imx8mq.dtsi
> +++ b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
> @@ -999,18 +999,22 @@ sec_jr0: jr@1000 {
>  					compatible = "fsl,sec-v4.0-job-ring";
>  					reg = <0x1000 0x1000>;
>  					interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
> +					status = "disabled";
> +					secure-status = "okay";
>  				};
>  
>  				sec_jr1: jr@2000 {
>  					compatible = "fsl,sec-v4.0-job-ring";
>  					reg = <0x2000 0x1000>;
>  					interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
> +					secure-status = "okay";
>  				};
>  
>  				sec_jr2: jr@3000 {
>  					compatible = "fsl,sec-v4.0-job-ring";
>  					reg = <0x3000 0x1000>;
>  					interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
> +					secure-status = "disabled";
>  				};
>  			};
>  

-- 
Pengutronix e.K.           | Rouven Czerwinski          |
Steuerwalder Str. 21       | http://www.pengutronix.de/ |
31137 Hildesheim, Germany  | Phone: +49-5121-206917-0   |