[POWERPC] Fix interrupt routing and setup of ULI M1575 on FSL boards

The interrupt routing in the device trees for the ULI M1575 was
inproperly using the interrupt line field as pci function.  Fixed
up the device tree's to actual conform for to specification and
changed the interrupt mapping code so it just uses a static mapping
setup as follows:

PIRQA - IRQ9
PIRQB - IRQ10
PIRQC - IRQ11
PIRQD - IRQ12
USB 1.1 OCHI (1c.0) - IRQ12
USB 1.1 OCHI (1c.1) - IRQ9
USB 1.1 OCHI (1c.2) - IRQ10
USB 1.1 ECHI (1c.3) - IRQ11
LAN (1b.0) - IRQ6
AC97 (1d.0) - IRQ6
Modem (1d.1) - IRQ6
HD Audio (1d.2) - IRQ6
SATA (1f.1) - IRQ5
SMB (1e.1) - IRQ7
PMU (1e.2) - IRQ7
PATA (1f.0) - IRQ14/15

Took the oppurtunity to refactor the code into a single file so we
don't have to duplicate these fixes on the two current boards in the
tree and several forth coming boards that will also need the code.

Fixed RTC support that requires a dummy memory read on the P2P bridge
to unlock the RTC and setup the default of the RTC alarm registers to
match with a basic x86 style CMOS RTC.

Moved code that poked ISA registers to a FIXUP_FINAL quirk to ensure
the PCI IO space has been setup properly before we start poking ISA
registers at random locations.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

2 files changed, 17 insertions, 208 deletions

diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig
index 343b76d0d793..685b2fbbbe00 100644
--- a/arch/powerpc/platforms/86xx/Kconfig
+++ b/arch/powerpc/platforms/86xx/Kconfig
@@ -7,6 +7,7 @@ config MPC8641_HPCN
         bool "Freescale MPC8641 HPCN"
         select PPC_I8259
         select DEFAULT_UIMAGE
+        select FSL_ULI1575
         help
           This option enables support for the MPC8641 HPCN board.
 
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index e9eaa0749ae6..56b27caf7a27 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -107,220 +107,25 @@ mpc86xx_hpcn_init_irq(void)
 }
 
 #ifdef CONFIG_PCI
+extern int uses_fsl_uli_m1575;
+extern int uli_exclude_device(struct pci_controller *hose,
+                                u_char bus, u_char devfn);
 
-enum pirq{PIRQA = 8, PIRQB, PIRQC, PIRQD, PIRQE, PIRQF, PIRQG, PIRQH};
-const unsigned char uli1575_irq_route_table[16] = {
-        0,      /* 0: Reserved */
-        0x8,    /* 1: 0b1000 */
-        0,      /* 2: Reserved */
-        0x2,    /* 3: 0b0010 */
-        0x4,    /* 4: 0b0100 */
-        0x5,    /* 5: 0b0101 */
-        0x7,    /* 6: 0b0111 */
-        0x6,    /* 7: 0b0110 */
-        0,      /* 8: Reserved */
-        0x1,    /* 9: 0b0001 */
-        0x3,    /* 10: 0b0011 */
-        0x9,    /* 11: 0b1001 */
-        0xb,    /* 12: 0b1011 */
-        0,      /* 13: Reserved */
-        0xd,    /* 14, 0b1101 */
-        0xf,    /* 15, 0b1111 */
-};
-
-static int __devinit
-get_pci_irq_from_of(struct pci_controller *hose, int slot, int pin)
-{
-        struct of_irq oirq;
-        u32 laddr[3];
-        struct device_node *hosenode = hose ? hose->arch_data : NULL;
-
-        if (!hosenode) return -EINVAL;
-
-        laddr[0] = (hose->first_busno << 16) | (PCI_DEVFN(slot, 0) << 8);
-        laddr[1] = laddr[2] = 0;
-        of_irq_map_raw(hosenode, &pin, 1, laddr, &oirq);
-        DBG("mpc86xx_hpcn: pci irq addr %x, slot %d, pin %d, irq %d\n",
-                        laddr[0], slot, pin, oirq.specifier[0]);
-        return oirq.specifier[0];
-}
-
-static void __devinit quirk_uli1575(struct pci_dev *dev)
-{
-        unsigned short temp;
-        struct pci_controller *hose = pci_bus_to_host(dev->bus);
-        unsigned char irq2pin[16], c;
-        unsigned long pirq_map_word = 0;
-        u32 irq;
-        int i;
-
-        /*
-         * ULI1575 interrupts route setup
-         */
-        memset(irq2pin, 0, 16); /* Initialize default value 0 */
-
-        /*
-         * PIRQA -> PIRQD mapping read from OF-tree
-         *
-         * interrupts for PCI slot0 -- PIRQA / PIRQB / PIRQC / PIRQD
-         *                PCI slot1 -- PIRQB / PIRQC / PIRQD / PIRQA
-         */
-        for (i = 0; i < 4; i++){
-                irq = get_pci_irq_from_of(hose, 17, i + 1);
-                if (irq > 0 && irq < 16)
-                        irq2pin[irq] = PIRQA + i;
-                else
-                        printk(KERN_WARNING "ULI1575 device"
-                            "(slot %d, pin %d) irq %d is invalid.\n",
-                            17, i, irq);
-        }
-
-        /*
-         * PIRQE -> PIRQF mapping set manually
-         *
-         * IRQ pin   IRQ#
-         * PIRQE ---- 9
-         * PIRQF ---- 10
-         * PIRQG ---- 11
-         * PIRQH ---- 12
-         */
-        for (i = 0; i < 4; i++) irq2pin[i + 9] = PIRQE + i;
-
-        /* Set IRQ-PIRQ Mapping to ULI1575 */
-        for (i = 0; i < 16; i++)
-                if (irq2pin[i])
-                        pirq_map_word |= (uli1575_irq_route_table[i] & 0xf)
-                                << ((irq2pin[i] - PIRQA) * 4);
-
-        /* ULI1575 IRQ mapping conf register default value is 0xb9317542 */
-        DBG("Setup ULI1575 IRQ mapping configuration register value = 0x%x\n",
-                        pirq_map_word);
-        pci_write_config_dword(dev, 0x48, pirq_map_word);
-
-#define ULI1575_SET_DEV_IRQ(slot, pin, reg)                             \
-        do {                                                            \
-                int irq;                                                \
-                irq = get_pci_irq_from_of(hose, slot, pin);             \
-                if (irq > 0 && irq < 16)                                \
-                        pci_write_config_byte(dev, reg, irq2pin[irq]);  \
-                else                                                    \
-                        printk(KERN_WARNING "ULI1575 device"            \
-                            "(slot %d, pin %d) irq %d is invalid.\n",   \
-                            slot, pin, irq);                            \
-        } while(0)
-
-        /* USB 1.1 OHCI controller 1, slot 28, pin 1 */
-        ULI1575_SET_DEV_IRQ(28, 1, 0x86);
-
-        /* USB 1.1 OHCI controller 2, slot 28, pin 2 */
-        ULI1575_SET_DEV_IRQ(28, 2, 0x87);
-
-        /* USB 1.1 OHCI controller 3, slot 28, pin 3 */
-        ULI1575_SET_DEV_IRQ(28, 3, 0x88);
-
-        /* USB 2.0 controller, slot 28, pin 4 */
-        irq = get_pci_irq_from_of(hose, 28, 4);
-        if (irq >= 0 && irq <=15)
-                pci_write_config_dword(dev, 0x74, uli1575_irq_route_table[irq]);
-
-        /* Audio controller, slot 29, pin 1 */
-        ULI1575_SET_DEV_IRQ(29, 1, 0x8a);
-
-        /* Modem controller, slot 29, pin 2 */
-        ULI1575_SET_DEV_IRQ(29, 2, 0x8b);
-
-        /* HD audio controller, slot 29, pin 3 */
-        ULI1575_SET_DEV_IRQ(29, 3, 0x8c);
-
-        /* SMB interrupt: slot 30, pin 1 */
-        ULI1575_SET_DEV_IRQ(30, 1, 0x8e);
-
-        /* PMU ACPI SCI interrupt: slot 30, pin 2 */
-        ULI1575_SET_DEV_IRQ(30, 2, 0x8f);
-
-        /* Serial ATA interrupt: slot 31, pin 1 */
-        ULI1575_SET_DEV_IRQ(31, 1, 0x8d);
-
-        /* Primary PATA IDE IRQ: 14
-         * Secondary PATA IDE IRQ: 15
-         */
-        pci_write_config_byte(dev, 0x44, 0x30 | uli1575_irq_route_table[14]);
-        pci_write_config_byte(dev, 0x75, uli1575_irq_route_table[15]);
-
-        /* Set IRQ14 and IRQ15 to legacy IRQs */
-        pci_read_config_word(dev, 0x46, &temp);
-        temp |= 0xc000;
-        pci_write_config_word(dev, 0x46, temp);
-
-        /* Set i8259 interrupt trigger
-         * IRQ 3:  Level
-         * IRQ 4:  Level
-         * IRQ 5:  Level
-         * IRQ 6:  Level
-         * IRQ 7:  Level
-         * IRQ 9:  Level
-         * IRQ 10: Level
-         * IRQ 11: Level
-         * IRQ 12: Level
-         * IRQ 14: Edge
-         * IRQ 15: Edge
-         */
-        outb(0xfa, 0x4d0);
-        outb(0x1e, 0x4d1);
-
-#undef ULI1575_SET_DEV_IRQ
-
-        /* Disable the HD interface and enable the AC97 interface. */
-        pci_read_config_byte(dev, 0xb8, &c);
-        c &= 0x7f;
-        pci_write_config_byte(dev, 0xb8, c);
-}
-
-static void __devinit quirk_uli5288(struct pci_dev *dev)
+static int mpc86xx_exclude_device(struct pci_controller *hose,
+                                   u_char bus, u_char devfn)
 {
-        unsigned char c;
+        struct device_node* node;       
+        struct resource rsrc;
 
-        pci_read_config_byte(dev,0x83,&c);
-        c |= 0x80;
-        pci_write_config_byte(dev, 0x83, c);
+        node = (struct device_node *)hose->arch_data;
+        of_address_to_resource(node, 0, &rsrc);
 
-        pci_write_config_byte(dev, 0x09, 0x01);
-        pci_write_config_byte(dev, 0x0a, 0x06);
-
-        pci_read_config_byte(dev,0x83,&c);
-        c &= 0x7f;
-        pci_write_config_byte(dev, 0x83, c);
-
-        pci_read_config_byte(dev,0x84,&c);
-        c |= 0x01;
-        pci_write_config_byte(dev, 0x84, c);
-}
-
-static void __devinit quirk_uli5229(struct pci_dev *dev)
-{
-        unsigned short temp;
-        pci_write_config_word(dev, 0x04, 0x0405);
-        dev->class &= ~0x5;
-        pci_read_config_word(dev, 0x4a, &temp);
-        temp |= 0x1000;
-        pci_write_config_word(dev, 0x4a, temp);
-}
+        if ((rsrc.start & 0xfffff) == 0x8000) {
+                return uli_exclude_device(hose, bus, devfn);
+        }
 
-static void __devinit early_uli5249(struct pci_dev *dev)
-{
-        unsigned char temp;
-        pci_write_config_word(dev, 0x04, 0x0007);
-        pci_read_config_byte(dev, 0x7c, &temp);
-        pci_write_config_byte(dev, 0x7c, 0x80);
-        pci_write_config_byte(dev, 0x09, 0x01);
-        pci_write_config_byte(dev, 0x7c, temp);
-        dev->class |= 0x1;
+        return PCIBIOS_SUCCESSFUL;
 }
-
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, 0x1575, quirk_uli1575);
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, 0x5288, quirk_uli5288);
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, 0x5229, quirk_uli5229);
-DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AL, 0x5249, early_uli5249);
 #endif /* CONFIG_PCI */
 
 
@@ -353,6 +158,9 @@ mpc86xx_hpcn_setup_arch(void)
                 else
                         fsl_add_bridge(np, 0);
         }
+        uses_fsl_uli_m1575 = 1;
+        ppc_md.pci_exclude_device = mpc86xx_exclude_device;
+
 #endif
 
         printk("MPC86xx HPCN board from Freescale Semiconductor\n");