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:   Pankaj Gupta <pankaj.gupta@nxp.com>
To:     gaurav.jain@nxp.com, herbert@gondor.apana.org.au,
        davem@davemloft.net
Cc:     linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-imx@nxp.com, Pankaj Gupta <pankaj.gupta@nxp.com>,
        Alice Guo <alice.guo@nxp.com>,
        Dong Aisheng <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
Date:   Fri, 12 May 2023 20:40:33 +0530
Message-Id: <20230512151033.1327643-1-pankaj.gupta@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?cikaUN7mHZoDdCyVnqogvawdhFGFDAKWeJ0NLk6Sngn463JWVsB2EfGGOb6K?=
 =?us-ascii?Q?uIe6h18CSJC8DeuRYCRz8gO0GI6SgCzIHlpUzePAos8YkrXxEeihY6DsonOi?=
 =?us-ascii?Q?3Yv8GqX1z757315AHLMxnz2kNiy8nSd9721Q40UWKgMYv1SIR5n+zRKYeZtl?=
 =?us-ascii?Q?pIQ2/jL5ngFBPgQwXXWPjSfVb2oytPd1YLbHYB/F4lfDmnLRI2mlkYatCnYJ?=
 =?us-ascii?Q?q+Oq1xW03vWO7/dvDBFpbtA2980dhG1TLkUgdvcef3YUUlisDJ1AqnCIr1Vd?=
 =?us-ascii?Q?BZh+D3hyBEz8AXMKxFo6KgvI/iYwHEE+8hBzAai8BtpakSOWoyvG04Uh3Qu5?=
 =?us-ascii?Q?pdO+0fo9diW2R4wVdORaeUlC3m4fQlQ/35lwCtQ56j6TP3FvdJmWJvpaZy9c?=
 =?us-ascii?Q?SBUunhyZ7CW/0MlTF0o293CYsJI5nuHBQ/ieNWyv29thnGbNWthn+XZnW0fq?=
 =?us-ascii?Q?Xxtu8CnLr5mRlUVyDyjIcah5uz/QQeuRhVOXHxdE1exeBUmPqngGjGFfEewm?=
 =?us-ascii?Q?fkVRfjwp79Toaw8jlHyvBDjpS6wvwhBNTstz3Yw/djW+qXcx+Xa1ZBzhaR1u?=
 =?us-ascii?Q?ezzgULV5dMbhZG9oNJeU28t8MBvm99z2sDHeHzeRf9E+Enhop9dQitz2oHxy?=
 =?us-ascii?Q?JS6UaKN9Qx4hKXsmaCFF7UwgIUKN14DtyhfxpFIL5Pa+NewsIMGDsblvWJCe?=
 =?us-ascii?Q?dcFCoJ0EMPVzim3brqy6heWOfZNNFmvYEWdeOFi3DeOetzZBP2jDPCZGnbGi?=
 =?us-ascii?Q?JbTLiFMd7TVpQp1QrNXX/dZ3lE0paPDKQ32agYbBDq1wPlg+S6+Qgbe7ca3h?=
 =?us-ascii?Q?qjFfoq7donDihgE8xl+Fn17jCcrNyQAsIxyTrsIF7J7KBqk15ViHOkXWA76R?=
 =?us-ascii?Q?ThmO5s5bQ/bz7Xc8WqfnR0dllsYH/y/hkjGYlW+ZhrgW3/x/CStH1I+cNLpc?=
 =?us-ascii?Q?TKo+Qe3P4zSH0WJhzOXd7tcAbL3Z84ywbsodLCZ/EuPMRxBkNTSCklFzi8lv?=
 =?us-ascii?Q?bObIUML0v2ToXqTLJ1xSkysDgqThw4VG1qSs6+i9BM9opPOIrVZy9L4NPTs7?=
 =?us-ascii?Q?r0W2sU78xI4UosweNu6KnXVbzBh1Gf5khZxmav7fB1q7SZ8CnJTB2NmT5yx5?=
 =?us-ascii?Q?EmrVvWa9g5hgVZPcz7/8BA91pyZAJXVSQyJgjo3lax21mtYLRHmbsZvk24zb?=
 =?us-ascii?Q?6Jggzi7R2ZM8R2HAbzt98ODJADmbbtzHxJpcWs6f4u4rwu4pQJmPbiwBP/1c?=
 =?us-ascii?Q?XjnRlNOJ7tpMuQKBjDpBxQE7rAtTVa7hH8wjNWh7dno5zUsDeZb09R2dj7XS?=
 =?us-ascii?Q?PobdvQKd3sQI2mN7CVCn7nv+A3mSGqM098fUVW9nRALbIiO0gZ5LG+XkuRKM?=
 =?us-ascii?Q?ZUOtrB8rj25bOtTEzZ83gkZNNPNUNbFN1qu03fO69gIXRv3VDKKKraODFs4w?=
 =?us-ascii?Q?AMB8M2dWzg74EBzdF/LXa/YwS1GCm6rHvUXGrGGGTTZbFp8ZKijsGDGa0lDE?=
 =?us-ascii?Q?umyfZicfAlRhdFwTDbOPkAfJRJV2xAKUxMu+XiEmml8E8GhSg69Qt0TadiqF?=
 =?us-ascii?Q?e9PcqxOlyhM0+e96AaObr9a/1p2JLe5kQWPuiw0d?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 94283075-8bc5-4147-939c-08db52cd0b1a
X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8630.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 May 2023 09:41:21.3338
 (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: yWIIVmhKaPtSnN8U+Q/kNunu9coyn/mYZp6oXwoBFKBAPTp6W63GufKb57FKi6eBPq7xjFfc87mC8oZZMU29fw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8858
X-Spam-Status: No, score=0.9 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_03_06,
        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=no 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

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