powerpc/cell: add QPACE as a separate Cell platform
authorBenjamin Krill <ben@codiert.org>
Thu, 27 Nov 2008 15:15:44 +0000 (16:15 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 22 Dec 2008 21:19:19 +0000 (22:19 +0100)
Since the QPACE (Chromodynamics Parallel Computing on the
Cell Broadband Engine) platform doesn't use a iommu, doesn't
have PCI devices and a MPIC much lesser setup and
configurations are needed. So far all devices are detected
as OF device. A notifier function is used to set the dma_ops
for the of_platform bus. Further this patch splits the
PPC_CELL_NATIVE into PPC_CELL_COMMON which are parts that are
shared with the QPACE platform and the rest.

Signed-off-by: Benjamin Krill <ben@codiert.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/powerpc/boot/Makefile
arch/powerpc/platforms/cell/Kconfig
arch/powerpc/platforms/cell/Makefile
arch/powerpc/platforms/cell/qpace_setup.c [new file with mode: 0644]
drivers/edac/Kconfig

index 3d3daa674299038072e3d8e7f2d36f3181b5cb1f..f32829937aad4a8a60ed5aa521d94537cfd10510 100644 (file)
@@ -194,6 +194,7 @@ image-$(CONFIG_PPC_MAPLE)           += zImage.pseries
 image-$(CONFIG_PPC_IBM_CELL_BLADE)     += zImage.pseries
 image-$(CONFIG_PPC_PS3)                        += dtbImage.ps3
 image-$(CONFIG_PPC_CELLEB)             += zImage.pseries
 image-$(CONFIG_PPC_IBM_CELL_BLADE)     += zImage.pseries
 image-$(CONFIG_PPC_PS3)                        += dtbImage.ps3
 image-$(CONFIG_PPC_CELLEB)             += zImage.pseries
+image-$(CONFIG_PPC_CELL_QPACE)         += zImage.pseries
 image-$(CONFIG_PPC_CHRP)               += zImage.chrp
 image-$(CONFIG_PPC_EFIKA)              += zImage.chrp
 image-$(CONFIG_PPC_PMAC)               += zImage.pmac
 image-$(CONFIG_PPC_CHRP)               += zImage.chrp
 image-$(CONFIG_PPC_EFIKA)              += zImage.chrp
 image-$(CONFIG_PPC_PMAC)               += zImage.pmac
index 617f84547b30e9b134f4f99e152c8fd6c7a41fb3..5cc3279559a4e50275db5bc5b545c6e377fa7e5a 100644 (file)
@@ -2,13 +2,18 @@ config PPC_CELL
        bool
        default n
 
        bool
        default n
 
-config PPC_CELL_NATIVE
+config PPC_CELL_COMMON
        bool
        select PPC_CELL
        select PPC_DCR_MMIO
        bool
        select PPC_CELL
        select PPC_DCR_MMIO
-       select PPC_OF_PLATFORM_PCI
        select PPC_INDIRECT_IO
        select PPC_NATIVE
        select PPC_INDIRECT_IO
        select PPC_NATIVE
+       select PPC_RTAS
+
+config PPC_CELL_NATIVE
+       bool
+       select PPC_CELL_COMMON
+       select PPC_OF_PLATFORM_PCI
        select MPIC
        select IBM_NEW_EMAC_EMAC4
        select IBM_NEW_EMAC_RGMII
        select MPIC
        select IBM_NEW_EMAC_EMAC4
        select IBM_NEW_EMAC_RGMII
@@ -20,7 +25,6 @@ config PPC_IBM_CELL_BLADE
        bool "IBM Cell Blade"
        depends on PPC_MULTIPLATFORM && PPC64
        select PPC_CELL_NATIVE
        bool "IBM Cell Blade"
        depends on PPC_MULTIPLATFORM && PPC64
        select PPC_CELL_NATIVE
-       select PPC_RTAS
        select MMIO_NVRAM
        select PPC_UDBG_16550
        select UDBG_RTAS_CONSOLE
        select MMIO_NVRAM
        select PPC_UDBG_16550
        select UDBG_RTAS_CONSOLE
@@ -28,16 +32,17 @@ config PPC_IBM_CELL_BLADE
 config PPC_CELLEB
        bool "Toshiba's Cell Reference Set 'Celleb' Architecture"
        depends on PPC_MULTIPLATFORM && PPC64
 config PPC_CELLEB
        bool "Toshiba's Cell Reference Set 'Celleb' Architecture"
        depends on PPC_MULTIPLATFORM && PPC64
-       select PPC_CELL
        select PPC_CELL_NATIVE
        select PPC_CELL_NATIVE
-       select PPC_RTAS
-       select PPC_INDIRECT_IO
-       select PPC_OF_PLATFORM_PCI
        select HAS_TXX9_SERIAL
        select PPC_UDBG_BEAT
        select USB_OHCI_BIG_ENDIAN_MMIO
        select USB_EHCI_BIG_ENDIAN_MMIO
 
        select HAS_TXX9_SERIAL
        select PPC_UDBG_BEAT
        select USB_OHCI_BIG_ENDIAN_MMIO
        select USB_EHCI_BIG_ENDIAN_MMIO
 
+config PPC_CELL_QPACE
+       bool "IBM Cell - QPACE"
+       depends on PPC_MULTIPLATFORM && PPC64
+       select PPC_CELL_COMMON
+
 menu "Cell Broadband Engine options"
        depends on PPC_CELL
 
 menu "Cell Broadband Engine options"
        depends on PPC_CELL
 
index 7fd830872c43bf458bd68de22ff9384c411bed19..43eccb27030121936175256f409804b55f4c82f5 100644 (file)
@@ -1,7 +1,7 @@
-obj-$(CONFIG_PPC_CELL_NATIVE)          += interrupt.o iommu.o setup.o \
-                                          cbe_regs.o spider-pic.o \
-                                          pervasive.o pmu.o io-workarounds.o \
-                                          spider-pci.o
+obj-$(CONFIG_PPC_CELL_COMMON)          += cbe_regs.o interrupt.o pervasive.o
+
+obj-$(CONFIG_PPC_CELL_NATIVE)          += iommu.o setup.o spider-pic.o \
+                                          pmu.o io-workarounds.o spider-pci.o
 obj-$(CONFIG_CBE_RAS)                  += ras.o
 
 obj-$(CONFIG_CBE_THERM)                        += cbe_thermal.o
 obj-$(CONFIG_CBE_RAS)                  += ras.o
 
 obj-$(CONFIG_CBE_THERM)                        += cbe_thermal.o
@@ -14,13 +14,12 @@ obj-$(CONFIG_PPC_IBM_CELL_POWERBUTTON)      += cbe_powerbutton.o
 
 ifeq ($(CONFIG_SMP),y)
 obj-$(CONFIG_PPC_CELL_NATIVE)          += smp.o
 
 ifeq ($(CONFIG_SMP),y)
 obj-$(CONFIG_PPC_CELL_NATIVE)          += smp.o
+obj-$(CONFIG_PPC_CELL_QPACE)           += smp.o
 endif
 
 # needed only when building loadable spufs.ko
 endif
 
 # needed only when building loadable spufs.ko
-spu-priv1-$(CONFIG_PPC_CELL_NATIVE)    += spu_priv1_mmio.o
-
-spu-manage-$(CONFIG_PPC_CELLEB)                += spu_manage.o
-spu-manage-$(CONFIG_PPC_CELL_NATIVE)   += spu_manage.o
+spu-priv1-$(CONFIG_PPC_CELL_COMMON)    += spu_priv1_mmio.o
+spu-manage-$(CONFIG_PPC_CELL_COMMON)   += spu_manage.o
 
 obj-$(CONFIG_SPU_BASE)                 += spu_callbacks.o spu_base.o \
                                           spu_notify.o \
 
 obj-$(CONFIG_SPU_BASE)                 += spu_callbacks.o spu_base.o \
                                           spu_notify.o \
@@ -31,6 +30,8 @@ obj-$(CONFIG_SPU_BASE)                        += spu_callbacks.o spu_base.o \
 
 obj-$(CONFIG_PCI_MSI)                  += axon_msi.o
 
 
 obj-$(CONFIG_PCI_MSI)                  += axon_msi.o
 
+# qpace setup
+obj-$(CONFIG_PPC_CELL_QPACE)           += qpace_setup.o
 
 # celleb stuff
 ifeq ($(CONFIG_PPC_CELLEB),y)
 
 # celleb stuff
 ifeq ($(CONFIG_PPC_CELLEB),y)
diff --git a/arch/powerpc/platforms/cell/qpace_setup.c b/arch/powerpc/platforms/cell/qpace_setup.c
new file mode 100644 (file)
index 0000000..be84e6a
--- /dev/null
@@ -0,0 +1,152 @@
+/*
+ *  linux/arch/powerpc/platforms/cell/qpace_setup.c
+ *
+ *  Copyright (C) 1995  Linus Torvalds
+ *  Adapted from 'alpha' version by Gary Thomas
+ *  Modified by Cort Dougan (cort@cs.nmt.edu)
+ *  Modified by PPC64 Team, IBM Corp
+ *  Modified by Cell Team, IBM Deutschland Entwicklung GmbH
+ *  Modified by Benjamin Krill <ben@codiert.org>, IBM Corp.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/sched.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/irq.h>
+#include <linux/console.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/dma.h>
+#include <asm/machdep.h>
+#include <asm/time.h>
+#include <asm/cputable.h>
+#include <asm/irq.h>
+#include <asm/spu.h>
+#include <asm/spu_priv1.h>
+#include <asm/udbg.h>
+#include <asm/cell-regs.h>
+
+#include "interrupt.h"
+#include "pervasive.h"
+#include "ras.h"
+#include "io-workarounds.h"
+
+static void qpace_show_cpuinfo(struct seq_file *m)
+{
+       struct device_node *root;
+       const char *model = "";
+
+       root = of_find_node_by_path("/");
+       if (root)
+               model = of_get_property(root, "model", NULL);
+       seq_printf(m, "machine\t\t: CHRP %s\n", model);
+       of_node_put(root);
+}
+
+static void qpace_progress(char *s, unsigned short hex)
+{
+       printk("*** %04x : %s\n", hex, s ? s : "");
+}
+
+static int __init qpace_publish_devices(void)
+{
+       int node;
+
+       /* Publish OF platform devices for southbridge IOs */
+       of_platform_bus_probe(NULL, 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(qpace, qpace_publish_devices);
+
+extern int qpace_notify(struct device *dev)
+{
+       /* set dma_ops for of_platform bus */
+       if (dev->bus && dev->bus->name
+                       && !strcmp(dev->bus->name, "of_platform"))
+               set_dma_ops(dev, &dma_direct_ops);
+
+       return 0;
+}
+
+static void __init qpace_setup_arch(void)
+{
+#ifdef CONFIG_SPU_BASE
+       spu_priv1_ops = &spu_priv1_mmio_ops;
+       spu_management_ops = &spu_management_of_ops;
+#endif
+
+       cbe_regs_init();
+
+#ifdef CONFIG_CBE_RAS
+       cbe_ras_init();
+#endif
+
+#ifdef CONFIG_SMP
+       smp_init_cell();
+#endif
+
+       /* init to some ~sane value until calibrate_delay() runs */
+       loops_per_jiffy = 50000000;
+
+       cbe_pervasive_init();
+#ifdef CONFIG_DUMMY_CONSOLE
+       conswitchp = &dummy_con;
+#endif
+
+       /* set notifier function */
+       platform_notify = &qpace_notify;
+}
+
+static int __init qpace_probe(void)
+{
+       unsigned long root = of_get_flat_dt_root();
+
+       if (!of_flat_dt_is_compatible(root, "IBM,QPACE"))
+               return 0;
+
+       hpte_init_native();
+
+       return 1;
+}
+
+define_machine(qpace) {
+       .name                   = "QPACE",
+       .probe                  = qpace_probe,
+       .setup_arch             = qpace_setup_arch,
+       .show_cpuinfo           = qpace_show_cpuinfo,
+       .restart                = rtas_restart,
+       .power_off              = rtas_power_off,
+       .halt                   = rtas_halt,
+       .get_boot_time          = rtas_get_boot_time,
+       .calibrate_decr         = generic_calibrate_decr,
+       .progress               = qpace_progress,
+       .init_IRQ               = iic_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
+};
index e0dbd388757f2d8d62e5f8a4561b4d567e009746..e2667a8c2997155a141da0a15a5054430bb86e0c 100644 (file)
@@ -161,7 +161,7 @@ config EDAC_PASEMI
 
 config EDAC_CELL
        tristate "Cell Broadband Engine memory controller"
 
 config EDAC_CELL
        tristate "Cell Broadband Engine memory controller"
-       depends on EDAC_MM_EDAC && PPC_CELL_NATIVE
+       depends on EDAC_MM_EDAC && PPC_CELL_COMMON
        help
          Support for error detection and correction on the
          Cell Broadband Engine internal memory controller
        help
          Support for error detection and correction on the
          Cell Broadband Engine internal memory controller
This page took 0.030771 seconds and 5 git commands to generate.