public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drivers: crypto: caam: jr: Allow quiesce when quiesced
@ 2023-02-20 10:50 meenakshi.aggarwal
  2023-02-21  5:40 ` [PATCH] drivers: crypto: caam: jr: add .shutdown hook meenakshi.aggarwal
  2023-02-21  5:42 ` [PATCH] drivers: crypto: caam: jr: Allow quiesce when quiesced meenakshi.aggarwal
  0 siblings, 2 replies; 16+ messages in thread
From: meenakshi.aggarwal @ 2023-02-20 10:50 UTC (permalink / raw)
  To: horia.geanta, V.sethi, pankaj.gupta, gaurav.jain, herbert, davem,
	VIJAY.BALAKRISHNA, Tyler.Hicks, linux-crypto, linux-kernel,
	franck.lenormand
  Cc: linux-imx

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>
---
 drivers/crypto/caam/jr.c | 53 +++++++++++++++++++++++++++++++++-------
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git a/drivers/crypto/caam/jr.c b/drivers/crypto/caam/jr.c
index 724fdec18bf9..8745fe3cb575 100644
--- a/drivers/crypto/caam/jr.c
+++ b/drivers/crypto/caam/jr.c
@@ -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


^ permalink raw reply related	[flat|nested] 16+ messages in thread
end of thread, other threads:[~2023-03-24 10:29 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-20 10:50 [PATCH] drivers: crypto: caam: jr: Allow quiesce when quiesced meenakshi.aggarwal
2023-02-21  5:40 ` [PATCH] drivers: crypto: caam: jr: add .shutdown hook meenakshi.aggarwal
2023-02-21 17:32   ` Vijay Balakrishna
2023-02-27  7:32     ` [EXT] " Pankaj Gupta
2023-03-01  5:39       ` Meenakshi Aggarwal
2023-03-10 10:33         ` Meenakshi Aggarwal
2023-03-10 10:53   ` Herbert Xu
2023-03-11  8:25   ` meenakshi.aggarwal
2023-03-16  6:07   ` [PATCH v2] " meenakshi.aggarwal
2023-03-24 10:29     ` Herbert Xu
2023-02-21  5:42 ` [PATCH] drivers: crypto: caam: jr: Allow quiesce when quiesced meenakshi.aggarwal
2023-02-21 17:33   ` Vijay Balakrishna
2023-02-27  7:32     ` [EXT] " Pankaj Gupta
2023-02-28 18:37   ` meenakshi.aggarwal
2023-03-10 10:34     ` Meenakshi Aggarwal
2023-03-10 11:32     ` Herbert Xu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox