Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d2ba6fa authored by David Woodhouse's avatar David Woodhouse Committed by Paul Mackerras
Browse files

[PATCH] powerpc: Fix i8259 cascade IRQ 



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: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent ead83717

arch/powerpc/sysdev/i8259.c

+3 −2
Original line number Diff line number Diff line
@@ -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);
@@ -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;

}