[POWERPC] celleb: Add support for native CBE

This adds support for native CBE on Celleb, that is, without the BEAT
hypervisor.  Many codes in platforms/cell/ are used in native CBE
environment.

Signed-off-by: Kou Ishizaki <Kou.Ishizaki@toshiba.co.jp>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index faabc3fdc130220ff7aeb8bd3ddc139e20157654..b465494cc24c2f6eb428f85892db6931538b5a6d 100644 (file)
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -34,6 +34,7 @@
 #include <asm/udbg.h>
 #include <asm/of_platform.h>
 #include <asm/lmb.h>
+#include <asm/firmware.h>
 #include <asm/cell-regs.h>
 
 #include "interrupt.h"
@@ -699,7 +700,8 @@ static int __init cell_iommu_init(void)
 {
        struct device_node *np;
 
-       if (!machine_is(cell))
+       if ((!machine_is(cell) && !machine_is(celleb)) ||
+           firmware_has_feature(FW_FEATURE_LPAR))
                return -ENODEV;
 
        /* If IOMMU is disabled or we have little enough RAM to not need

diff --git a/arch/powerpc/platforms/celleb/Kconfig b/arch/powerpc/platforms/celleb/Kconfig
index 04748d410fc99c782f8fc0a33a8024c1b82b2196..372891edcdd2dda7779935ed4bd4d96d2e84b0d2 100644 (file)
--- a/arch/powerpc/platforms/celleb/Kconfig
+++ b/arch/powerpc/platforms/celleb/Kconfig
@@ -2,6 +2,8 @@ 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_RTAS
        select PPC_INDIRECT_IO
        select PPC_OF_PLATFORM_PCI
        select HAS_TXX9_SERIAL

diff --git a/arch/powerpc/platforms/celleb/iommu.c b/arch/powerpc/platforms/celleb/iommu.c
index 755d869d8553c424b978c21a6da7978f438dd03b..287450a07c41c21c0588c297c9c9c0b803fd7e66 100644 (file)
--- a/arch/powerpc/platforms/celleb/iommu.c
+++ b/arch/powerpc/platforms/celleb/iommu.c
@@ -24,6 +24,7 @@
 #include <linux/pci.h>
 
 #include <asm/of_platform.h>
+#include <asm/firmware.h>
 
 #include "beat_wrapper.h"
 
@@ -91,7 +92,7 @@ static struct notifier_block celleb_of_bus_notifier = {
 
 static int __init celleb_init_iommu(void)
 {
-       if (!machine_is(celleb))
+       if (!firmware_has_feature(FW_FEATURE_BEAT))
                return -ENODEV;
 
        celleb_init_direct_mapping();

diff --git a/arch/powerpc/platforms/celleb/setup.c b/arch/powerpc/platforms/celleb/setup.c
index ddfb35ae741ff2abbdea105a79a2609623f67d07..5a3f73478f4b9489859ce045f52a34a1752c6bf9 100644 (file)
--- a/arch/powerpc/platforms/celleb/setup.c
+++ b/arch/powerpc/platforms/celleb/setup.c
@@ -53,11 +53,16 @@
 #include <asm/spu_priv1.h>
 #include <asm/firmware.h>
 #include <asm/of_platform.h>
+#include <asm/rtas.h>
+#include <asm/cell-regs.h>
 
 #include "interrupt.h"
 #include "beat_wrapper.h"
 #include "beat.h"
 #include "pci.h"
+#include "../cell/interrupt.h"
+#include "../cell/pervasive.h"
+#include "../cell/ras.h"
 
 static char celleb_machine_type[128] = "Celleb";
 
@@ -88,16 +93,74 @@ static void celleb_progress(char *s, unsigned short hex)
        printk("*** %04x : %s\n", hex, s ? s : "");
 }
 
-static void __init celleb_setup_arch(void)
+static void __init celleb_init_IRQ_native(void)
+{
+       iic_init_IRQ();
+       spider_init_IRQ();
+}
+
+static void __init celleb_setup_arch_beat(void)
 {
+       ppc_md.restart          = beat_restart;
+       ppc_md.power_off        = beat_power_off;
+       ppc_md.halt             = beat_halt;
+       ppc_md.get_rtc_time     = beat_get_rtc_time;
+       ppc_md.set_rtc_time     = beat_set_rtc_time;
+       ppc_md.power_save       = beat_power_save;
+       ppc_md.nvram_size       = beat_nvram_get_size;
+       ppc_md.nvram_read       = beat_nvram_read;
+       ppc_md.nvram_write      = beat_nvram_write;
+       ppc_md.set_dabr         = beat_set_xdabr;
+       ppc_md.init_IRQ         = beatic_init_IRQ;
+       ppc_md.get_irq          = beatic_get_irq;
+#ifdef CONFIG_KEXEC
+       ppc_md.kexec_cpu_down   = beat_kexec_cpu_down;
+#endif
+
 #ifdef CONFIG_SPU_BASE
-       spu_priv1_ops = &spu_priv1_beat_ops;
-       spu_management_ops = &spu_management_of_ops;
+       spu_priv1_ops           = &spu_priv1_beat_ops;
+       spu_management_ops      = &spu_management_of_ops;
 #endif
 
 #ifdef CONFIG_SMP
        smp_init_celleb();
 #endif
+}
+
+static void __init celleb_setup_arch_native(void)
+{
+       ppc_md.restart          = rtas_restart;
+       ppc_md.power_off        = rtas_power_off;
+       ppc_md.halt             = rtas_halt;
+       ppc_md.get_boot_time    = rtas_get_boot_time;
+       ppc_md.get_rtc_time     = rtas_get_rtc_time;
+       ppc_md.set_rtc_time     = rtas_set_rtc_time;
+       ppc_md.init_IRQ         = celleb_init_IRQ_native;
+
+#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
+
+       cbe_pervasive_init();
+}
+
+static void __init celleb_setup_arch(void)
+{
+       if (firmware_has_feature(FW_FEATURE_BEAT))
+               celleb_setup_arch_beat();
+       else
+               celleb_setup_arch_native();
 
        /* init to some ~sane value until calibrate_delay() runs */
        loops_per_jiffy = 50000000;
@@ -111,12 +174,19 @@ static int __init celleb_probe(void)
 {
        unsigned long root = of_get_flat_dt_root();
 
-       if (!of_flat_dt_is_compatible(root, "Beat"))
-               return 0;
+       if (of_flat_dt_is_compatible(root, "Beat")) {
+               powerpc_firmware_features |= FW_FEATURE_CELLEB_ALWAYS
+                       | FW_FEATURE_BEAT | FW_FEATURE_LPAR;
+               hpte_init_beat_v3();
+               return 1;
+       }
+       if (of_flat_dt_is_compatible(root, "TOSHIBA,Celleb")) {
+               powerpc_firmware_features |= FW_FEATURE_CELLEB_ALWAYS;
+               hpte_init_native();
+               return 1;
+       }
 
-       powerpc_firmware_features |= FW_FEATURE_CELLEB_POSSIBLE;
-       hpte_init_beat_v3();
-       return 1;
+       return 0;
 }
 
 static struct of_device_id celleb_bus_ids[] __initdata = {
@@ -144,24 +214,11 @@ define_machine(celleb) {
        .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,
        .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         = beat_kexec_cpu_down,
        .machine_kexec          = default_machine_kexec,
        .machine_kexec_prepare  = default_machine_kexec_prepare,
        .machine_crash_shutdown = default_machine_crash_shutdown,

diff --git a/include/asm-powerpc/firmware.h b/include/asm-powerpc/firmware.h
index 3671c128f271eae3806930d50bb54387b7cc0e6f..1e41bd1c85029de00f0ca7767e8c91ed19610ec8 100644 (file)
--- a/include/asm-powerpc/firmware.h
+++ b/include/asm-powerpc/firmware.h
@@ -64,7 +64,7 @@ enum {
        FW_FEATURE_PS3_POSSIBLE = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1,
        FW_FEATURE_PS3_ALWAYS = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1,
        FW_FEATURE_CELLEB_POSSIBLE = FW_FEATURE_LPAR | FW_FEATURE_BEAT,
-       FW_FEATURE_CELLEB_ALWAYS = FW_FEATURE_LPAR | FW_FEATURE_BEAT,
+       FW_FEATURE_CELLEB_ALWAYS = 0,
        FW_FEATURE_NATIVE_POSSIBLE = 0,
        FW_FEATURE_NATIVE_ALWAYS = 0,
        FW_FEATURE_POSSIBLE =