diff options
| author | Adhemerval Zanella <azanella@linux.vnet.ibm.com> | 2008-11-19 04:55:35 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-11-30 23:40:18 +0100 |
| commit | 4b824de9b18b8d1013e9fc9e4b0f855ced8cac2c (patch) | |
| tree | 8f09d7d8d9dd534e2987146fe39ec49537bf1a39 | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jk/spuf... (diff) | |
| download | linux-4b824de9b18b8d1013e9fc9e4b0f855ced8cac2c.tar.xz linux-4b824de9b18b8d1013e9fc9e4b0f855ced8cac2c.zip | |
powerpc: Fix IRQ assignment for some PCIe devices
Currently, some PCIe devices on POWER6 machines do not get interrupts
assigned correctly. The problem is that OF doesn't create an
"interrupt" property for them. The fix is for of_irq_map_pci to fall
back to using the value in the PCI interrupt-pin register in config
space, as we do when there is no OF device-tree node for the device.
I have verified that this works fine with a pair of Squib-E SAS
adapter on a P6-570.
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/powerpc/kernel/prom_parse.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c index bc1fb27368af..a11d68976dc8 100644 --- a/arch/powerpc/kernel/prom_parse.c +++ b/arch/powerpc/kernel/prom_parse.c @@ -250,8 +250,11 @@ int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq) * parsing */ dn = pci_device_to_OF_node(pdev); - if (dn) - return of_irq_map_one(dn, 0, out_irq); + if (dn) { + rc = of_irq_map_one(dn, 0, out_irq); + if (!rc) + return rc; + } /* Ok, we don't, time to have fun. Let's start by building up an * interrupt spec. we assume #interrupt-cells is 1, which is standard |