Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Alice Guo <alice.guo@nxp.com>
To:     Pankaj Gupta <pankaj.gupta@nxp.com>,
        Gaurav Jain <gaurav.jain@nxp.com>,
        "herbert@gondor.apana.org.au" <herbert@gondor.apana.org.au>,
        "davem@davemloft.net" <davem@davemloft.net>
CC:     "linux-crypto@vger.kernel.org" <linux-crypto@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        dl-linux-imx <linux-imx@nxp.com>,
        Aisheng Dong <aisheng.dong@nxp.com>,
        Horia Geanta <horia.geanta@nxp.com>,
        Peng Fan <peng.fan@nxp.com>
Subject: RE: [PATCH] caam: imx: fix the built-in caam driver cannot match
 soc_id
Thread-Topic: [PATCH] caam: imx: fix the built-in caam driver cannot match
 soc_id
Thread-Index: AQHZhLXpMVK5RXmzBESb3LpnLeQPia9Wd38w
Date:   Fri, 12 May 2023 10:57:22 +0000
Message-ID: <AM6PR04MB60535A5DB643B8A5B07E1C55E2759@AM6PR04MB6053.eurprd04.prod.outlook.com>
References: <20230512151033.1327643-1-pankaj.gupta@nxp.com>
In-Reply-To: <20230512151033.1327643-1-pankaj.gupta@nxp.com>
Accept-Language: zh-CN, en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?6ZNfaD+/0gHrU2L1mlZm7SBAEdVnVoVJb0NrZ4Qcr0L3q5Irs4w5Wk8Cni5q?=
 =?us-ascii?Q?dV2vY3+XO0O07H2oPuV+Qlx+OnkRiAdkg9sQW83rMzVtBYR8aJiHA3WE/PEG?=
 =?us-ascii?Q?aOJRUcmgMhItlfhoar2DAjcxiPGlggGDfcwBUKK3l4Fi8Wu2LYucigPlT9JW?=
 =?us-ascii?Q?EU8o38uPh9rBPiKSzF2Lo3cWVL7MFyAq6Vo0r/CkywAltYqcR4XdJInceeG5?=
 =?us-ascii?Q?XXA5L/zrxz+14Z5ALfGit/JyPmjzO6Vw2tgBPdATsoHJqe/LmaowSluhxrTH?=
 =?us-ascii?Q?q+NyFISoLUf7zEXLvSzjGZ7/P8S6BTlwQE+9F4tVE48+xLzaeyX+QN99WDqy?=
 =?us-ascii?Q?MNb6AuNR8z08I8kDdnRypc/+R5gNMN8PfRmrHMvtUEJ7wja/iJseI0yuLv9O?=
 =?us-ascii?Q?iFkvGWMrnMqnJawZ9tKBtEPP4i+tkE2MVWcrUCFgNEAAtX87dleHczfqXNUK?=
 =?us-ascii?Q?ETM4CVgcrOA04fkA2SeKSLSXmT/dBgpP03rW61qzDSPn0ruaO9whAcOoRgSy?=
 =?us-ascii?Q?ViVy60NfKGonT3sHjZxslJpCHwVMEmEe4x6paKd9TJ/Eiuvplw9mRREHb3q1?=
 =?us-ascii?Q?v5inlKbf9GCtHVg118Cd2pEvdSrPLbupVSkH7YyrhpmdXUcHvxx2da/QA+lQ?=
 =?us-ascii?Q?79wqp6YU3mRnpJTgpcEt6CYz82caZuuLjS1TRzcumnFIu+thsh4BOZjDsZF4?=
 =?us-ascii?Q?lTwZM7CThv19WADMRcf/rrHd5zTU6BN2n14stm2RREehqDUX3BJTEjWdFIEh?=
 =?us-ascii?Q?hzbO5E1CLHf/Tc3pwtsKk2LK0ymI91NkwMAoxgnCEOr9B65cxOyikD2fWiPJ?=
 =?us-ascii?Q?ByecL3IBPjBRpTCeRGez8e+DYNvdmkj9kyJtcBfeJe+jt0XEsJGGmcBK+dBy?=
 =?us-ascii?Q?pYQ5TDMJyy+PPd4jbamZcdl2l27cABwrg+Ax79j1G/FLD+M4EC1qIaFNlqs/?=
 =?us-ascii?Q?RXqE+Kku8oVRnJ9KyuszXhQgb8e8FY1onJwPJX/FSiALLOWQs7FVI0myAYI6?=
 =?us-ascii?Q?udwPDesa3PFb6TjTt/oXj9M7eL6ZhNohIhiSF5SLcrSpDKEF2YgDHD6iry3c?=
 =?us-ascii?Q?dw0AX/WCjehlIcRPHJhFpIj2li8SZqjgcQvPy+QwzsNp4wW7SUU901s6Go0c?=
 =?us-ascii?Q?zayeCxIFz9keWporJZGbkIk5KqiF2aAF8BJWOFWxvCY6MOaXaz1pE0yxLEIE?=
 =?us-ascii?Q?jlFiUkK1vMr2LNXKvH3oPaZqwoa0YY0cc8pWhDjQsgIJY+gO3Am6OmoxBaus?=
 =?us-ascii?Q?6DR9M3y4AvVaz4e3p5tQcECt9HSKSux906yYL0xsDmm3LeG764KcH+XF5i/o?=
 =?us-ascii?Q?BH8wOome4ma8JE77ToJOaOG/YFXnOHYaaUB5z/NYofs+FdxyB3mj117iTFdN?=
 =?us-ascii?Q?+OAOgNxbqTmgZHWBEmLswto0u/DdbK5MBEEauK+0z5akXnpDLuT4d4DVaKCD?=
 =?us-ascii?Q?ybfYiaj08Hycwc8QtjKFYYrk/h+ezwdiJfCaRRvo5ELImEJ9gueej8Myr4eq?=
 =?us-ascii?Q?x3KeaAmql4DghmQQ1OYZOp5nYCXrO2JET/+moXvPYHXDb1h9/f0m1cHGfHwt?=
 =?us-ascii?Q?+l3dCzxEBUUGIaZ3aCs=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6053.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: bad479b2-d855-4839-ffdd-08db52d7aa31
X-MS-Exchange-CrossTenant-originalarrivaltime: 12 May 2023 10:57:22.9425
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: LQw6TopT8/gprDvUxm2hlHGFHtiKuEZHWSPptcWNyAzm/F5Vsue7SNL5swwPgU+Q/8Rm5+D+uiteM8SQmB7ZFw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8142
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-crypto.vger.kernel.org>
X-Mailing-List: linux-crypto@vger.kernel.org

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
>=20
> 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)
>=20
> It is needed to return -EPROBE_DEFER, after calling soc_device_match() in
> drivers/crypto/caam/ctrl.c.
>=20
> 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.
>=20
> caam: imx: change to use of_match_node in run_descriptor_deco0
>=20
> 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.
>=20
> 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(-)
>=20
> diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c inde=
x
> 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);  }
>=20
> +static const struct of_device_id imx8m_machine_match[] =3D {
> +	{ .compatible =3D "fsl,imx8mm", },
> +	{ .compatible =3D "fsl,imx8mn", },
> +	{ .compatible =3D "fsl,imx8mp", },
> +	{ .compatible =3D "fsl,imx8mq", },
> +	{ .compatible =3D "fsl,imx8ulp", },
> +	{ }
> +};
> +
>  /*
>   * run_descriptor_deco0 - runs a descriptor on DECO0, under direct contr=
ol
> 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 =3D=
=3D 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);
>=20
>  		while (!(rd_reg32(&ctrl->deco_rsr) & DECORSR_VALID) && @@
> -646,6 +652,9 @@ static int caam_probe(struct platform_device *pdev)
>  	nprop =3D pdev->dev.of_node;
>=20
>  	imx_soc_match =3D soc_device_match(caam_imx_soc_table);
> +	if (!imx_soc_match && of_match_node(imx8m_machine_match, of_root))
> +		return -EPROBE_DEFER;
> +
>  	caam_imx =3D (bool)imx_soc_match;
>=20
>  	if (imx_soc_match) {
> --
> 2.34.1