caam: imx: fix the built-in caam driver cannot match soc_id

[PATCH] caam: imx: fix the built-in caam driver cannot match soc_id

Posted by Pankaj Gupta 2 years, 9 months ago

Since, CAAM driver is probed before soc_device_attribute done as part of:
- drivers/soc/imx/soc-imx8m.c   (for i.MX8M)
- drivers/firmware/imx/ele_mu.c (EdgeLock Enclave kernel driver, for i.MX8ULP)

It is needed to return -EPROBE_DEFER, after calling soc_device_match() in
drivers/crypto/caam/ctrl.c.

soc_device_match returns NULL for:
- i.MX8M
- i.MX8ULP,
can be considered that the SoC device has not been probed yet.
Hence, it returns -EPROBE_DEFER directly.

caam: imx: change to use of_match_node in run_descriptor_deco0

Providing imx8m_machine_match to match:
- i.MX8M{Q,M,N,P},
- i.MX8ULP,
so as to start using of_match_node, to simplify the code.

Signed-off-by: Alice Guo <alice.guo@nxp.com>
Signed-off-by: Pankaj Gupta <pankaj.gupta@nxp.com>
Reviewed-by: Dong Aisheng <aisheng.dong@nxp.com>
Reviewed-by: Horia Geanta <horia.geanta@nxp.com>
Acked-by: Peng Fan <peng.fan@nxp.com>
---
 drivers/crypto/caam/ctrl.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index bedcc2ab3a00..d8c528363f10 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -79,6 +79,15 @@ static void build_deinstantiation_desc(u32 *desc, int handle)
 	append_jump(desc, JUMP_CLASS_CLASS1 | JUMP_TYPE_HALT);
 }
 
+static const struct of_device_id imx8m_machine_match[] = {
+	{ .compatible = "fsl,imx8mm", },
+	{ .compatible = "fsl,imx8mn", },
+	{ .compatible = "fsl,imx8mp", },
+	{ .compatible = "fsl,imx8mq", },
+	{ .compatible = "fsl,imx8ulp", },
+	{ }
+};
+
 /*
  * run_descriptor_deco0 - runs a descriptor on DECO0, under direct control of
  *			  the software (no JR/QI used).
@@ -105,10 +114,7 @@ static inline int run_descriptor_deco0(struct device *ctrldev, u32 *desc,
 	     * Apparently on i.MX8M{Q,M,N,P} it doesn't matter if virt_en == 1
 	     * and the following steps should be performed regardless
 	     */
-	    of_machine_is_compatible("fsl,imx8mq") ||
-	    of_machine_is_compatible("fsl,imx8mm") ||
-	    of_machine_is_compatible("fsl,imx8mn") ||
-	    of_machine_is_compatible("fsl,imx8mp")) {
+	    of_match_node(imx8m_machine_match, of_root)) {
 		clrsetbits_32(&ctrl->deco_rsr, 0, DECORSR_JR0);
 
 		while (!(rd_reg32(&ctrl->deco_rsr) & DECORSR_VALID) &&
@@ -646,6 +652,9 @@ static int caam_probe(struct platform_device *pdev)
 	nprop = pdev->dev.of_node;
 
 	imx_soc_match = soc_device_match(caam_imx_soc_table);
+	if (!imx_soc_match && of_match_node(imx8m_machine_match, of_root))
+		return -EPROBE_DEFER;
+
 	caam_imx = (bool)imx_soc_match;
 
 	if (imx_soc_match) {
-- 
2.34.1

Re: [PATCH] caam: imx: fix the built-in caam driver cannot match soc_id

Posted by Herbert Xu 2 years, 8 months ago

On Fri, May 12, 2023 at 08:40:33PM +0530, Pankaj Gupta wrote:
> Since, CAAM driver is probed before soc_device_attribute done as part of:
> - drivers/soc/imx/soc-imx8m.c   (for i.MX8M)
> - drivers/firmware/imx/ele_mu.c (EdgeLock Enclave kernel driver, for i.MX8ULP)
> 
> It is needed to return -EPROBE_DEFER, after calling soc_device_match() in
> drivers/crypto/caam/ctrl.c.
> 
> soc_device_match returns NULL for:
> - i.MX8M
> - i.MX8ULP,
> can be considered that the SoC device has not been probed yet.
> Hence, it returns -EPROBE_DEFER directly.
> 
> caam: imx: change to use of_match_node in run_descriptor_deco0
> 
> Providing imx8m_machine_match to match:
> - i.MX8M{Q,M,N,P},
> - i.MX8ULP,
> so as to start using of_match_node, to simplify the code.
> 
> Signed-off-by: Alice Guo <alice.guo@nxp.com>
> Signed-off-by: Pankaj Gupta <pankaj.gupta@nxp.com>
> Reviewed-by: Dong Aisheng <aisheng.dong@nxp.com>
> Reviewed-by: Horia Geanta <horia.geanta@nxp.com>
> Acked-by: Peng Fan <peng.fan@nxp.com>
> ---
>  drivers/crypto/caam/ctrl.c | 17 +++++++++++++----
>  1 file changed, 13 insertions(+), 4 deletions(-)

Patch applied.  Thanks.
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

RE: [PATCH] caam: imx: fix the built-in caam driver cannot match soc_id

Posted by Alice Guo 2 years, 9 months ago

Acked-by: Alice Guo <alice.guo@nxp.com>

Best Regards,
Alice Guo

> -----Original Message-----
> From: Pankaj Gupta <pankaj.gupta@nxp.com>
> Sent: Friday, May 12, 2023 11:11 PM
> To: Gaurav Jain <gaurav.jain@nxp.com>; herbert@gondor.apana.org.au;
> davem@davemloft.net
> Cc: linux-crypto@vger.kernel.org; linux-kernel@vger.kernel.org; dl-linux-imx
> <linux-imx@nxp.com>; Pankaj Gupta <pankaj.gupta@nxp.com>; Alice Guo
> <alice.guo@nxp.com>; Aisheng Dong <aisheng.dong@nxp.com>; Horia Geanta
> <horia.geanta@nxp.com>; Peng Fan <peng.fan@nxp.com>
> Subject: [PATCH] caam: imx: fix the built-in caam driver cannot match soc_id
> 
> Since, CAAM driver is probed before soc_device_attribute done as part of:
> - drivers/soc/imx/soc-imx8m.c   (for i.MX8M)
> - drivers/firmware/imx/ele_mu.c (EdgeLock Enclave kernel driver, for
> i.MX8ULP)
> 
> It is needed to return -EPROBE_DEFER, after calling soc_device_match() in
> drivers/crypto/caam/ctrl.c.
> 
> soc_device_match returns NULL for:
> - i.MX8M
> - i.MX8ULP,
> can be considered that the SoC device has not been probed yet.
> Hence, it returns -EPROBE_DEFER directly.
> 
> caam: imx: change to use of_match_node in run_descriptor_deco0
> 
> Providing imx8m_machine_match to match:
> - i.MX8M{Q,M,N,P},
> - i.MX8ULP,
> so as to start using of_match_node, to simplify the code.
> 
> Signed-off-by: Alice Guo <alice.guo@nxp.com>
> Signed-off-by: Pankaj Gupta <pankaj.gupta@nxp.com>
> Reviewed-by: Dong Aisheng <aisheng.dong@nxp.com>
> Reviewed-by: Horia Geanta <horia.geanta@nxp.com>
> Acked-by: Peng Fan <peng.fan@nxp.com>
> ---
>  drivers/crypto/caam/ctrl.c | 17 +++++++++++++----
>  1 file changed, 13 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c index
> bedcc2ab3a00..d8c528363f10 100644
> --- a/drivers/crypto/caam/ctrl.c
> +++ b/drivers/crypto/caam/ctrl.c
> @@ -79,6 +79,15 @@ static void build_deinstantiation_desc(u32 *desc, int
> handle)
>  	append_jump(desc, JUMP_CLASS_CLASS1 | JUMP_TYPE_HALT);  }
> 
> +static const struct of_device_id imx8m_machine_match[] = {
> +	{ .compatible = "fsl,imx8mm", },
> +	{ .compatible = "fsl,imx8mn", },
> +	{ .compatible = "fsl,imx8mp", },
> +	{ .compatible = "fsl,imx8mq", },
> +	{ .compatible = "fsl,imx8ulp", },
> +	{ }
> +};
> +
>  /*
>   * run_descriptor_deco0 - runs a descriptor on DECO0, under direct control
> of
>   *			  the software (no JR/QI used).
> @@ -105,10 +114,7 @@ static inline int run_descriptor_deco0(struct device
> *ctrldev, u32 *desc,
>  	     * Apparently on i.MX8M{Q,M,N,P} it doesn't matter if virt_en == 1
>  	     * and the following steps should be performed regardless
>  	     */
> -	    of_machine_is_compatible("fsl,imx8mq") ||
> -	    of_machine_is_compatible("fsl,imx8mm") ||
> -	    of_machine_is_compatible("fsl,imx8mn") ||
> -	    of_machine_is_compatible("fsl,imx8mp")) {
> +	    of_match_node(imx8m_machine_match, of_root)) {
>  		clrsetbits_32(&ctrl->deco_rsr, 0, DECORSR_JR0);
> 
>  		while (!(rd_reg32(&ctrl->deco_rsr) & DECORSR_VALID) && @@
> -646,6 +652,9 @@ static int caam_probe(struct platform_device *pdev)
>  	nprop = pdev->dev.of_node;
> 
>  	imx_soc_match = soc_device_match(caam_imx_soc_table);
> +	if (!imx_soc_match && of_match_node(imx8m_machine_match, of_root))
> +		return -EPROBE_DEFER;
> +
>  	caam_imx = (bool)imx_soc_match;
> 
>  	if (imx_soc_match) {
> --
> 2.34.1