Linux-2.6.12-rc2v2.6.12-rc2

Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.

Let it rip!

1 files changed, 208 insertions, 0 deletions

diff --git a/arch/ppc/platforms/apus_pci.c b/arch/ppc/platforms/apus_pci.c
new file mode 100644
index 000000000000..33dad6db8243
--- /dev/null
+++ b/arch/ppc/platforms/apus_pci.c
@@ -0,0 +1,208 @@
+/*
+ * Copyright (C) Michel Dänzer <michdaen@iiic.ethz.ch>
+ *
+ * APUS PCI routines.
+ *
+ * Currently, only B/CVisionPPC cards (Permedia2) are supported.
+ *
+ * Thanks to Geert Uytterhoeven for the idea:
+ * Read values from given config space(s) for the first devices, -1 otherwise
+ *
+ */
+
+#include <linux/config.h>
+#ifdef CONFIG_AMIGA
+
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/string.h>
+#include <linux/init.h>
+
+#include <asm/io.h>
+#include <asm/pci-bridge.h>
+#include <asm/machdep.h>
+
+#include "apus_pci.h"
+
+
+/* These definitions are mostly adapted from pm2fb.c */
+
+#undef APUS_PCI_MASTER_DEBUG
+#ifdef APUS_PCI_MASTER_DEBUG
+#define DPRINTK(a,b...) printk(KERN_DEBUG "apus_pci: %s: " a, __FUNCTION__ , ## b)
+#else
+#define DPRINTK(a,b...)
+#endif
+
+/*
+ * The _DEFINITIVE_ memory mapping/unmapping functions.
+ * This is due to the fact that they're changing soooo often...
+ */
+#define DEFW()          wmb()
+#define DEFR()          rmb()
+#define DEFRW()         mb()
+
+#define DEVNO(d)        ((d)>>3)
+#define FNNO(d)         ((d)&7)
+
+
+extern unsigned long powerup_PCI_present;
+
+static struct pci_controller *apus_hose;
+
+
+void *pci_io_base(unsigned int bus)
+{
+        return 0;
+}
+
+
+int
+apus_pcibios_read_config(struct pci_bus *bus, int devfn, int offset,
+                         int len, u32 *val)
+{
+        int fnno = FNNO(devfn);
+        int devno = DEVNO(devfn);
+        volatile unsigned char *cfg_data;
+
+        if (bus->number > 0 || devno != 1) {
+                *val = ~0;
+                return PCIBIOS_DEVICE_NOT_FOUND;
+        }
+        /* base address + function offset + offset ^ endianness conversion */
+        /* XXX the fnno<<5 bit seems wacky  -- paulus */
+        cfg_data = apus_hose->cfg_data + (fnno<<5) + (offset ^ (len - 1));
+        switch (len) {
+        case 1:
+                *val = readb(cfg_data);
+                break;
+        case 2:
+                *val = readw(cfg_data);
+                break;
+        default:
+                *val = readl(cfg_data);
+                break;
+        }
+
+        DPRINTK("read b: 0x%x, d: 0x%x, f: 0x%x, o: 0x%x, l: %d, v: 0x%x\n",
+                bus->number, devfn>>3, devfn&7, offset, len, *val);
+        return PCIBIOS_SUCCESSFUL;
+}
+
+int
+apus_pcibios_write_config(struct pci_bus *bus, int devfn, int offset,
+                          int len, u32 *val)
+{
+        int fnno = FNNO(devfn);
+        int devno = DEVNO(devfn);
+        volatile unsigned char *cfg_data;
+
+        if (bus->number > 0 || devno != 1) {
+                return PCIBIOS_DEVICE_NOT_FOUND;
+        }
+        /* base address + function offset + offset ^ endianness conversion */
+        /* XXX the fnno<<5 bit seems wacky  -- paulus */
+        cfg_data = apus_hose->cfg_data + (fnno<<5) + (offset ^ (len - 1));
+        switch (len) {
+        case 1:
+                writeb(val, cfg_data); DEFW();
+                break;
+        case 2:
+                writew(val, cfg_data); DEFW();
+                break;
+        default:
+                writel(val, cfg_data); DEFW();
+                break;
+        }
+
+        DPRINTK("write b: 0x%x, d: 0x%x, f: 0x%x, o: 0x%x, l: %d, v: 0x%x\n",
+                bus->number, devfn>>3, devfn&7, offset, len, val);
+        return PCIBIOS_SUCCESSFUL;
+}
+
+static struct pci_ops apus_pci_ops = {
+        apus_pcibios_read_config,
+        apus_pcibios_write_config
+};
+
+static struct resource pci_mem = { "B/CVisionPPC PCI mem", CVPPC_FB_APERTURE_ONE, CVPPC_PCI_CONFIG, IORESOURCE_MEM };
+
+void __init
+apus_pcibios_fixup(void)
+{
+/*      struct pci_dev *dev = pci_find_slot(0, 1<<3);
+        unsigned int reg, val, offset;*/
+
+        /* FIXME: interrupt? */
+        /*dev->interrupt = xxx;*/
+
+        request_resource(&iomem_resource, &pci_mem);
+        printk("%s: PCI mem resource requested\n", __FUNCTION__);
+}
+
+static void __init apus_pcibios_fixup_bus(struct pci_bus *bus)
+{
+        bus->resource[1] = &pci_mem;
+}
+
+
+/*
+ * This is from pm2fb.c again
+ *
+ * Check if PCI (B/CVisionPPC) is available, initialize it and set up
+ * the pcibios_* pointers
+ */
+
+
+void __init
+apus_setup_pci_ptrs(void)
+{
+        if (!powerup_PCI_present) {
+                DPRINTK("no PCI bridge detected\n");
+                return;
+        }
+        DPRINTK("Phase5 B/CVisionPPC PCI bridge detected.\n");
+
+        apus_hose = pcibios_alloc_controller();
+        if (!apus_hose) {
+                printk("apus_pci: Can't allocate PCI controller structure\n");
+                return;
+        }
+
+        if (!(apus_hose->cfg_data = ioremap(CVPPC_PCI_CONFIG, 256))) {
+                printk("apus_pci: unable to map PCI config region\n");
+                return;
+        }
+
+        if (!(apus_hose->cfg_addr = ioremap(CSPPC_PCI_BRIDGE, 256))) {
+                printk("apus_pci: unable to map PCI bridge\n");
+                return;
+        }
+
+        writel(CSPPCF_BRIDGE_BIG_ENDIAN, apus_hose->cfg_addr + CSPPC_BRIDGE_ENDIAN);
+        DEFW();
+
+        writel(CVPPC_REGS_REGION,  apus_hose->cfg_data+ PCI_BASE_ADDRESS_0);
+        DEFW();
+        writel(CVPPC_FB_APERTURE_ONE, apus_hose->cfg_data + PCI_BASE_ADDRESS_1);
+        DEFW();
+        writel(CVPPC_FB_APERTURE_TWO, apus_hose->cfg_data + PCI_BASE_ADDRESS_2);
+        DEFW();
+        writel(CVPPC_ROM_ADDRESS, apus_hose->cfg_data + PCI_ROM_ADDRESS);
+        DEFW();
+
+        writel(0xef000000 | PCI_COMMAND_IO | PCI_COMMAND_MEMORY |
+                PCI_COMMAND_MASTER, apus_hose->cfg_data + PCI_COMMAND);
+        DEFW();
+
+        apus_hose->first_busno = 0;
+        apus_hose->last_busno = 0;
+        apus_hose->ops = &apus_pci_ops;
+        ppc_md.pcibios_fixup = apus_pcibios_fixup;
+        ppc_md.pcibios_fixup_bus = apus_pcibios_fixup_bus;
+
+        return;
+}
+
+#endif /* CONFIG_AMIGA */