ChangeSet 1.2065.3.7, 2005/03/12 08:22:29-08:00, [EMAIL PROTECTED]
[PATCH] ppc64: Fix some PCI interrupt routing issues on iMac G5
The iMac G5 has some issues with Apple chips not having a valid
PCI_INTERRUPT_PIN. This patch fixes IRQ routing on PowerMac platforms
so
that it only relies on the Open Firmware informations which are correct.
Signed-off-by: Benjamin Herrenschmidt <[EMAIL PROTECTED]>
Signed-off-by: J. Mayer <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
pmac_pci.c | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletion(-)
diff -Nru a/arch/ppc64/kernel/pmac_pci.c b/arch/ppc64/kernel/pmac_pci.c
--- a/arch/ppc64/kernel/pmac_pci.c 2005-03-12 21:25:56 -08:00
+++ b/arch/ppc64/kernel/pmac_pci.c 2005-03-12 21:25:56 -08:00
@@ -656,13 +656,32 @@
return 0;
}
+/*
+ * We use our own read_irq_line here because PCI_INTERRUPT_PIN is
+ * crap on some of Apple ASICs. We unconditionally use the Open Firmware
+ * interrupt number as this is always right.
+ */
+static int pmac_pci_read_irq_line(struct pci_dev *pci_dev)
+{
+ struct device_node *node;
+
+ node = pci_device_to_OF_node(pci_dev);
+ if (node == NULL)
+ return -1;
+ if (node->n_intrs == 0)
+ return -1;
+ pci_dev->irq = node->intrs[0].line;
+ pci_write_config_byte(pci_dev, PCI_INTERRUPT_LINE, pci_dev->irq);
+
+ return 0;
+}
void __init pmac_pcibios_fixup(void)
{
struct pci_dev *dev = NULL;
for_each_pci_dev(dev)
- pci_read_irq_line(dev);
+ pmac_pci_read_irq_line(dev);
}
static void __init pmac_fixup_phb_resources(void)
@@ -771,3 +790,4 @@
}
}
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SERVERWORKS, 0x0240, fixup_k2_sata);
+
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
