Skip to contentSkip to conversation

powerpc: Fix i8259 interrupt driver kernel crash on ML510

PATCH In review Grant Likely 2 participants 2 messages Sep 3, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc: Fix i8259 interrupt driver kernel crash on ML510

From: Roderick Colenbrander <[email protected]>

This patch fixes a null pointer exception caused by removal of 'ack()' for level interrupts in the Xilinx interrupt driver. A recent change to the xilinx interrupt controller removed the ack hook for level irqs.

---

Hi Ben & Linus,

This is a last minute bug fix must go into 2.6.31. This patch is needed to prevent a kernel panic on Xilinx ml510 boards.

I've also pushed the patch out to my git tree if you'd prefer to pull:

The following changes since commit 326ba5010a5429a5a528b268b36a5900d4ab0eba:
Linus Torvalds (1):

        Linux 2.6.31-rc8

are available in the git repository at:

git://git.secretlab.ca/git/linux-2.6 merge

Roderick Colenbrander (1):
powerpc: Fix i8259 interrupt driver kernel crash on ML510

 arch/powerpc/sysdev/xilinx_intc.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
arch/powerpc/sysdev/xilinx_intc.c +0 -1
index 3ee1fd3..40edad5 100644
@@ -234,7 +234,6 @@ static void xilinx_i8259_cascade(unsigned int irq, struct irq_desc *desc)
 		generic_handle_irq(cascade_irq);
 
 	/* Let xilinx_intc end the interrupt */
-	desc->chip->ack(irq);
 	desc->chip->unmask(irq);
 }
 
Acked-by on v1 1/1
#1 lore raw
Quoted 10 lines · Grant Likely

From: Roderick Colenbrander <[email protected]>

This patch fixes a null pointer exception caused by removal of 'ack()' for level interrupts in the Xilinx interrupt driver. A recent change to the xilinx interrupt controller removed the ack hook for level irqs.

---

My git trees aren't at hand, so Linus feel free to merge that directly.

Cheers,
Ben.

Quoted 36 lines

Hi Ben & Linus,

This is a last minute bug fix must go into 2.6.31. This patch is needed to prevent a kernel panic on Xilinx ml510 boards.

I've also pushed the patch out to my git tree if you'd prefer to pull:

The following changes since commit 326ba5010a5429a5a528b268b36a5900d4ab0eba:
Linus Torvalds (1):

        Linux 2.6.31-rc8

are available in the git repository at:

git://git.secretlab.ca/git/linux-2.6 merge

Roderick Colenbrander (1):
powerpc: Fix i8259 interrupt driver kernel crash on ML510

 arch/powerpc/sysdev/xilinx_intc.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
arch/powerpc/sysdev/xilinx_intc.c +0 -1
index 3ee1fd3..40edad5 100644
@@ -234,7 +234,6 @@ static void xilinx_i8259_cascade(unsigned int irq, struct irq_desc *desc)
 		generic_handle_irq(cascade_irq);
 
 	/* Let xilinx_intc end the interrupt */
-	desc->chip->ack(irq);
 	desc->chip->unmask(irq);
 }