From da2406db64afd2ce3f1ab04501e7f6353f499b59 Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Fri, 12 Aug 2011 16:06:28 +0000 Subject: [PATCH] wcte12xp, wctdm24xxp: Force local interrupts off in the interrupt handler. r10066 "wctdm24xxp, wcte12xp: Run the ISR with interrupts disabled." requested that the interrupt handler be run in "fast" mode (disabled) but this isn't necessarily guaranteed. This patch makes the interrupt handler itself disable all the interrupts. Linux commit 470c66239ef0336429b35345f3f615d47341e13b [1] contains a comment about why this is necessary. [1] http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=470c66239ef03364 (closes issue DAHLIN-248) Reported-and-Tested-by: Vladimir Mikhelson Signed-off-by: Shaun Ruffell Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=10118 git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.5@10119 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- drivers/dahdi/voicebus/voicebus.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/dahdi/voicebus/voicebus.c b/drivers/dahdi/voicebus/voicebus.c index 16f3466..d11559a 100644 --- a/drivers/dahdi/voicebus/voicebus.c +++ b/drivers/dahdi/voicebus/voicebus.c @@ -1683,6 +1683,7 @@ vb_isr(int irq, void *dev_id) #endif { struct voicebus *vb = dev_id; + unsigned long flags; u32 int_status; int_status = __vb_getctl(vb, SR_CSR5); @@ -1693,6 +1694,8 @@ vb_isr(int irq, void *dev_id) if (!int_status) return IRQ_NONE; + local_irq_save(flags); + if (unlikely((int_status & (TX_UNAVAILABLE_INTERRUPT|RX_UNAVAILABLE_INTERRUPT)) && !test_bit(VOICEBUS_STOP, &vb->flags) && @@ -1733,6 +1736,7 @@ vb_isr(int irq, void *dev_id) /* Clear the interrupt(s) */ __vb_setctl(vb, SR_CSR5, int_status); } + local_irq_restore(flags); return IRQ_HANDLED; } @@ -1881,7 +1885,7 @@ __voicebus_init(struct voicebus *vb, const char *board_name, goto cleanup; #if !defined(CONFIG_VOICEBUS_TIMER) - retval = request_irq(vb->pdev->irq, vb_isr, DAHDI_IRQ_SHARED_DISABLED, + retval = request_irq(vb->pdev->irq, vb_isr, DAHDI_IRQ_SHARED, board_name, vb); if (retval) { dev_warn(&vb->pdev->dev, "Failed to request interrupt line.\n");