From:   meenakshi.aggarwal@nxp.com
To:     horia.geanta@nxp.com, V.sethi@nxp.com, pankaj.gupta@nxp.com,
        gaurav.jain@nxp.com, herbert@gondor.apana.org.au,
        davem@davemloft.net, linux-crypto@vger.kernel.org,
        linux-kernel@vger.kernel.org, franck.lenormand@nxp.com
Cc:     vijayb@linux.microsoft.com, code@tyhicks.com
Subject: [PATCH] drivers: crypto: caam: jr: Allow quiesce when quiesced
Date:   Wed,  1 Mar 2023 00:07:58 +0530
Message-Id: <20230228183758.448396-1-meenakshi.aggarwal@nxp.com>
In-Reply-To: <20230221054219.2142012-1-meenakshi.aggarwal@nxp.com>
References: <20230221054219.2142012-1-meenakshi.aggarwal@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?MdRetrs5R2pbaQEC3+Gjl5U7MROgc9r9hV+HMC06S/WljlVrT1F5dj8S2YAb?=
 =?us-ascii?Q?3QwERQ7Hb2Y0F1uvahKHkBGa5Ln0vptP2aN0wAJHqkNst5J3w0lnQCgsfpD8?=
 =?us-ascii?Q?3uN6NGJeqWIsOG8vt9Fhg3wFcpgIVCAVnblz/B8U4R3NwTBNipPbm5DnSecu?=
 =?us-ascii?Q?uKwjLjlS+k9Wp639YqlYsg/RPPZ6ywdmjgbeHoJj2xUYoQe+mjSLG7zpVyNb?=
 =?us-ascii?Q?lRsX3bSCT7ELGxHVxYPO28YaVNm/4qCvqhJRoV50HpC6yQaB3KeV/GXkafPb?=
 =?us-ascii?Q?gHLVMLvTAcfeWhE/Eyz5QUXkZ+lT3P0bA4bGRcLKdru+ibsq/AhyknjOVknV?=
 =?us-ascii?Q?q+4lnSL3JnqVXz+eQO5OZp5lLTxKMyDNk0ciQsci66BgxaAm0xJDGmCZaTMt?=
 =?us-ascii?Q?9ygqICW7kldZyJcp/ZEvJzFPGlqPabQd0tUqnghWpntOjR5PKiXyZxbPtg+9?=
 =?us-ascii?Q?oriwKxSJ1YgIUodxWmZdE2vH0tVytDTZqZOcDvfwvXgopi3vRM4tE2BRTZDx?=
 =?us-ascii?Q?qamuqkDnq0SxBJbZG7o42yAgOo9L8/xxQsVI5lEkrIaRSbEQ0miY+nhYwo0K?=
 =?us-ascii?Q?Tgk+AJG8QSf+4l6vZY217878nStL0A8FOs+q6V6LBLlM0s9KQTH3W1DBopUd?=
 =?us-ascii?Q?YWxmfrcIQ1MdtI8S02gOoe2KY2lE4omUBQ/658NVGW5+/1G1XAL9zdLheqiE?=
 =?us-ascii?Q?HeGXspNl3ea1oUvD4qZ6c3n5UnEwTqw/DQZ7t8dJ1PYI+x5N+YCD+l0C8uOE?=
 =?us-ascii?Q?4L2+i8H4VglIVjcXgLGXMfUarKYvv8j/3YmiCdoY2Q5jxYRuouyoLUJnAnga?=
 =?us-ascii?Q?4P3VITgzFOF67s6vPk/dChBwDS45fzhQJanS0CniC4DInP0vrPnIU5vHZfBb?=
 =?us-ascii?Q?L+nrvDg9n9PPC7B2Yd6pjGMf7qIr1PRj6WmQTtP6g3NN8QyRAS3Ze4dbGg3K?=
 =?us-ascii?Q?JMw5+/eK7aB9IVM5pTqTokOtLP/JzJlmCDZ2SixX5o5csXEAgrKAkvpp3qfl?=
 =?us-ascii?Q?fZehfO6E5HIUq7zFQGYgtcmacoOAzoc7e61gORpIyBcs2VaBheBEyqSr/tb2?=
 =?us-ascii?Q?TkbNu4An9wtGe542Fs4jo+6IShzC+KHHW64+DhvpGvG/Zx4/2XPfj054sfSq?=
 =?us-ascii?Q?7jgS3IRASCPiJOcUOYkH7oXX6plu8EBphrRw6xHPDQEmhoooBQwDbdCmCjDH?=
 =?us-ascii?Q?eTvCSK5rRQZySVJh6l7X96nQ78EvakHYMPY+eBaNdqNhY11Hqb/thl01eC4f?=
 =?us-ascii?Q?3GjAPA7cAWvF1BPGoE8AsxzRY9Wfk+uRmwI3DCYsfLXLRZN/JxqlsGqWfrf4?=
 =?us-ascii?Q?BbUu4HMtYzImrWqD7h9T7ryRGIbKvamWEPiRbz5idvvpIL5HvqBmPmPGA9Fg?=
 =?us-ascii?Q?3rlHDIn5iK94J7mFcGMnsxdjcyTdOgya29QFEbGYVQM1ZY+/UXMfxPpxwusM?=
 =?us-ascii?Q?GjOw5HR3xuRw5s/ODQF7nCSgVDQuxutqbfS+zIbgmj4mOId7oR3M2ViXNp7y?=
 =?us-ascii?Q?lUBNlZ4zv2KxVEQwEP+OGx3mIGUbu6wjruy1B4kBCmEMAdQjsj3ugSWmdpvF?=
 =?us-ascii?Q?ajUEIEh2D89Ywb9P0UawPjqVE5btznJKDOFQkMBzs74MaKnf/96j6ORyfvBq?=
 =?us-ascii?Q?OQ=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 50c7d6be-1e33-4710-7e14-08db19baf9ce
X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9563.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Feb 2023 18:38:25.0915
 (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: nOFW/iQ5wBG2L4AGGQn8/8aOTvCtexwaLRKiUsu50LH5b6CkXiOPJGZmWI5i++C5qcw55Kmx8O0RzESyVtDG/owaQphWyvbS1CPVwJmVncs=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8213
Precedence: bulk
List-ID: <linux-crypto.vger.kernel.org>
X-Mailing-List: linux-crypto@vger.kernel.org

From: Horia Geanta <horia.geanta@nxp.com>

Issues:
- Job ring device is busy when do kexec reboot
- Failed to flush job ring when do system suspend-resume

Fix:
Flush the job ring to stop the running jobs.

Signed-off-by: Horia Geanta <horia.geanta@nxp.com>
Signed-off-by: Franck LENORMAND <franck.lenormand@nxp.com>
Reviewed-by: Pankaj Gupta <pankaj.gupta@nxp.com>
---
 drivers/crypto/caam/jr.c | 55 ++++++++++++++++++++++++++++++++--------
 1 file changed, 45 insertions(+), 10 deletions(-)

diff --git a/drivers/crypto/caam/jr.c b/drivers/crypto/caam/jr.c
index 724fdec18bf9..eb3b9a7e9a35 100644
--- a/drivers/crypto/caam/jr.c
+++ b/drivers/crypto/caam/jr.c
@@ -4,7 +4,7 @@
  * JobR backend functionality
  *
  * Copyright 2008-2012 Freescale Semiconductor, Inc.
- * Copyright 2019 NXP
+ * Copyright 2019, 2023 NXP
  */
 
 #include <linux/of_irq.h>
@@ -72,19 +72,27 @@ static void caam_jr_crypto_engine_exit(void *data)
 	crypto_engine_exit(jrpriv->engine);
 }
 
-static int caam_reset_hw_jr(struct device *dev)
+/*
+ * Put the CAAM in quiesce, ie stop
+ *
+ * Must be called with itr disabled
+ */
+static int caam_jr_stop_processing(struct device *dev, u32 jrcr_bits)
 {
 	struct caam_drv_private_jr *jrp = dev_get_drvdata(dev);
 	unsigned int timeout = 100000;
 
-	/*
-	 * mask interrupts since we are going to poll
-	 * for reset completion status
-	 */
-	clrsetbits_32(&jrp->rregs->rconfig_lo, 0, JRCFG_IMSK);
+	/* Check the current status */
+	if (rd_reg32(&jrp->rregs->jrintstatus) & JRINT_ERR_HALT_INPROGRESS)
+		goto wait_quiesce_completion;
 
-	/* initiate flush (required prior to reset) */
-	wr_reg32(&jrp->rregs->jrcommand, JRCR_RESET);
+	/* Reset the field */
+	clrsetbits_32(&jrp->rregs->jrintstatus, JRINT_ERR_HALT_MASK, 0);
+
+	/* initiate flush / park (required prior to reset) */
+	wr_reg32(&jrp->rregs->jrcommand, jrcr_bits);
+
+wait_quiesce_completion:
 	while (((rd_reg32(&jrp->rregs->jrintstatus) & JRINT_ERR_HALT_MASK) ==
 		JRINT_ERR_HALT_INPROGRESS) && --timeout)
 		cpu_relax();
@@ -95,8 +103,35 @@ static int caam_reset_hw_jr(struct device *dev)
 		return -EIO;
 	}
 
+	return 0;
+}
+
+/*
+ * Flush the job ring, so the jobs running will be stopped, jobs queued will be
+ * invalidated and the CAAM will no longer fetch fron input ring.
+ *
+ * Must be called with itr disabled
+ */
+static int caam_jr_flush(struct device *dev)
+{
+	return caam_jr_stop_processing(dev, JRCR_RESET);
+}
+
+static int caam_reset_hw_jr(struct device *dev)
+{
+	struct caam_drv_private_jr *jrp = dev_get_drvdata(dev);
+	unsigned int timeout = 100000;
+	int err;
+	/*
+	 * mask interrupts since we are going to poll
+	 * for reset completion status
+	 */
+	clrsetbits_32(&jrp->rregs->rconfig_lo, 0, JRCFG_IMSK);
+	err = caam_jr_flush(dev);
+	if (err)
+		return err;
+
 	/* initiate reset */
-	timeout = 100000;
 	wr_reg32(&jrp->rregs->jrcommand, JRCR_RESET);
 	while ((rd_reg32(&jrp->rregs->jrcommand) & JRCR_RESET) && --timeout)
 		cpu_relax();
-- 
2.25.1