From: Rosen Penev <rosenp@gmail.com>
To: linux-crypto@vger.kernel.org
Cc: Christian Marangi <ansuelsmth@gmail.com>,
Antoine Tenart <atenart@kernel.org>,
Herbert Xu <herbert@gondor.apana.org.au>,
"David S. Miller" <davem@davemloft.net>,
Richard van Schagen <vschagen@icloud.com>,
linux-kernel@vger.kernel.org (open list)
Subject: [PATCHv2] crypto: eip93 - fix IRQ teardown ordering in remove path
Date: Mon, 21 Sep 2026 16:11:21 -0700 [thread overview]
Message-ID: <20260921231121.63342-1-rosenp@gmail.com> (raw)
Replace the devm-managed threaded IRQ with request_irq() so free_irq()
can run in eip93_cleanup() instead of after the remove callback has
returned. Register the IRQ only after tasklet_init() and the ring
locks are set up, so the handler can never schedule an uninitialized
tasklet.
The original probe requested the IRQ before eip93_desc_init() and
tasklet_init(), and eip93_cleanup() killed the tasklet before masking
the device interrupts. An IRQ arriving in either window could schedule
a tasklet that was not yet initialized or had already been killed.
Reorder eip93_cleanup() to:
1. mask and clear the device interrupts
2. free_irq(), which synchronizes and removes the handler
3. tasklet_kill(), which drains anything scheduled before the mask
The tasklet re-enables the EIP93_INT_RDR_THRESH interrupt as its last
action once the result ring is drained, so mask the device interrupts a
second time after tasklet_kill() to keep the hardware quiet while it is
powered off.
The driver implements ONESHOT semantics itself: the hardirq handler
masks the interrupt source before scheduling the tasklet. Use
request_irq() so the line is unmasked for the tasklet and the
IRQF_ONESHOT WARN_ON_ONCE is avoided.
Add an err_free_tasklet path in probe so a request_irq() failure
releases the tasklet and descriptor resources instead of leaking them.
Fixes: 9739f5f93b78 ("crypto: eip93 - Add Inside Secure SafeXcel EIP-93 crypto engine support")
Assisted-by: LLM
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
v2: extra clear/disable in _remove.
.../crypto/inside-secure/eip93/eip93-main.c | 31 ++++++++++++++-----
1 file changed, 24 insertions(+), 7 deletions(-)
diff --git a/drivers/crypto/inside-secure/eip93/eip93-main.c b/drivers/crypto/inside-secure/eip93/eip93-main.c
index e62785952b0d..cc504590fd0f 100644
--- a/drivers/crypto/inside-secure/eip93/eip93-main.c
+++ b/drivers/crypto/inside-secure/eip93/eip93-main.c
@@ -395,9 +395,21 @@ static int eip93_desc_init(struct eip93_device *eip93)
static void eip93_cleanup(struct eip93_device *eip93)
{
+ /* Stop HW from asserting IRQ first */
+ eip93_irq_clear(eip93, EIP93_INT_ALL);
+ eip93_irq_disable(eip93, EIP93_INT_ALL);
+
+ /* Synchronize and unregister the IRQ handler */
+ free_irq(eip93->irq, eip93);
+
+ /* Drain any tasklet scheduled before the IRQ was disabled */
tasklet_kill(&eip93->ring->done_task);
- /* Clear/ack all interrupts before disable all */
+ /*
+ * The tasklet re-enables the RDR interrupt when it drains the
+ * result ring, so mask the device interrupts again before the
+ * hardware is switched off.
+ */
eip93_irq_clear(eip93, EIP93_INT_ALL);
eip93_irq_disable(eip93, EIP93_INT_ALL);
@@ -430,12 +442,6 @@ static int eip93_crypto_probe(struct platform_device *pdev)
if (eip93->irq < 0)
return eip93->irq;
- ret = devm_request_threaded_irq(eip93->dev, eip93->irq, eip93_irq_handler,
- NULL, IRQF_ONESHOT,
- dev_name(eip93->dev), eip93);
- if (ret)
- return ret;
-
ret = eip93_desc_init(eip93);
if (ret)
return ret;
@@ -448,6 +454,11 @@ static int eip93_crypto_probe(struct platform_device *pdev)
spin_lock_init(&eip93->ring->idr_lock);
idr_init(&eip93->ring->crypto_async_idr);
+ ret = request_irq(eip93->irq, eip93_irq_handler, 0,
+ dev_name(eip93->dev), eip93);
+ if (ret)
+ goto err_free_tasklet;
+
algo_flags = readl(eip93->base + EIP93_REG_PE_OPTION_1);
eip93_initialize(eip93, algo_flags);
@@ -472,6 +483,12 @@ static int eip93_crypto_probe(struct platform_device *pdev)
readl(eip93->base + EIP93_REG_PE_OPTION_0));
return 0;
+
+err_free_tasklet:
+ idr_destroy(&eip93->ring->crypto_async_idr);
+ tasklet_kill(&eip93->ring->done_task);
+ eip93_desc_free(eip93);
+ return ret;
}
static void eip93_crypto_remove(struct platform_device *pdev)
--
2.55.0
next reply other threads:[~2026-09-21 23:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-21 23:11 Rosen Penev [this message]
2026-10-02 7:02 ` Herbert Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260921231121.63342-1-rosenp@gmail.com \
--to=rosenp@gmail.com \
--cc=ansuelsmth@gmail.com \
--cc=atenart@kernel.org \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=vschagen@icloud.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®