Commit de3f5d9e authored Nov 02, 2020 by Sebastian Andrzej Siewior Committed by Jakub Kicinski Nov 03, 2020

crypto: caam: Replace in_irq() usage.



The driver uses in_irq() + in_serving_softirq() magic to decide if NAPI
scheduling is required or packet processing.

The usage of in_*() in drivers is phased out and Linus clearly requested
that code which changes behaviour depending on context should either be
separated or the context be conveyed in an argument passed by the caller,
which usually knows the context.

Use the `sched_napi' argument passed by the callback. It is set true if
called from the interrupt handler and NAPI should be scheduled.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Aymen Sghaier <aymen.sghaier@nxp.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Li Yang <leoyang.li@nxp.com>
Reviewed-by: Horia Geantă <horia.geanta@nxp.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: Madalin Bucur <madalin.bucur@oss.nxp.com>
Tested-by: Camelia Groza <camelia.groza@nxp.com>

parent abba4b16

drivers/crypto/caam/qi.c

+4 −8

Original line number	Diff line number	Diff line
		@@ -545,14 +545,10 @@ static void cgr_cb(struct qman_portal qm, struct qman_cgr cgr, int congested)
		}
		}

		static int caam_qi_napi_schedule(struct qman_portal p, struct caam_napi np)
		static int caam_qi_napi_schedule(struct qman_portal p, struct caam_napi np,
		bool sched_napi)
		{
		/*
		* In case of threaded ISR, for RT kernels in_irq() does not return
		* appropriate value, so use in_serving_softirq to distinguish between
		* softirq and irq contexts.
		*/
		if (unlikely(in_irq() \|\| !in_serving_softirq())) {
		if (sched_napi) {
		/* Disable QMan IRQ source and invoke NAPI */
		qman_p_irqsource_remove(p, QM_PIRQ_DQRI);
		np->p = p;
		@@ -574,7 +570,7 @@ static enum qman_cb_dqrr_result caam_rsp_fq_dqrr_cb(struct qman_portal *p,
		struct caam_drv_private *priv = dev_get_drvdata(qidev);
		u32 status;

		if (caam_qi_napi_schedule(p, caam_napi))
		if (caam_qi_napi_schedule(p, caam_napi, sched_napi))
		return qman_cb_dqrr_stop;

		fd = &dqrr->fd;

Admin message