crypto: talitos - ack done interrupt in isr instead of tasklet

PATCH In review Lee Nipper 2 participants 2 messages Dec 18, 2008 – Dec 20, 2008 Crypto API

Share & tools

Lee Nipper

author

2008-12-18 18:34 UTC #0 lore raw

PATCH 1/1 crypto: talitos - ack done interrupt in isr instead of tasklet

Previous commit for interrupt mitigation moved the done interrupt acknowlegement from the isr to the talitos_done tasklet.
This patch moves the done interrupt acknowledgement back
into the isr so that done interrupts will always be acknowledged. This covers the case for acknowledging interrupts for channel done processing that has actually already been completed by the tasklet prior to fielding a pending interrupt.

Signed-off-by Lee Nipper <[email protected]>

Signed-off-by Kim Phillips <[email protected]>

---
This patch applies to
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git

 drivers/crypto/talitos.c |   20 +++++++-------------
 1 files changed, 7 insertions(+), 13 deletions(-)

drivers/crypto/talitos.c +5 ~~-11~~

index c2294f2..d14c68d 100644
@@ -330,11 +330,9 @@ static void flush_channel(struct device *dev, int ch, int error, int reset_ch)
 
 		/* descriptors with their done bits set don't get the error */
 		rmb();
-		if ((request->desc->hdr & DESC_HDR_DONE) == DESC_HDR_DONE) {
+		if ((request->desc->hdr & DESC_HDR_DONE) == DESC_HDR_DONE)
 			status = 0;
-			/* Ack each pkt completed on channel */
-			out_be32(priv->reg + TALITOS_ICR, (1 << (ch * 2)));
-		} else
+		else
 			if (!error)
 				break;
 			else

@@ -575,17 +573,13 @@ static irqreturn_t talitos_interrupt(int irq, void *data)
 
 	isr = in_be32(priv->reg + TALITOS_ISR);
 	isr_lo = in_be32(priv->reg + TALITOS_ISR_LO);
+	/* Acknowledge interrupt */
+	out_be32(priv->reg + TALITOS_ICR, isr);
+	out_be32(priv->reg + TALITOS_ICR_LO, isr_lo);
 
-	if (unlikely((isr & ~TALITOS_ISR_CHDONE) || isr_lo)) {
-		/*
-		 * Acknowledge error interrupts here.
-		 * Done interrupts are ack'ed as part of done_task.
-		 */
-		out_be32(priv->reg + TALITOS_ICR, isr);
-		out_be32(priv->reg + TALITOS_ICR_LO, isr_lo);

Herbert Xu

maintainer

2008-12-20 06:10 UTC #1 lore raw

Quoted 10 lines · Lee Nipper

Previous commit for interrupt mitigation moved the done interrupt acknowlegement from the isr to the talitos_done tasklet.
This patch moves the done interrupt acknowledgement back
into the isr so that done interrupts will always be acknowledged. This covers the case for acknowledging interrupts for channel done processing that has actually already been completed by the tasklet prior to fielding a pending interrupt.
Signed-off-by Lee Nipper <[email protected]>
Signed-off-by Kim Phillips <[email protected]>

Patch applied. Thanks Lee!

Signature · 4 lines

Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt