3 files changed, 342 insertions, 0 deletions

diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile
index 83d81c9cdc2b..ea8438b81fed 100644
--- a/arch/mips/pci/Makefile
+++ b/arch/mips/pci/Makefile
@@ -34,6 +34,7 @@ obj-$(CONFIG_MIPS_ITE8172)	+= fixup-ite8172g.o
 obj-$(CONFIG_MIPS_IVR)          += fixup-ivr.o
 obj-$(CONFIG_SOC_AU1500)        += fixup-au1000.o ops-au1000.o
 obj-$(CONFIG_SOC_AU1550)        += fixup-au1000.o ops-au1000.o
+obj-$(CONFIG_SOC_PNX8550)       += fixup-pnx8550.o ops-pnx8550.o
 obj-$(CONFIG_MIPS_MALTA)        += fixup-malta.o
 obj-$(CONFIG_MOMENCO_JAGUAR_ATX)+= fixup-jaguar.o
 obj-$(CONFIG_MOMENCO_OCELOT)    += fixup-ocelot.o pci-ocelot.o
diff --git a/arch/mips/pci/fixup-pnx8550.c b/arch/mips/pci/fixup-pnx8550.c
new file mode 100644
index 000000000000..4256b3b30b77
--- /dev/null
+++ b/arch/mips/pci/fixup-pnx8550.c
@@ -0,0 +1,57 @@
+/*
+ *  Philips PNX8550 pci fixups.
+ *
+ *  Copyright 2005 Embedded Alley Solutions, Inc
+ *  source@embeddealley.com
+ *
+ *  This program is free software; you can distribute it and/or modify it
+ *  under the terms of the GNU General Public License (Version 2) as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *  for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
+ */
+#include <linux/types.h>
+#include <linux/pci.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+
+#include <asm/mach-pnx8550/pci.h>
+#include <asm/mach-pnx8550/int.h>
+
+
+#undef  DEBUG
+#ifdef  DEBUG
+#define DBG(x...)       printk(x)
+#else
+#define DBG(x...)
+#endif
+
+extern char irq_tab_jbs[][5];
+
+void __init pcibios_fixup_resources(struct pci_dev *dev)
+{
+        /* no need to fixup IO resources */
+}
+
+void __init pcibios_fixup(void)
+{
+        /* nothing to do here */
+}
+
+int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+{
+        return irq_tab_jbs[slot][pin];
+}
+
+/* Do platform specific device initialization at pci_enable_device() time */
+int pcibios_plat_dev_init(struct pci_dev *dev)
+{
+        return 0;
+}
diff --git a/arch/mips/pci/ops-pnx8550.c b/arch/mips/pci/ops-pnx8550.c
new file mode 100644
index 000000000000..454b65cc3354
--- /dev/null
+++ b/arch/mips/pci/ops-pnx8550.c
@@ -0,0 +1,284 @@
+/*
+ *
+ *  BRIEF MODULE DESCRIPTION
+ *
+ *  2.6 port, Embedded Alley Solutions, Inc
+ *
+ *  Based on:
+ *  Author: source@mvista.com
+ *
+ *  This program is free software; you can distribute it and/or modify it
+ *  under the terms of the GNU General Public License (Version 2) as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *  for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
+ */
+#include <linux/types.h>
+#include <linux/pci.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/vmalloc.h>
+#include <linux/delay.h>
+
+#include <asm/mach-pnx8550/pci.h>
+#include <asm/mach-pnx8550/glb.h>
+#include <asm/debug.h>
+
+
+static inline void clear_status(void)
+{
+        unsigned long pci_stat;
+
+        pci_stat = inl(PCI_BASE | PCI_GPPM_STATUS);
+        outl(pci_stat, PCI_BASE | PCI_GPPM_ICLR);
+}
+
+static inline unsigned int
+calc_cfg_addr(struct pci_bus *bus, unsigned int devfn, int where)
+{
+        unsigned int addr;
+
+        addr = ((bus->number > 0) ? (((bus->number & 0xff) << PCI_CFG_BUS_SHIFT) | 1) : 0);
+        addr |= ((devfn & 0xff) << PCI_CFG_FUNC_SHIFT) | (where & 0xfc);
+
+        return addr;
+}
+
+static int
+config_access(unsigned int pci_cmd, struct pci_bus *bus, unsigned int devfn, int where, unsigned int pci_mode, unsigned int *val)
+{
+        unsigned int flags;
+        unsigned long loops = 0;
+        unsigned long ioaddr = calc_cfg_addr(bus, devfn, where);
+
+        local_irq_save(flags);
+        /*Clear pending interrupt status */
+        if (inl(PCI_BASE | PCI_GPPM_STATUS)) {
+                clear_status();
+                while (!(inl(PCI_BASE | PCI_GPPM_STATUS) == 0)) ;
+        }
+
+        outl(ioaddr, PCI_BASE | PCI_GPPM_ADDR);
+
+        if ((pci_cmd == PCI_CMD_IOW) || (pci_cmd == PCI_CMD_CONFIG_WRITE))
+                outl(*val, PCI_BASE | PCI_GPPM_WDAT);
+
+        outl(INIT_PCI_CYCLE | pci_cmd | (pci_mode & PCI_BYTE_ENABLE_MASK),
+             PCI_BASE | PCI_GPPM_CTRL);
+
+        loops =
+            ((loops_per_jiffy *
+              PCI_IO_JIFFIES_TIMEOUT) >> (PCI_IO_JIFFIES_SHIFT));
+        while (1) {
+                if (inl(PCI_BASE | PCI_GPPM_STATUS) & GPPM_DONE) {
+                        if ((pci_cmd == PCI_CMD_IOR) ||
+                            (pci_cmd == PCI_CMD_CONFIG_READ))
+                                *val = inl(PCI_BASE | PCI_GPPM_RDAT);
+                        clear_status();
+                        local_irq_restore(flags);
+                        return PCIBIOS_SUCCESSFUL;
+                } else if (inl(PCI_BASE | PCI_GPPM_STATUS) & GPPM_R_MABORT) {
+                        break;
+                }
+
+                loops--;
+                if (loops == 0) {
+                        printk("%s : Arbiter Locked.\n", __FUNCTION__);
+                }
+        }
+
+        clear_status();
+        if ((pci_cmd == PCI_CMD_IOR) || (pci_cmd == PCI_CMD_IOW)) {
+                printk("%s timeout (GPPM_CTRL=%X) ioaddr %lX pci_cmd %X\n",
+                       __FUNCTION__, inl(PCI_BASE | PCI_GPPM_CTRL), ioaddr,
+                       pci_cmd);
+        }
+
+        if ((pci_cmd == PCI_CMD_IOR) || (pci_cmd == PCI_CMD_CONFIG_READ))
+                *val = 0xffffffff;
+        local_irq_restore(flags);
+        return PCIBIOS_DEVICE_NOT_FOUND;
+}
+
+/*
+ * We can't address 8 and 16 bit words directly.  Instead we have to
+ * read/write a 32bit word and mask/modify the data we actually want.
+ */
+static int
+read_config_byte(struct pci_bus *bus, unsigned int devfn, int where, u8 * val)
+{
+        unsigned int data = 0;
+        int err;
+
+        if (bus == 0)
+                return -1;
+
+        err = config_access(PCI_CMD_CONFIG_READ, bus, devfn, where, ~(1 << (where & 3)), &data);
+        switch (where & 0x03) {
+        case 0:
+                *val = (unsigned char)(data & 0x000000ff);
+                break;
+        case 1:
+                *val = (unsigned char)((data & 0x0000ff00) >> 8);
+                break;
+        case 2:
+                *val = (unsigned char)((data & 0x00ff0000) >> 16);
+                break;
+        case 3:
+                *val = (unsigned char)((data & 0xff000000) >> 24);
+                break;
+        }
+
+        return err;
+}
+
+static int
+read_config_word(struct pci_bus *bus, unsigned int devfn, int where, u16 * val)
+{
+        unsigned int data = 0;
+        int err;
+
+        if (bus == 0)
+                return -1;
+
+        if (where & 0x01)
+                return PCIBIOS_BAD_REGISTER_NUMBER;
+
+        err = config_access(PCI_CMD_CONFIG_READ, bus, devfn, where, ~(3 << (where & 3)), &data);
+        switch (where & 0x02) {
+        case 0:
+                *val = (unsigned short)(data & 0x0000ffff);
+                break;
+        case 2:
+                *val = (unsigned short)((data & 0xffff0000) >> 16);
+                break;
+        }
+
+        return err;
+}
+
+static int
+read_config_dword(struct pci_bus *bus, unsigned int devfn, int where, u32 * val)
+{
+        int err;
+        if (bus == 0)
+                return -1;
+
+        if (where & 0x03)
+                return PCIBIOS_BAD_REGISTER_NUMBER;
+
+        err = config_access(PCI_CMD_CONFIG_READ, bus, devfn, where, 0, val);
+
+        return err;
+}
+
+static int
+write_config_byte(struct pci_bus *bus, unsigned int devfn, int where, u8 val)
+{
+        unsigned int data = (unsigned int)val;
+        int err;
+
+        if (bus == 0)
+                return -1;
+
+        switch (where & 0x03) {
+        case 1:
+                data = (data << 8);
+                break;
+        case 2:
+                data = (data << 16);
+                break;
+        case 3:
+                data = (data << 24);
+                break;
+        default:
+                break;
+        }
+
+        err = config_access(PCI_CMD_CONFIG_READ, bus, devfn, where, ~(1 << (where & 3)), &data);
+
+        return err;
+}
+
+static int
+write_config_word(struct pci_bus *bus, unsigned int devfn, int where, u16 val)
+{
+        unsigned int data = (unsigned int)val;
+        int err;
+
+        if (bus == 0)
+                return -1;
+
+        if (where & 0x01)
+                return PCIBIOS_BAD_REGISTER_NUMBER;
+
+        switch (where & 0x02) {
+        case 2:
+                data = (data << 16);
+                break;
+        default:
+                break;
+        }
+        err = config_access(PCI_CMD_CONFIG_WRITE, bus, devfn, where, ~(3 << (where & 3)), &data);
+
+        return err;
+}
+
+static int
+write_config_dword(struct pci_bus *bus, unsigned int devfn, int where, u32 val)
+{
+        int err;
+        if (bus == 0)
+                return -1;
+
+        if (where & 0x03)
+                return PCIBIOS_BAD_REGISTER_NUMBER;
+
+        err = config_access(PCI_CMD_CONFIG_WRITE, bus, devfn, where, 0, &val);
+
+        return err;
+}
+
+static int config_read(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 * val)
+{
+        switch (size) {
+        case 1: {
+                        u8 _val;
+                        int rc = read_config_byte(bus, devfn, where, &_val);
+                        *val = _val;
+                        return rc;
+                }
+       case 2: {
+                        u16 _val;
+                        int rc = read_config_word(bus, devfn, where, &_val);
+                        *val = _val;
+                        return rc;
+                }
+        default:
+                return read_config_dword(bus, devfn, where, val);
+        }
+}
+
+static int config_write(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 val)
+{
+        switch (size) {
+        case 1:
+                return write_config_byte(bus, devfn, where, (u8) val);
+        case 2:
+                return write_config_word(bus, devfn, where, (u16) val);
+        default:
+                return write_config_dword(bus, devfn, where, val);
+        }
+}
+
+struct pci_ops pnx8550_pci_ops = {
+        config_read,
+        config_write
+};