Skip to content

Commit

Permalink
[PATCH] powerpc: Fix i8259 cascade IRQ
Browse files Browse the repository at this point in the history
setup_irq() aborts immediately if there's no handler for the IRQ in
question. So i8259_init() should set up its handlers before trying to
set up the cascade on IRQ 2.

With this and the patch I sent a few days ago to fix initrd on ppc32, my
Pegasos now runs the arch/powerpc kernel.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
David Woodhouse authored and Paul Mackerras committed Nov 7, 2005
1 parent ead8371 commit 9d2ba6f
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions arch/powerpc/sysdev/i8259.c
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,9 @@ void __init i8259_init(unsigned long intack_addr, int offset)

spin_unlock_irqrestore(&i8259_lock, flags);

for (i = 0; i < NUM_ISA_INTERRUPTS; ++i)
irq_desc[offset + i].handler = &i8259_pic;

/* reserve our resources */
setup_irq(offset + 2, &i8259_irqaction);
request_resource(&ioport_resource, &pic1_iores);
Expand All @@ -216,6 +219,4 @@ void __init i8259_init(unsigned long intack_addr, int offset)
if (intack_addr != 0)
pci_intack = ioremap(intack_addr, 1);

for (i = 0; i < NUM_ISA_INTERRUPTS; ++i)
irq_desc[offset + i].handler = &i8259_pic;
}

0 comments on commit 9d2ba6f

Please sign in to comment.