Commit d488dfd9 authored by Andrey Smirnov's avatar Andrey Smirnov Committed by Herbert Xu
Browse files

crypto: caam - request JR IRQ as the last step 



In order to avoid any risk of JR IRQ request being handled while some
of the resources used for that are not yet allocated move the code
requesting said IRQ to the endo of caam_jr_init().

Signed-off-by: default avatarAndrey Smirnov <andrew.smirnov@gmail.com>
Cc: Chris Spencer <christopher.spencer@sea.co.uk>
Cc: Cory Tusar <cory.tusar@zii.aero>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Horia Geantă <horia.geanta@nxp.com>
Cc: Aymen Sghaier <aymen.sghaier@nxp.com>
Cc: Leonard Crestez <leonard.crestez@nxp.com>
Cc: linux-crypto@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent a6c4194e

drivers/crypto/caam/jr.c

+15 −19
Original line number Diff line number Diff line
@@ -428,38 +428,26 @@ static int caam_jr_init(struct device *dev) 


	jrp = dev_get_drvdata(dev);



	tasklet_init(&jrp->irqtask, caam_jr_dequeue, (unsigned long)dev);



	/* Connect job ring interrupt handler. */

	error = devm_request_irq(dev, jrp->irq, caam_jr_interrupt, IRQF_SHARED,

				 dev_name(dev), dev);

	if (error) {

		dev_err(dev, "can't connect JobR %d interrupt (%d)\n",

			jrp->ridx, jrp->irq);

		goto out_kill_deq;

	}



	error = caam_reset_hw_jr(dev);

	if (error)

		goto out_kill_deq;

		return error;



	error = -ENOMEM;

	jrp->inpring = dmam_alloc_coherent(dev, sizeof(*jrp->inpring) *

					   JOBR_DEPTH, &inpbusaddr,

					   GFP_KERNEL);

	if (!jrp->inpring)

		goto out_kill_deq;

		return -ENOMEM;



	jrp->outring = dmam_alloc_coherent(dev, sizeof(*jrp->outring) *

					   JOBR_DEPTH, &outbusaddr,

					   GFP_KERNEL);

	if (!jrp->outring)

		goto out_kill_deq;

		return -ENOMEM;



	jrp->entinfo = devm_kcalloc(dev, JOBR_DEPTH, sizeof(*jrp->entinfo),

				    GFP_KERNEL);

	if (!jrp->entinfo)

		goto out_kill_deq;

		return -ENOMEM;



	for (i = 0; i < JOBR_DEPTH; i++)

		jrp->entinfo[i].desc_addr_dma = !0;
@@ -483,9 +471,17 @@ static int caam_jr_init(struct device *dev) 
		      (JOBR_INTC_COUNT_THLD << JRCFG_ICDCT_SHIFT) |

		      (JOBR_INTC_TIME_THLD << JRCFG_ICTT_SHIFT));



	return 0;

out_kill_deq:

	tasklet_init(&jrp->irqtask, caam_jr_dequeue, (unsigned long)dev);



	/* Connect job ring interrupt handler. */

	error = devm_request_irq(dev, jrp->irq, caam_jr_interrupt, IRQF_SHARED,

				 dev_name(dev), dev);

	if (error) {

		dev_err(dev, "can't connect JobR %d interrupt (%d)\n",

			jrp->ridx, jrp->irq);

		tasklet_kill(&jrp->irqtask);

	}



	return error;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE