Skip to contentSkip to conversation

ipu_idmac: Use disable_irq_nosync() from within irq handlers.

PATCH Applied Ben Nizette 1 participant 1 message Apr 16, 2009 dmaengine

lore
Share & tools
lore
#0 lore raw

PATCH 1/9 ipu_idmac: Use disable_irq_nosync() from within irq handlers.

disable_irq() should wait for all running handlers to complete before returning. As such, if it's used to disable an interrupt from that interrupt's handler it will deadlock. This replaces the dangerous instances with the _nosync() variant which doesn't have this problem.

Note the 2 handlers in question are only used #ifdef DEBUG so I imagine these code paths don't get hit often.

---

drivers/dma/ipu/ipu_idmac.c +2 -2
index e202a6c..3a4deea 100644
@@ -1547,7 +1547,7 @@ static irqreturn_t ic_sof_irq(int irq, void *dev_id)
 	struct idmac_channel *ichan = dev_id;
 	printk(KERN_DEBUG "Got SOF IRQ %d on Channel %d\n",
 	       irq, ichan->dma_chan.chan_id);
-	disable_irq(irq);
+	disable_irq_nosync(irq);
 	return IRQ_HANDLED;
 }
 
@@ -1556,7 +1556,7 @@ static irqreturn_t ic_eof_irq(int irq, void *dev_id)
 	struct idmac_channel *ichan = dev_id;
 	printk(KERN_DEBUG "Got EOF IRQ %d on Channel %d\n",
 	       irq, ichan->dma_chan.chan_id);
-	disable_irq(irq);
+	disable_irq_nosync(irq);
 	return IRQ_HANDLED;
 }
 
Signature · 1 line
1.6.0.2