From:   Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
To:     Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>,
        Horia Geanta <horia.geanta@nxp.com>,
        Varun Sethi <V.Sethi@nxp.com>,
        Pankaj Gupta <pankaj.gupta@nxp.com>,
        Gaurav Jain <gaurav.jain@nxp.com>,
        "herbert@gondor.apana.org.au" <herbert@gondor.apana.org.au>,
        "davem@davemloft.net" <davem@davemloft.net>,
        "linux-crypto@vger.kernel.org" <linux-crypto@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Franck Lenormand <franck.lenormand@nxp.com>
CC:     "vijayb@linux.microsoft.com" <vijayb@linux.microsoft.com>,
        "code@tyhicks.com" <code@tyhicks.com>
Subject: RE: [PATCH] drivers: crypto: caam: jr: Allow quiesce when quiesced
Thread-Topic: [PATCH] drivers: crypto: caam: jr: Allow quiesce when quiesced
Thread-Index: AQHZRRk16ZVto6KADUOju2c7+0vbz67Y5FOAgAvZCQCADy/xQA==
Date:   Fri, 10 Mar 2023 10:34:04 +0000
Message-ID: <DU0PR04MB9563FCF2A6B794584D9757BD8EBA9@DU0PR04MB9563.eurprd04.prod.outlook.com>
References: <20230221054219.2142012-1-meenakshi.aggarwal@nxp.com>
 <20230228183758.448396-1-meenakshi.aggarwal@nxp.com>
In-Reply-To: <20230228183758.448396-1-meenakshi.aggarwal@nxp.com>
Accept-Language: en-GB, en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?OUT35XDv5Fhqel0DNUhYObFbi6xFXiC6H2LVS4R7tDUmVfmGcP/fKrrPQ9jT?=
 =?us-ascii?Q?zImSWeTdPnFKP9nOzn4IH2/CN44Rl32/85UJnDsb9hVAWRDIC2vdQaonBO4Y?=
 =?us-ascii?Q?rmLJ5qHnweXTXHj17mKUgxmU26KAh6pjf1sOHHnztQW8BOfEGUYhM+1er/8a?=
 =?us-ascii?Q?CnFx8v4FtP27drrQa/q7Z0wCWLKptMv8AAnsRiGufsxLQas4AXMsUO/k55o0?=
 =?us-ascii?Q?3FRdVV4vy1rCdTkhx3OFw38+x0SdHuzJUr/LSKlIF0KCvTnDMuVnQThnMKCJ?=
 =?us-ascii?Q?cOiYxGoOci+UbkNFpXF3Xi5sslzXQx/uKRXmFgkkfzQCxHZeiLzK1wDVU21l?=
 =?us-ascii?Q?Y/unNRdWF/0ddTlqDBDnAATGlEfmHW7Fti4NZdN8uARLUpsTMpeMyhOUA42b?=
 =?us-ascii?Q?L9GuWuN6fZYGN2af0fu6VBtC7CkloGJlDSPAb10VzxgAflZ26vdUEL+yJ7Wd?=
 =?us-ascii?Q?qMtw/uB+P3YMTdcafBoyFhiIfpB+gCMbULr3QGjtzMKjWoe6NtPj1C8VB1Fp?=
 =?us-ascii?Q?xTJ4LbVcsoYhvrtem6o52J3GPYsnFXqNARGmfaAnKrNgZLycMX8lblG+2LtY?=
 =?us-ascii?Q?ZvhRoXSUXExYNfCgo3rGa36ZpW/erR1YggxnzEMDwjOLl92yq2y4jFNaZiTS?=
 =?us-ascii?Q?106d7UAxngYCP/sA0BAm0uKMvZqlYhMRZefQkqqf178KUaQnJVUymN+UFxqF?=
 =?us-ascii?Q?tblMJm11KYehVg3gRro71eOI7SeyULi8TJMK3Rd16GPuMtjsH2csPMuCTdm/?=
 =?us-ascii?Q?K9QzNh4HFoMIjzjcTy1ofDMqsYbaXSmU65gK0BXfyWXJ7aH6zeHa+O/Kbbrt?=
 =?us-ascii?Q?/Wn3GX6ujblV7GP6/ASeW7kF1hiivIY8PZp9cxNeFq0nghmy2498TMb/ynAp?=
 =?us-ascii?Q?B2io0QfRbwRhtJoVPyLo7oXS1rR46KMl8ridsp0lMlmmU40x/UVgBVeCSvU9?=
 =?us-ascii?Q?xhhr0mJYsTM9wYOZc9ssPatrOnhgIQ+4QX43vNMKhYXBMk9SSK9deHGMUb/B?=
 =?us-ascii?Q?rgJ70KId6MQ/nkKXy0XfnxjCPwST5y9d7yPVZOq+LBM9H/7NK/sRX7PwzCqL?=
 =?us-ascii?Q?QefRwFwOgo0iSAZXuCXgqoqjmDMknFhLiE8mE8KaVW2UIW5XG4rRzDawFB6p?=
 =?us-ascii?Q?/5IBHgplopB+MGPNp8xSOdusq0NlUgEzkpD8Sq729EyL7Oc1FG0joOpF5jWm?=
 =?us-ascii?Q?ZCv4OVqABePzk0zA2IbuBPeI79FfFetAcMWr8E1dFVzoQriYHERnxsZEDilO?=
 =?us-ascii?Q?Uhcqu0VDArQRVWnfWsdO/4S2aSyYqzIEGJC1d/87AeH7ZvvRrhnKZkqrzDpa?=
 =?us-ascii?Q?OkK05flvuCMPENAAm9vZ+fvMCh8r+Pr8cMesb6WO4Bi3O0pu2NlwqS5naCiH?=
 =?us-ascii?Q?ggC5dxB2ITL3NbmSTLumtipVdSy4dNVaripQxefsVpi2jLjXpaNqIwIPFo4Q?=
 =?us-ascii?Q?p/2jaSl6d7sRZc3c+Sur4hzKFxVcoGg0m+CpZGemYUbOccphKwWTOCpB+9XY?=
 =?us-ascii?Q?kx2Gh/sxRwBpew3xv7Tkr6dqylXzNR2s9qzuFL89jvtmJeSQYn4VmS4de6Ie?=
 =?us-ascii?Q?XRmfbRm2zdUzGm2NJJpbOo25DHIvuNRdYWdjKUSdH5p5R7ZpsDOpiwM5GYRG?=
 =?us-ascii?Q?uQ=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9563.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7f39aaf0-c225-464e-39c7-08db2152f8e7
X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Mar 2023 10:34:04.9370
 (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: DLxevxs/6lOuKld1vqcye2qvqkKGa4gJY7TmvYtIa8RqruYAuF99W05kjb9Qi9t5rXgmP+lu81mnwT2Gbpx8FiDoZ3K9fIX/Hi4Sadye5Uo=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9991
Precedence: bulk
List-ID: <linux-crypto.vger.kernel.org>
X-Mailing-List: linux-crypto@vger.kernel.org

Hi Herbert,

Please apply the patch if you have no comments.

Thanks,
Meenakshi

> -----Original Message-----
> From: meenakshi.aggarwal@nxp.com <meenakshi.aggarwal@nxp.com>
> Sent: Wednesday, March 1, 2023 12:08 AM
> To: Horia Geanta <horia.geanta@nxp.com>; Varun Sethi <V.Sethi@nxp.com>;
> Pankaj Gupta <pankaj.gupta@nxp.com>; Gaurav Jain <gaurav.jain@nxp.com>;
> herbert@gondor.apana.org.au; davem@davemloft.net; linux-
> crypto@vger.kernel.org; linux-kernel@vger.kernel.org; Franck Lenormand
> <franck.lenormand@nxp.com>
> Cc: vijayb@linux.microsoft.com; code@tyhicks.com
> Subject: [PATCH] drivers: crypto: caam: jr: Allow quiesce when quiesced
>=20
> From: Horia Geanta <horia.geanta@nxp.com>
>=20
> Issues:
> - Job ring device is busy when do kexec reboot
> - Failed to flush job ring when do system suspend-resume
>=20
> Fix:
> Flush the job ring to stop the running jobs.
>=20
> 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(-)
>=20
> 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
>   */
>=20
>  #include <linux/of_irq.h>
> @@ -72,19 +72,27 @@ static void caam_jr_crypto_engine_exit(void *data)
>  	crypto_engine_exit(jrpriv->engine);
>  }
>=20
> -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 =3D dev_get_drvdata(dev);
>  	unsigned int timeout =3D 100000;
>=20
> -	/*
> -	 * 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;
>=20
> -	/* 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)
> =3D=3D
>  		JRINT_ERR_HALT_INPROGRESS) && --timeout)
>  		cpu_relax();
> @@ -95,8 +103,35 @@ static int caam_reset_hw_jr(struct device *dev)
>  		return -EIO;
>  	}
>=20
> +	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 =3D dev_get_drvdata(dev);
> +	unsigned int timeout =3D 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 =3D caam_jr_flush(dev);
> +	if (err)
> +		return err;
> +
>  	/* initiate reset */
> -	timeout =3D 100000;
>  	wr_reg32(&jrp->rregs->jrcommand, JRCR_RESET);
>  	while ((rd_reg32(&jrp->rregs->jrcommand) & JRCR_RESET) && --timeout)
>  		cpu_relax();
> --
> 2.25.1