Merge branch 'core/percpu' into stackprotector

[sfrench/cifs-2.6.git] / arch / mips / pci / fixup-sni.c

diff --git a/arch/mips/pci/fixup-sni.c b/arch/mips/pci/fixup-sni.c
index a176f2ca8656b1536db9f740c8de822d3340f265..5c8a79bb26613a23cdbffd6319d6d90d3dee59dc 100644 (file)
--- a/arch/mips/pci/fixup-sni.c
+++ b/arch/mips/pci/fixup-sni.c
@@ -14,8 +14,10 @@
 #include <asm/mipsregs.h>
 #include <asm/sni.h>
 
+#include <irq.h>
+
 /*
- * Shortcuts ...
+ * PCIMT Shortcuts ...
  */
 #define SCSI   PCIMT_IRQ_SCSI
 #define ETH    PCIMT_IRQ_ETHERNET
@@ -67,6 +69,60 @@ static char irq_tab_rm300d[8][5] __initdata = {
        {     0, INTD, INTA, INTB, INTC },      /* Slot 4 */
 };
 
+static char irq_tab_rm300e[5][5] __initdata = {
+       /*       INTA  INTB  INTC  INTD */
+       {     0,    0,    0,    0,    0 },      /* HOST bridge */
+       {  SCSI, SCSI, SCSI, SCSI, SCSI },      /* SCSI */
+       {     0, INTC, INTD, INTA, INTB },      /* Bridge/i960 */
+       {     0, INTD, INTA, INTB, INTC },      /* Slot 1 */
+       {     0, INTA, INTB, INTC, INTD },      /* Slot 2 */
+};
+#undef SCSI
+#undef ETH
+#undef INTA
+#undef INTB
+#undef INTC
+#undef INTD
+
+
+/*
+ * PCIT Shortcuts ...
+ */
+#define SCSI0  PCIT_IRQ_SCSI0
+#define SCSI1  PCIT_IRQ_SCSI1
+#define ETH    PCIT_IRQ_ETHERNET
+#define INTA   PCIT_IRQ_INTA
+#define INTB   PCIT_IRQ_INTB
+#define INTC   PCIT_IRQ_INTC
+#define INTD   PCIT_IRQ_INTD
+
+static char irq_tab_pcit[13][5] __initdata = {
+       /*       INTA  INTB  INTC  INTD */
+       {     0,     0,     0,     0,     0 },  /* HOST bridge */
+       { SCSI0, SCSI0, SCSI0, SCSI0, SCSI0 },  /* SCSI */
+       { SCSI1, SCSI1, SCSI1, SCSI1, SCSI1 },  /* SCSI */
+       {   ETH,   ETH,   ETH,   ETH,   ETH },  /* Ethernet */
+       {     0,  INTA,  INTB,  INTC,  INTD },  /* PCI-PCI bridge */
+       {     0,     0,     0,     0,     0 },  /* Unused */
+       {     0,     0,     0,     0,     0 },  /* Unused */
+       {     0,     0,     0,     0,     0 },  /* Unused */
+       {     0,  INTA,  INTB,  INTC,  INTD },  /* Slot 1 */
+       {     0,  INTB,  INTC,  INTD,  INTA },  /* Slot 2 */
+       {     0,  INTC,  INTD,  INTA,  INTB },  /* Slot 3 */
+       {     0,  INTD,  INTA,  INTB,  INTC },  /* Slot 4 */
+       {     0,  INTA,  INTB,  INTC,  INTD },  /* Slot 5 */
+};
+
+static char irq_tab_pcit_cplus[13][5] __initdata = {
+       /*       INTA  INTB  INTC  INTD */
+       {     0,     0,     0,     0,     0 },  /* HOST bridge */
+       {     0,  INTB,  INTC,  INTD,  INTA },  /* PCI Slot 9 */
+       {     0,     0,     0,     0,     0 },  /* PCI-EISA */
+       {     0,     0,     0,     0,     0 },  /* Unused */
+       {     0,  INTA,  INTB,  INTC,  INTD },  /* PCI-PCI bridge */
+       {     0,  INTB,  INTC,  INTD,  INTA },  /* fixup */
+};
+
 static inline int is_rm300_revd(void)
 {
        unsigned char csmsr = *(volatile unsigned char *)PCIMT_CSMSR;
@@ -74,12 +130,37 @@ static inline int is_rm300_revd(void)
        return (csmsr & 0xa0) == 0x20;
 }
 
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
-       if (is_rm300_revd())
-               return irq_tab_rm300d[slot][pin];
+       switch (sni_brd_type) {
+       case SNI_BRD_PCI_TOWER_CPLUS:
+               if (slot == 4) {
+                       /*
+                        * SNI messed up interrupt wiring for onboard
+                        * PCI bus 1; we need to fix this up here
+                        */
+                       while (dev && dev->bus->number != 1)
+                               dev = dev->bus->self;
+                       if (dev && dev->devfn >= PCI_DEVFN(4, 0))
+                               slot = 5;
+               }
+               return irq_tab_pcit_cplus[slot][pin];
+       case SNI_BRD_PCI_TOWER:
+               return irq_tab_pcit[slot][pin];
 
-       return irq_tab_rm200[slot][pin];
+       case SNI_BRD_PCI_MTOWER:
+               if (is_rm300_revd())
+                       return irq_tab_rm300d[slot][pin];
+               /* fall through */
+
+       case SNI_BRD_PCI_DESKTOP:
+               return irq_tab_rm200[slot][pin];
+
+       case SNI_BRD_PCI_MTOWER_CPLUS:
+               return irq_tab_rm300e[slot][pin];
+       }
+
+       return 0;
 }
 
 /* Do platform specific device initialization at pci_enable_device() time */