| Message ID | 20230221054219.2142012-1-meenakshi.aggarwal@nxp.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | drivers: crypto: caam: jr: Allow quiesce when quiesced | expand |
On 2/20/2023 9:42 PM, meenakshi.aggarwal@nxp.com wrote: > 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> Tested-by: Vijay Balakrishna <vijayb@linux.microsoft.com> Thanks, Vijay > --- > 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();
Change the year in the License header. After changing, you can add the reviewed by me. Reviewed-By: Pankaj Gupta <pankaj.gupta@nxp.com> > -----Original Message----- > From: Vijay Balakrishna <vijayb@linux.microsoft.com> > Sent: Tuesday, February 21, 2023 11:03 PM > 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; davem@davemloft.net; linux- > crypto@vger.kernel.org; linux-kernel@vger.kernel.org; Franck Lenormand > <franck.lenormand@nxp.com> > Cc: code@tyhicks.com > Subject: [EXT] Re: [PATCH] drivers: crypto: caam: jr: Allow quiesce when > quiesced > > Caution: EXT Email > > On 2/20/2023 9:42 PM, meenakshi.aggarwal@nxp.com wrote: > > 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> > > Tested-by: Vijay Balakrishna <vijayb@linux.microsoft.com> > > Thanks, > Vijay > > > > --- > > 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();
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();