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, VIJAY.BALAKRISHNA@microsoft.com,
        Tyler.Hicks@microsoft.com, linux-crypto@vger.kernel.org,
        linux-kernel@vger.kernel.org, franck.lenormand@nxp.com
Cc:     linux-imx@nxp.com
Subject: [PATCH] drivers: crypto: caam: jr: Allow quiesce when quiesced
Date:   Mon, 20 Feb 2023 16:20:33 +0530
Message-Id: <20230220105033.1449263-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?sM5B0IeiLDAEDd6Oebp/csI9Qb9OLrUMzaafbrTHoW4G/P2Tj34u1m+K/avi?=
 =?us-ascii?Q?IzkIa+1auyzeWKL6DM1mVLnUUE8L9uIM45luzL0BXHeLENemiZPs/oUzzmvl?=
 =?us-ascii?Q?FbH/3Gz3TlZicQgu4QYoSdtUn4zxNewTZbR7YG+02xHOMNILDs8Rsri25sDI?=
 =?us-ascii?Q?TY8q5LSHmYVA8MzjNgaQHE20aiQaH9GmAxVpQDWfCKgp1LMMlqB2RZWoUQve?=
 =?us-ascii?Q?psnYi3tSzSFs0ckvlFNaUcUYBHbHY6kaLDSKyUCTiGkPYcKCD4TeXOkEbo+U?=
 =?us-ascii?Q?byuHBGv415Tql2OBDxTMWMCH6NtWAJJ+4CsgzAU5DrL0GuaxGRm0blvgEjYe?=
 =?us-ascii?Q?DJ5lOXznAxEfTgK3B7pn0hmMYGUVvIFtpBWHLLSnAzzpxOINq4/FPPsYLHja?=
 =?us-ascii?Q?M5tCQzZ0R0ZKsE7njdIfGeQIcR2lKUr0X5V0ye2eN+TaN4UMaYOv7E9RpWht?=
 =?us-ascii?Q?dkp3crMkiXDkWAdcR28AsKgn4Ruw2VyATTzoa29Lld5xVeXFw9xCtqwSZ5HR?=
 =?us-ascii?Q?LLP9iyLDu9Se5VP3dOtwks0YuMv39m70NWlzh4K4yY4ovUGJBQNOQo8LCnTk?=
 =?us-ascii?Q?Gmtg5h45ZmzlzJY8M/zhIazRDJjbakRkKucRkIkd+yThajjEAGiTNoSn3699?=
 =?us-ascii?Q?UPnpN7BPyC2JFAlACylpKVjN6/z19uTGnkUsEc5LYAQJZftRA9XJCj6N1bid?=
 =?us-ascii?Q?35BRyb8giDQzXmFhgvA7ZEQEtCVlgz5BHVanPMg4/c2fc09hemGweDoHn5xl?=
 =?us-ascii?Q?TkEOwAMvtvY52EnZmrVI8THf0CVikUsWIypLLLOoDNLsZpn5ALG3duwy39t+?=
 =?us-ascii?Q?5U/KUnU9Gh/nlC4XWUO9D09ktn6wenOTHPmHWOwZ15kXqD2XIUPV8EkjuR7+?=
 =?us-ascii?Q?555ImgENsBTkEdBSBRzn/gNvS/0/T3hE5fo/cxDQ6sY+ZlXveBQ5F8w3OS5A?=
 =?us-ascii?Q?8LXxMIidNM+t25wfcx1WyNy5IjxoguNzMUlNkkxR7tgK7S58KO4rJ5ZssSCy?=
 =?us-ascii?Q?npP16htWhNWa8pjIwlo1ILwgvsU2mv4d9Qmo94gws0p1T1YShaoYZxtKaamH?=
 =?us-ascii?Q?/7rY5fGhNyQIAPhkgko2VRaut0LArf+8Nh3BVz6weR1NFnhlLH7qTJoHTvbw?=
 =?us-ascii?Q?I05DKzRQYMyDEPSKqpWuRKhO7ryGLF7Grr263FzTrqZOWr3qXBmz3dTslcZ6?=
 =?us-ascii?Q?kvlFtJYz4xmJq54zUpZVN5PoYaxLPd3T33TsnldJ+v4VQqEqg2PzlJo9Rv9B?=
 =?us-ascii?Q?uUdmQxSk0bAtbgELN2qym/JHpMbFi0wog15+Q0ooqhc45ofPJ6/LofIidkXr?=
 =?us-ascii?Q?7PaKm8R5hSwt/zY03bFmsbhatuGAnqBb0tpmZgkeVLvh7+XkZthSZpW3PgD0?=
 =?us-ascii?Q?n+tZdU3ADDrWbL3VvCQG8ptFIYBfnvez6aTpEyZA/3OW7BgnweEtaoojoya6?=
 =?us-ascii?Q?Tfg+/+7TLqwaK83aPKtlKGAN5B/m6UCXLxWYP0alw1ExkwlAlAIuYnmOoHh0?=
 =?us-ascii?Q?cBLWW4s1ORgN1BBEPN6A84mGTcqkv1HmzcdHpr4FEz8gZbeWvaZoZ/noGmeC?=
 =?us-ascii?Q?81A/L6u8Fd5NJHs4YBZ07ozkwSxc9/UhSGMhfp1/4uFMZ9O6GWseQvFj3Xon?=
 =?us-ascii?Q?8Q=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e1872c03-5f35-4c03-c660-08db133057ac
X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9563.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2023 10:50:55.5386
 (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: q64uDiRde/Ker9iqo9Hw1THHM0I7Qo9MmD0ooLM7xB6tCvOhmywLRrlM+Tfb708dKYoP7FDQ1hNtfj4aII3tA88w32yoDVAijpV4vBaFOTM=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7203
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>
---
 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