diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2006-10-25 13:22:27 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-10-25 13:49:22 +1000 |
| commit | f4d4c354bca18210296cc0a8f592c0cdb720bf20 (patch) | |
| tree | 9254e902c5a6aa3e9c5f74ec98845756ffc9d496 /arch/powerpc | |
| parent | f49196a5f53aa62a964b08ffa2c59699a0c8eb53 (diff) | |
| download | kernel-crypto-f4d4c354bca18210296cc0a8f592c0cdb720bf20.tar.gz kernel-crypto-f4d4c354bca18210296cc0a8f592c0cdb720bf20.tar.xz kernel-crypto-f4d4c354bca18210296cc0a8f592c0cdb720bf20.zip | |
[POWERPC] Fix CHRP platforms with only 8259
On CHRP platforms with only a 8259 controller, we should set the
default IRQ host to the 8259 driver's one for the IRQ probing
fallbacks to work in case the IRQ tree is incorrect (like on
Pegasos for example). Without this fix, we get a bunch of WARN_ON's
during boot.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/platforms/chrp/setup.c | 4 | ||||
| -rw-r--r-- | arch/powerpc/sysdev/i8259.c | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c index cae3d13229b..49b8dabcbc9 100644 --- a/arch/powerpc/platforms/chrp/setup.c +++ b/arch/powerpc/platforms/chrp/setup.c @@ -477,8 +477,10 @@ static void __init chrp_find_8259(void) " address, polling\n"); i8259_init(pic, chrp_int_ack); - if (ppc_md.get_irq == NULL) + if (ppc_md.get_irq == NULL) { ppc_md.get_irq = i8259_irq; + irq_set_default_host(i8259_get_host()); + } if (chrp_mpic != NULL) { cascade_irq = irq_of_parse_and_map(pic, 0); if (cascade_irq == NO_IRQ) diff --git a/arch/powerpc/sysdev/i8259.c b/arch/powerpc/sysdev/i8259.c index 0450265d73b..ad87adc975b 100644 --- a/arch/powerpc/sysdev/i8259.c +++ b/arch/powerpc/sysdev/i8259.c @@ -224,6 +224,11 @@ static struct irq_host_ops i8259_host_ops = { .xlate = i8259_host_xlate, }; +struct irq_host *i8259_get_host(void) +{ + return i8259_host; +} + /** * i8259_init - Initialize the legacy controller * @node: device node of the legacy PIC (can be NULL, but then, it will match |