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:   Tue, 21 Feb 2023 11:12:19 +0530
Message-Id: <20230221054219.2142012-1-meenakshi.aggarwal@nxp.com>
In-Reply-To: <20230220105033.1449263-1-meenakshi.aggarwal@nxp.com>
References: <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?ZzNdzTvhUfVEOSuE4yTmtW51IqOnVqxvXAb6aI6hNfhl93E+IvLwkbxTzlol?=
 =?us-ascii?Q?UyWTKBBBEkLyYJoZdwApzhZXrlgw48nPZ2h33mn4hAGSjfBUTNN3fSOFO9Xb?=
 =?us-ascii?Q?vB/PSZ2sAZwS1ZhjbdcKkhooQbYY9Mss72gMMytDW7BW1NJcTbigpgcNG186?=
 =?us-ascii?Q?IQIqVEzC7KHLRek/U4FMamnE6h780EeEmusrLl+YRqhbaeTRcqejKSN2NmYX?=
 =?us-ascii?Q?iIWmPhFaduhJ5SfqidjFXOyl3WLiNOiBT/1wPVmIC6LUkctpurLJJiA4jSrz?=
 =?us-ascii?Q?IqG2PgnoECMDBqZHqRNMRgTPrW2WgDPonu3DxyyRaIK/Qm0EuEtvfqitxy8t?=
 =?us-ascii?Q?zsvYN8jFzav6srGeL9hMHSSy3NeJ20KNiLRH+Uxk8MBowAeEzeR2PQ+zQYSN?=
 =?us-ascii?Q?95EPjJYsDHFzS4fXVrKdKl7+Oo3RWr22n6V5lUiw8gVdvZ7Cbb2R27DsTrd3?=
 =?us-ascii?Q?UCBLn8AmzWopGYQzZX7LCQ2EEI3WKChqAup0qGJmc1wB33mfLQ1tGWf3pVp0?=
 =?us-ascii?Q?V4IGYCK3Ui6vaAKaQbSk8pElESqqQc2+MlKeNpS2h2J0zXu/12tN9hjIMNCr?=
 =?us-ascii?Q?8Qv3Zh4RMEozbLKLBIdMzZgQyTQUg8EpDwfbY5uQqqQ2pmomO2FaonOT3Esl?=
 =?us-ascii?Q?gNNb1kLHnk3yal7XgAO4HfIpzllIthkphzer66j6Z9qK4pI0yoNJxvjsLQMx?=
 =?us-ascii?Q?2QOZub3C7RW97aUXiqNRlOPMANf82skLDHegYFU+YEdQmZ8oKBtQMExNGGQU?=
 =?us-ascii?Q?l8ZaWdRAEfI++X6y0rI96elGqA2C1jQzi8OFygn6iTe6I+12xHsxhvJ2ahc8?=
 =?us-ascii?Q?ndO8RBbgl/8enn2eGkH+nx8kHgkIuonZZBkI57/BK36sruqOVticGf7+8sSn?=
 =?us-ascii?Q?FKwnK8tN8aIEBB3L6WLvANqnRwfhma5CmYGI86tZP/C0/OpYvTIJ5BKp8F0w?=
 =?us-ascii?Q?On/qEE6FSUcz0OnVH/ZjHJOEgPLb2OaSGH/zJeZ61nFN6TD1HqoEqRWDiwSg?=
 =?us-ascii?Q?abbR60//dNyJa3bOedV53pDVxRXDBfNYQ5YIRI4a6yUf1LqRcZQYURcABCDQ?=
 =?us-ascii?Q?f7kgkxZomTPXPPlxqqur1H0w3y8Rl75Nkqs8EDp2s4zJSEZccjkV9Fj7jzWs?=
 =?us-ascii?Q?CgAlSQMSDt6J66EI5aMMGTf+dnyNH/68w/27hyU6O3RsHxFo4oTweaR/Gu8j?=
 =?us-ascii?Q?3zemXD8TwjXbT0mvHKdtS6L+arUDRnV//djcrvTvhdELYzs386sE6y76mAS9?=
 =?us-ascii?Q?9EWm+aYHgJwT7X9THYp376/TFEVY+IYRm20igzzLzMWqxbfOTYKBd8f9KnHI?=
 =?us-ascii?Q?HbYTyB2risyEPtTPjqc/7v3OXXvUe46vjeIG24zm9ls2OwojU+g2MVTmKvBF?=
 =?us-ascii?Q?sVK6zvq2HICYhReiQoc+a3oe16JdgN/rB+N/vxbIG0EibJsF1SVbUJvKAkfv?=
 =?us-ascii?Q?oeUlIhUADxgaDuuVKGggBagrP3Dy3+r3swypw+5W9Ncp9v63a8Ss9F/C+geD?=
 =?us-ascii?Q?GvBv2qQAvHK3ich4VTegTBkWJIc/OKCF7kMfszIB3enpFq/jadipWK4n/xc9?=
 =?us-ascii?Q?VJIVf5UeWzPLgrvEH4QEYlWLV6ajFcyA8Cda7KHG6Zkmu+PQN51ss5wa6JYp?=
 =?us-ascii?Q?qA=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ed3689e2-60c4-49fa-590e-08db13ce73b2
X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9563.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Feb 2023 05:42:42.9721
 (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: lgagWgsk09e5Q763S4/0J4Tuh8Fv1DiBYW1fdWNr2VkApbfc+7qGxTNg5R7alwNbrfSlCvABYfOvYvGYIc7CdW5zh6WnXZT7W9fQmG0lAVs=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8577
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@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