diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2006-11-11 01:24:51 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-12-04 00:00:04 -0500 |
commit | f90bb153b1493719d18b4529a46ebfe43220ea6c (patch) | |
tree | 0d19d85be3f9603b9b3c5dc16aa45185ce8f9bc1 /arch/powerpc/platforms/82xx | |
parent | 34ba8a5cd0b0d57f7775023e6e3fec473a7291cc (diff) |
[POWERPC] Make pci_read_irq_line the default
This patch reworks the way IRQs are fixed up on PCI for arch powerpc.
It makes pci_read_irq_line() called by default in the PCI code for
devices that are probed, and add an optional per-device fixup in
ppc_md for platforms that really need to correct what they obtain
from pci_read_irq_line().
It also removes ppc_md.irq_bus_setup which was only used by pSeries
and should not be needed anymore.
I've also removed the pSeries s7a workaround as it can't work with
the current interrupt code anyway. I'm trying to get one of these
machines working so I can test a proper fix for that problem.
I also haven't updated the old-style fixup code from 85xx_cds.c
because it's actually buggy :) It assigns pci_dev->irq hard coded
numbers which is no good with the new IRQ mapping code. It should
at least use irq_create_mapping(NULL, hard_coded_number); and possibly
also set_irq_type() to set them as level low.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/82xx')
-rw-r--r-- | arch/powerpc/platforms/82xx/mpc82xx_ads.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/powerpc/platforms/82xx/mpc82xx_ads.c b/arch/powerpc/platforms/82xx/mpc82xx_ads.c index bb9acbb98176..ea880f1f0dcd 100644 --- a/arch/powerpc/platforms/82xx/mpc82xx_ads.c +++ b/arch/powerpc/platforms/82xx/mpc82xx_ads.c | |||
@@ -515,16 +515,6 @@ static int m82xx_pci_exclude_device(u_char bus, u_char devfn) | |||
515 | return PCIBIOS_SUCCESSFUL; | 515 | return PCIBIOS_SUCCESSFUL; |
516 | } | 516 | } |
517 | 517 | ||
518 | static void | ||
519 | __init mpc82xx_pcibios_fixup(void) | ||
520 | { | ||
521 | struct pci_dev *dev = NULL; | ||
522 | |||
523 | for_each_pci_dev(dev) { | ||
524 | pci_read_irq_line(dev); | ||
525 | } | ||
526 | } | ||
527 | |||
528 | void __init add_bridge(struct device_node *np) | 518 | void __init add_bridge(struct device_node *np) |
529 | { | 519 | { |
530 | int len; | 520 | int len; |
@@ -597,9 +587,6 @@ static void __init mpc82xx_ads_setup_arch(void) | |||
597 | add_bridge(np); | 587 | add_bridge(np); |
598 | 588 | ||
599 | of_node_put(np); | 589 | of_node_put(np); |
600 | ppc_md.pci_map_irq = NULL; | ||
601 | ppc_md.pcibios_fixup = mpc82xx_pcibios_fixup; | ||
602 | ppc_md.pcibios_fixup_bus = NULL; | ||
603 | #endif | 590 | #endif |
604 | 591 | ||
605 | #ifdef CONFIG_ROOT_NFS | 592 | #ifdef CONFIG_ROOT_NFS |