include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...
[safe/jmp/linux-2.6] / arch / powerpc / platforms / cell / setup.c
index 13f628d..50385db 100644 (file)
@@ -19,7 +19,6 @@
 #include <linux/mm.h>
 #include <linux/stddef.h>
 #include <linux/unistd.h>
-#include <linux/slab.h>
 #include <linux/user.h>
 #include <linux/reboot.h>
 #include <linux/init.h>
 #include <linux/console.h>
 #include <linux/mutex.h>
 #include <linux/memory_hotplug.h>
+#include <linux/of_platform.h>
 
 #include <asm/mmu.h>
 #include <asm/processor.h>
 #include <asm/io.h>
-#include <asm/kexec.h>
 #include <asm/pgtable.h>
 #include <asm/prom.h>
 #include <asm/rtas.h>
 #include <asm/spu_priv1.h>
 #include <asm/udbg.h>
 #include <asm/mpic.h>
+#include <asm/cell-regs.h>
 
 #include "interrupt.h"
-#include "iommu.h"
-#include "cbe_regs.h"
 #include "pervasive.h"
 #include "ras.h"
+#include "io-workarounds.h"
 
 #ifdef DEBUG
 #define DBG(fmt...) udbg_printf(fmt)
@@ -71,7 +70,7 @@ static void cell_show_cpuinfo(struct seq_file *m)
 
        root = of_find_node_by_path("/");
        if (root)
-               model = get_property(root, "model", NULL);
+               model = of_get_property(root, "model", NULL);
        seq_printf(m, "machine\t\t: CHRP %s\n", model);
        of_node_put(root);
 }
@@ -81,6 +80,99 @@ static void cell_progress(char *s, unsigned short hex)
        printk("*** %04x : %s\n", hex, s ? s : "");
 }
 
+static void cell_fixup_pcie_rootcomplex(struct pci_dev *dev)
+{
+       struct pci_controller *hose;
+       const char *s;
+       int i;
+
+       if (!machine_is(cell))
+               return;
+
+       /* We're searching for a direct child of the PHB */
+       if (dev->bus->self != NULL || dev->devfn != 0)
+               return;
+
+       hose = pci_bus_to_host(dev->bus);
+       if (hose == NULL)
+               return;
+
+       /* Only on PCIE */
+       if (!of_device_is_compatible(hose->dn, "pciex"))
+               return;
+
+       /* And only on axon */
+       s = of_get_property(hose->dn, "model", NULL);
+       if (!s || strcmp(s, "Axon") != 0)
+               return;
+
+       for (i = 0; i < PCI_BRIDGE_RESOURCES; i++) {
+               dev->resource[i].start = dev->resource[i].end = 0;
+               dev->resource[i].flags = 0;
+       }
+
+       printk(KERN_DEBUG "PCI: Hiding resources on Axon PCIE RC %s\n",
+              pci_name(dev));
+}
+DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, cell_fixup_pcie_rootcomplex);
+
+static int __devinit cell_setup_phb(struct pci_controller *phb)
+{
+       const char *model;
+       struct device_node *np;
+
+       int rc = rtas_setup_phb(phb);
+       if (rc)
+               return rc;
+
+       np = phb->dn;
+       model = of_get_property(np, "model", NULL);
+       if (model == NULL || strcmp(np->name, "pci"))
+               return 0;
+
+       /* Setup workarounds for spider */
+       if (strcmp(model, "Spider"))
+               return 0;
+
+       iowa_register_bus(phb, &spiderpci_ops, &spiderpci_iowa_init,
+                                 (void *)SPIDER_PCI_REG_BASE);
+       io_workaround_init();
+
+       return 0;
+}
+
+static int __init cell_publish_devices(void)
+{
+       struct device_node *root = of_find_node_by_path("/");
+       struct device_node *np;
+       int node;
+
+       /* Publish OF platform devices for southbridge IOs */
+       of_platform_bus_probe(NULL, NULL, NULL);
+
+       /* On spider based blades, we need to manually create the OF
+        * platform devices for the PCI host bridges
+        */
+       for_each_child_of_node(root, np) {
+               if (np->type == NULL || (strcmp(np->type, "pci") != 0 &&
+                                        strcmp(np->type, "pciex") != 0))
+                       continue;
+               of_platform_device_create(np, NULL, NULL);
+       }
+
+       /* There is no device for the MIC memory controller, thus we create
+        * a platform device for it to attach the EDAC driver to.
+        */
+       for_each_online_node(node) {
+               if (cbe_get_cpu_mic_tm_regs(cbe_node_to_cpu(node)) == NULL)
+                       continue;
+               platform_device_register_simple("cbe-mic", node, NULL, 0);
+       }
+
+       return 0;
+}
+machine_subsys_initcall(cell, cell_publish_devices);
+
 static void cell_mpic_cascade(unsigned int irq, struct irq_desc *desc)
 {
        struct mpic *mpic = desc->handler_data;
@@ -100,7 +192,7 @@ static void __init mpic_init_IRQ(void)
 
        for (dn = NULL;
             (dn = of_find_node_by_name(dn, "interrupt-controller"));) {
-               if (!device_is_compatible(dn, "CBEA,platform-open-pic"))
+               if (!of_device_is_compatible(dn, "CBEA,platform-open-pic"))
                        continue;
 
                /* The MPIC driver will get everything it needs from the
@@ -130,14 +222,22 @@ static void __init cell_init_irq(void)
        mpic_init_IRQ();
 }
 
+static void __init cell_set_dabrx(void)
+{
+       mtspr(SPRN_DABRX, DABRX_KERNEL | DABRX_USER);
+}
+
 static void __init cell_setup_arch(void)
 {
 #ifdef CONFIG_SPU_BASE
-       spu_priv1_ops         = &spu_priv1_mmio_ops;
+       spu_priv1_ops = &spu_priv1_mmio_ops;
+       spu_management_ops = &spu_management_of_ops;
 #endif
 
        cbe_regs_init();
 
+       cell_set_dabrx();
+
 #ifdef CONFIG_CBE_RAS
        cbe_ras_init();
 #endif
@@ -145,18 +245,12 @@ static void __init cell_setup_arch(void)
 #ifdef CONFIG_SMP
        smp_init_cell();
 #endif
-
        /* init to some ~sane value until calibrate_delay() runs */
        loops_per_jiffy = 50000000;
 
-       if (ROOT_DEV == 0) {
-               printk("No ramdisk, default root is /dev/hda2\n");
-               ROOT_DEV = Root_HDA2;
-       }
-
        /* Find and initialize PCI host bridges */
        init_pci_config_tokens();
-       find_and_init_phbs();
+
        cbe_pervasive_init();
 #ifdef CONFIG_DUMMY_CONSOLE
        conswitchp = &dummy_con;
@@ -165,19 +259,6 @@ static void __init cell_setup_arch(void)
        mmio_nvram_init();
 }
 
-/*
- * Early initialization.  Relocation is on but do not reference unbolted pages
- */
-static void __init cell_init_early(void)
-{
-       DBG(" -> cell_init_early()\n");
-
-       cell_init_iommu();
-
-       DBG(" <- cell_init_early()\n");
-}
-
-
 static int __init cell_probe(void)
 {
        unsigned long root = of_get_flat_dt_root();
@@ -191,20 +272,10 @@ static int __init cell_probe(void)
        return 1;
 }
 
-/*
- * Cell has no legacy IO; anything calling this function has to
- * fail or bad things will happen
- */
-static int cell_check_legacy_ioport(unsigned int baseport)
-{
-       return -ENODEV;
-}
-
 define_machine(cell) {
        .name                   = "Cell",
        .probe                  = cell_probe,
        .setup_arch             = cell_setup_arch,
-       .init_early             = cell_init_early,
        .show_cpuinfo           = cell_show_cpuinfo,
        .restart                = rtas_restart,
        .power_off              = rtas_power_off,
@@ -213,12 +284,7 @@ define_machine(cell) {
        .get_rtc_time           = rtas_get_rtc_time,
        .set_rtc_time           = rtas_set_rtc_time,
        .calibrate_decr         = generic_calibrate_decr,
-       .check_legacy_ioport    = cell_check_legacy_ioport,
        .progress               = cell_progress,
        .init_IRQ               = cell_init_irq,
-#ifdef CONFIG_KEXEC
-       .machine_kexec          = default_machine_kexec,
-       .machine_kexec_prepare  = default_machine_kexec_prepare,
-       .machine_crash_shutdown = default_machine_crash_shutdown,
-#endif
+       .pci_setup_phb          = cell_setup_phb,
 };