9 files changed, 551 insertions, 0 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index ce431b4446f0..50bb5067d86e 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -539,6 +539,16 @@ config PPC_PS3
           This option enables support for the Sony PS3 game console
           and other platforms using the PS3 hypervisor.
 
+config PPC_CELLEB
+        bool "Toshiba's Cell Reference Set 'Celleb' Architecture"
+        depends on PPC_MULTIPLATFORM && PPC64
+        select PPC_CELL
+        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
+
 config PPC_NATIVE
         bool
         depends on PPC_MULTIPLATFORM
@@ -552,6 +562,11 @@ config UDBG_RTAS_CONSOLE
         depends on PPC_RTAS
         default n
 
+config PPC_UDBG_BEAT
+        bool "BEAT based debug console"
+        depends on PPC_CELLEB
+        default n
+
 config XICS
         depends on PPC_PSERIES
         bool
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index 6cb57e0e6b77..2bbeb1b19950 100644
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -185,6 +185,13 @@ config PPC_EARLY_DEBUG_ISERIES
           Select this to enable early debugging for legacy iSeries. You need
           to hit "Ctrl-x Ctrl-x" to see the messages on the console.
 
+config PPC_EARLY_DEBUG_BEAT
+        bool "Beat HV Console"
+        depends on PPC_CELLEB
+        select PPC_UDBG_BEAT
+        help
+          Select this to enable early debugging for Celleb with Beat.
+
 endchoice
 
 endmenu
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 98392fb5f581..dc779407de14 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -162,6 +162,7 @@ image-$(CONFIG_PPC_PSERIES)		+= zImage.pseries
 image-$(CONFIG_PPC_MAPLE)               += zImage.pseries
 image-$(CONFIG_PPC_IBM_CELL_BLADE)      += zImage.pseries
 image-$(CONFIG_PPC_PS3)                 += zImage.ps3
+image-$(CONFIG_PPC_CELLEB)              += zImage.pseries
 image-$(CONFIG_PPC_CHRP)                += zImage.chrp
 image-$(CONFIG_PPC_EFIKA)               += zImage.chrp
 image-$(CONFIG_PPC_PMAC)                += zImage.pmac
diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile
index f164005c66b9..65e612315b9b 100644
--- a/arch/powerpc/platforms/Makefile
+++ b/arch/powerpc/platforms/Makefile
@@ -19,4 +19,5 @@ obj-$(CONFIG_PPC_MAPLE)		+= maple/
 obj-$(CONFIG_PPC_PASEMI)        += pasemi/
 obj-$(CONFIG_PPC_CELL)          += cell/
 obj-$(CONFIG_PPC_PS3)           += ps3/
+obj-$(CONFIG_PPC_CELLEB)        += celleb/
 obj-$(CONFIG_EMBEDDED6xx)       += embedded6xx/
diff --git a/arch/powerpc/platforms/celleb/Makefile b/arch/powerpc/platforms/celleb/Makefile
new file mode 100644
index 000000000000..3baf658ac543
--- /dev/null
+++ b/arch/powerpc/platforms/celleb/Makefile
@@ -0,0 +1,9 @@
+obj-y                           += interrupt.o iommu.o setup.o \
+                                   htab.o beat.o pci.o \
+                                   scc_epci.o hvCall.o
+
+obj-$(CONFIG_SMP)               += smp.o
+obj-$(CONFIG_PPC_UDBG_BEAT)     += udbg_beat.o
+obj-$(CONFIG_USB)               += scc_uhc.o
+obj-$(CONFIG_HAS_TXX9_SERIAL)   += scc_sio.o
+obj-$(CONFIG_SPU_BASE)          += spu_priv1.o
diff --git a/arch/powerpc/platforms/celleb/beat.c b/arch/powerpc/platforms/celleb/beat.c
new file mode 100644
index 000000000000..99341ce8a697
--- /dev/null
+++ b/arch/powerpc/platforms/celleb/beat.c
@@ -0,0 +1,163 @@
+/*
+ * Simple routines for Celleb/Beat
+ *
+ * (C) Copyright 2006-2007 TOSHIBA CORPORATION
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/err.h>
+#include <linux/rtc.h>
+
+#include <asm/hvconsole.h>
+#include <asm/time.h>
+
+#include "beat_wrapper.h"
+#include "beat.h"
+
+void beat_restart(char *cmd)
+{
+        beat_shutdown_logical_partition(1);
+}
+
+void beat_power_off(void)
+{
+        beat_shutdown_logical_partition(0);
+}
+
+u64 beat_halt_code = 0x1000000000000000UL;
+
+void beat_halt(void)
+{
+        beat_shutdown_logical_partition(beat_halt_code);
+}
+
+int beat_set_rtc_time(struct rtc_time *rtc_time)
+{
+        u64 tim;
+        tim = mktime(rtc_time->tm_year+1900,
+                     rtc_time->tm_mon+1, rtc_time->tm_mday,
+                     rtc_time->tm_hour, rtc_time->tm_min, rtc_time->tm_sec);
+        if (beat_rtc_write(tim))
+                return -1;
+        return 0;
+}
+
+void beat_get_rtc_time(struct rtc_time *rtc_time)
+{
+        u64 tim;
+
+        if (beat_rtc_read(&tim))
+                tim = 0;
+        to_tm(tim, rtc_time);
+        rtc_time->tm_year -= 1900;
+        rtc_time->tm_mon -= 1;
+}
+
+#define BEAT_NVRAM_SIZE 4096
+
+ssize_t beat_nvram_read(char *buf, size_t count, loff_t *index)
+{
+        unsigned int i;
+        unsigned long len;
+        char *p = buf;
+
+        if (*index >= BEAT_NVRAM_SIZE)
+                return -ENODEV;
+        i = *index;
+        if (i + count > BEAT_NVRAM_SIZE)
+                count = BEAT_NVRAM_SIZE - i;
+
+        for (; count != 0; count -= len) {
+                len = count;
+                if (len > BEAT_NVRW_CNT)
+                        len = BEAT_NVRW_CNT;
+                if (beat_eeprom_read(i, len, p)) {
+                        return -EIO;
+                }
+
+                p += len;
+                i += len;
+        }
+        *index = i;
+        return p - buf;
+}
+
+ssize_t beat_nvram_write(char *buf, size_t count, loff_t *index)
+{
+        unsigned int i;
+        unsigned long len;
+        char *p = buf;
+
+        if (*index >= BEAT_NVRAM_SIZE)
+                return -ENODEV;
+        i = *index;
+        if (i + count > BEAT_NVRAM_SIZE)
+                count = BEAT_NVRAM_SIZE - i;
+
+        for (; count != 0; count -= len) {
+                len = count;
+                if (len > BEAT_NVRW_CNT)
+                        len = BEAT_NVRW_CNT;
+                if (beat_eeprom_write(i, len, p)) {
+                        return -EIO;
+                }
+
+                p += len;
+                i += len;
+        }
+        *index = i;
+        return p - buf;
+}
+
+ssize_t beat_nvram_get_size(void)
+{
+        return BEAT_NVRAM_SIZE;
+}
+
+int beat_set_xdabr(unsigned long dabr)
+{
+        if (beat_set_dabr(dabr, DABRX_KERNEL | DABRX_USER))
+                return -1;
+        return 0;
+}
+
+int64_t beat_get_term_char(u64 vterm, u64 *len, u64 *t1, u64 *t2)
+{
+        u64 db[2];
+        s64 ret;
+
+        ret = beat_get_characters_from_console(vterm, len, (u8*)db);
+        if (ret == 0) {
+                *t1 = db[0];
+                *t2 = db[1];
+        }
+        return ret;
+}
+
+int64_t beat_put_term_char(u64 vterm, u64 len, u64 t1, u64 t2)
+{
+        u64 db[2];
+
+        db[0] = t1;
+        db[1] = t2;
+        return beat_put_characters_to_console(vterm, len, (u8*)db);
+}
+
+EXPORT_SYMBOL(beat_get_term_char);
+EXPORT_SYMBOL(beat_put_term_char);
+EXPORT_SYMBOL(beat_halt_code);
diff --git a/arch/powerpc/platforms/celleb/beat.h b/arch/powerpc/platforms/celleb/beat.h
new file mode 100644
index 000000000000..2b16bf3bee89
--- /dev/null
+++ b/arch/powerpc/platforms/celleb/beat.h
@@ -0,0 +1,40 @@
+/*
+ * Guest OS Interfaces.
+ *
+ * (C) Copyright 2006 TOSHIBA CORPORATION
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef _CELLEB_BEAT_H
+#define _CELLEB_BEAT_H
+
+#define DABRX_KERNEL            (1UL<<1)
+#define DABRX_USER              (1UL<<0)
+
+int64_t beat_get_term_char(uint64_t,uint64_t*,uint64_t*,uint64_t*);
+int64_t beat_put_term_char(uint64_t,uint64_t,uint64_t,uint64_t);
+int64_t beat_repository_encode(int, const char *, uint64_t[4]);
+void beat_restart(char *);
+void beat_power_off(void);
+void beat_halt(void);
+int beat_set_rtc_time(struct rtc_time *);
+void beat_get_rtc_time(struct rtc_time *);
+ssize_t beat_nvram_get_size(void);
+ssize_t beat_nvram_read(char *, size_t, loff_t *);
+ssize_t beat_nvram_write(char *, size_t, loff_t *);
+int beat_set_xdabr(unsigned long);
+
+#endif /* _CELLEB_BEAT_H */
diff --git a/arch/powerpc/platforms/celleb/setup.c b/arch/powerpc/platforms/celleb/setup.c
new file mode 100644
index 000000000000..1de63acfda87
--- /dev/null
+++ b/arch/powerpc/platforms/celleb/setup.c
@@ -0,0 +1,191 @@
+/*
+ * Celleb setup code
+ *
+ * (C) Copyright 2006-2007 TOSHIBA CORPORATION
+ *
+ * This code is based on arch/powerpc/platforms/cell/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
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#undef DEBUG
+
+#include <linux/cpu.h>
+#include <linux/sched.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/stddef.h>
+#include <linux/unistd.h>
+#include <linux/reboot.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/irq.h>
+#include <linux/seq_file.h>
+#include <linux/root_dev.h>
+#include <linux/console.h>
+
+#include <asm/mmu.h>
+#include <asm/processor.h>
+#include <asm/io.h>
+#include <asm/kexec.h>
+#include <asm/prom.h>
+#include <asm/machdep.h>
+#include <asm/cputable.h>
+#include <asm/irq.h>
+#include <asm/spu_priv1.h>
+#include <asm/firmware.h>
+#include <asm/of_platform.h>
+
+#include "interrupt.h"
+#include "beat_wrapper.h"
+#include "beat.h"
+#include "pci.h"
+
+static char celleb_machine_type[128] = "Celleb";
+
+static void celleb_show_cpuinfo(struct seq_file *m)
+{
+        struct device_node *root;
+        const char *model = "";
+
+        root = of_find_node_by_path("/");
+        if (root)
+                model = get_property(root, "model", NULL);
+        /* using "CHRP" is to trick anaconda into installing FCx into Celleb */
+        seq_printf(m, "machine\t\t: %s %s\n", celleb_machine_type, model);
+        of_node_put(root);
+}
+
+static int celleb_machine_type_hack(char *ptr)
+{
+        strncpy(celleb_machine_type, ptr, sizeof(celleb_machine_type));
+        celleb_machine_type[sizeof(celleb_machine_type)-1] = 0;
+        return 0;
+}
+
+__setup("celleb_machine_type_hack", celleb_machine_type_hack);
+
+static void celleb_progress(char *s, unsigned short hex)
+{
+        printk("*** %04x : %s\n", hex, s ? s : "");
+}
+
+static void __init celleb_setup_arch(void)
+{
+#ifdef CONFIG_SPU_BASE
+        spu_priv1_ops = &spu_priv1_beat_ops;
+        spu_management_ops = &spu_management_of_ops;
+#endif
+
+#ifdef CONFIG_SMP
+        smp_init_celleb();
+#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;
+        }
+
+#ifdef CONFIG_DUMMY_CONSOLE
+        conswitchp = &dummy_con;
+#endif
+}
+
+static void beat_power_save(void)
+{
+        beat_pause(0);
+}
+
+static int __init celleb_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        if (!of_flat_dt_is_compatible(root, "Beat"))
+                return 0;
+
+        powerpc_firmware_features |= FW_FEATURE_CELLEB_POSSIBLE;
+        hpte_init_beat();
+        return 1;
+}
+
+/*
+ * Cell has no legacy IO; anything calling this function has to
+ * fail or bad things will happen
+ */
+static int celleb_check_legacy_ioport(unsigned int baseport)
+{
+        return -ENODEV;
+}
+
+static void celleb_kexec_cpu_down(int crash, int secondary)
+{
+        beatic_deinit_IRQ();
+}
+
+static struct of_device_id celleb_bus_ids[] = {
+        { .type = "scc", },
+        { .type = "ioif", },    /* old style */
+        {},
+};
+
+static int __init celleb_publish_devices(void)
+{
+        if (!machine_is(celleb))
+                return 0;
+
+        /* Publish OF platform devices for southbridge IOs */
+        of_platform_bus_probe(NULL, celleb_bus_ids, NULL);
+
+        return 0;
+}
+device_initcall(celleb_publish_devices);
+
+define_machine(celleb) {
+        .name                   = "Cell Reference Set",
+        .probe                  = celleb_probe,
+        .setup_arch             = celleb_setup_arch,
+        .show_cpuinfo           = celleb_show_cpuinfo,
+        .restart                = beat_restart,
+        .power_off              = beat_power_off,
+        .halt                   = beat_halt,
+        .get_rtc_time           = beat_get_rtc_time,
+        .set_rtc_time           = beat_set_rtc_time,
+        .calibrate_decr         = generic_calibrate_decr,
+        .check_legacy_ioport    = celleb_check_legacy_ioport,
+        .progress               = celleb_progress,
+        .power_save             = beat_power_save,
+        .nvram_size             = beat_nvram_get_size,
+        .nvram_read             = beat_nvram_read,
+        .nvram_write            = beat_nvram_write,
+        .set_dabr               = beat_set_xdabr,
+        .init_IRQ               = beatic_init_IRQ,
+        .get_irq                = beatic_get_irq,
+        .pci_probe_mode         = celleb_pci_probe_mode,
+        .pci_setup_phb          = celleb_setup_phb,
+#ifdef CONFIG_KEXEC
+        .kexec_cpu_down         = celleb_kexec_cpu_down,
+        .machine_kexec          = default_machine_kexec,
+        .machine_kexec_prepare  = default_machine_kexec_prepare,
+        .machine_crash_shutdown = default_machine_crash_shutdown,
+#endif
+};
diff --git a/arch/powerpc/platforms/celleb/smp.c b/arch/powerpc/platforms/celleb/smp.c
new file mode 100644
index 000000000000..a7631250aeb4
--- /dev/null
+++ b/arch/powerpc/platforms/celleb/smp.c
@@ -0,0 +1,124 @@
+/*
+ * SMP support for Celleb platform. (Incomplete)
+ *
+ * (C) Copyright 2006 TOSHIBA CORPORATION
+ *
+ * This code is based on arch/powerpc/platforms/cell/smp.c:
+ * Dave Engebretsen, Peter Bergner, and
+ * Mike Corrigan {engebret|bergner|mikec}@us.ibm.com
+ * Plus various changes from other IBM teams...
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#undef DEBUG
+
+#include <linux/kernel.h>
+#include <linux/smp.h>
+#include <linux/interrupt.h>
+#include <linux/init.h>
+#include <linux/threads.h>
+#include <linux/cpu.h>
+
+#include <asm/irq.h>
+#include <asm/smp.h>
+#include <asm/machdep.h>
+#include <asm/udbg.h>
+
+#include "interrupt.h"
+
+#ifdef DEBUG
+#define DBG(fmt...) udbg_printf(fmt)
+#else
+#define DBG(fmt...)
+#endif
+
+/*
+ * The primary thread of each non-boot processor is recorded here before
+ * smp init.
+ */
+/* static cpumask_t of_spin_map; */
+
+/**
+ * smp_startup_cpu() - start the given cpu
+ *
+ * At boot time, there is nothing to do for primary threads which were
+ * started from Open Firmware.  For anything else, call RTAS with the
+ * appropriate start location.
+ *
+ * Returns:
+ *      0       - failure
+ *      1       - success
+ */
+static inline int __devinit smp_startup_cpu(unsigned int lcpu)
+{
+        return 0;
+}
+
+static void smp_beatic_message_pass(int target, int msg)
+{
+        unsigned int i;
+
+        if (target < NR_CPUS) {
+                beatic_cause_IPI(target, msg);
+        } else {
+                for_each_online_cpu(i) {
+                        if (target == MSG_ALL_BUT_SELF
+                            && i == smp_processor_id())
+                                continue;
+                        beatic_cause_IPI(i, msg);
+                }
+        }
+}
+
+static int __init smp_beatic_probe(void)
+{
+        return cpus_weight(cpu_possible_map);
+}
+
+static void __devinit smp_beatic_setup_cpu(int cpu)
+{
+        beatic_setup_cpu(cpu);
+}
+
+static void __devinit smp_celleb_kick_cpu(int nr)
+{
+        BUG_ON(nr < 0 || nr >= NR_CPUS);
+
+        if (!smp_startup_cpu(nr))
+                return;
+}
+
+static int smp_celleb_cpu_bootable(unsigned int nr)
+{
+        return 1;
+}
+static struct smp_ops_t bpa_beatic_smp_ops = {
+        .message_pass   = smp_beatic_message_pass,
+        .probe          = smp_beatic_probe,
+        .kick_cpu       = smp_celleb_kick_cpu,
+        .setup_cpu      = smp_beatic_setup_cpu,
+        .cpu_bootable   = smp_celleb_cpu_bootable,
+};
+
+/* This is called very early */
+void __init smp_init_celleb(void)
+{
+        DBG(" -> smp_init_celleb()\n");
+
+        smp_ops = &bpa_beatic_smp_ops;
+
+        DBG(" <- smp_init_celleb()\n");
+}