powerpc/ps3: set_dabr() takes an unsigned long

[safe/jmp/linux-2.6] / arch / powerpc / platforms / ps3 / setup.c

diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c
index 6b6eca1..3331ccb 100644 (file)
--- a/arch/powerpc/platforms/ps3/setup.c
+++ b/arch/powerpc/platforms/ps3/setup.c
@@ -23,7 +23,6 @@
 #include <linux/fs.h>
 #include <linux/root_dev.h>
 #include <linux/console.h>
-#include <linux/kexec.h>
 #include <linux/bootmem.h>
 
 #include <asm/machdep.h>
@@ -42,6 +41,10 @@
 #define DBG pr_debug
 #endif
 
+/* mutex synchronizing GPU accesses and video mode changes */
+DEFINE_MUTEX(ps3_gpu_mutex);
+EXPORT_SYMBOL_GPL(ps3_gpu_mutex);
+
 #if !defined(CONFIG_SMP)
 static void smp_send_stop(void) {}
 #endif
@@ -63,7 +66,8 @@ int ps3_compare_firmware_version(u16 major, u16 minor, u16 rev)
        x.minor = minor;
        x.rev = rev;
 
-       return (ps3_firmware_version.raw - x.raw);
+       return (ps3_firmware_version.raw > x.raw) -
+              (ps3_firmware_version.raw < x.raw);
 }
 EXPORT_SYMBOL_GPL(ps3_compare_firmware_version);
 
@@ -94,6 +98,14 @@ static void ps3_power_off(void)
        ps3_sys_manager_power_off(); /* never returns */
 }
 
+static void ps3_halt(void)
+{
+       DBG("%s:%d\n", __func__, __LINE__);
+
+       smp_send_stop();
+       ps3_sys_manager_halt(); /* never returns */
+}
+
 static void ps3_panic(char *str)
 {
        DBG("%s:%d %s\n", __func__, __LINE__, str);
@@ -104,18 +116,20 @@ static void ps3_panic(char *str)
        printk("   Please press POWER button.\n");
        printk("\n");
 
-       while(1);
+       while(1)
+               lv1_pause(1);
 }
 
-#if defined(CONFIG_FB_PS3) || defined(CONFIG_FB_PS3_MODULE)
-static void prealloc(struct ps3_prealloc *p)
+#if defined(CONFIG_FB_PS3) || defined(CONFIG_FB_PS3_MODULE) || \
+    defined(CONFIG_PS3_FLASH) || defined(CONFIG_PS3_FLASH_MODULE)
+static void __init prealloc(struct ps3_prealloc *p)
 {
        if (!p->size)
                return;
 
        p->address = __alloc_bootmem(p->size, p->align, __pa(MAX_DMA_ADDRESS));
        if (!p->address) {
-               printk(KERN_ERR "%s: Cannot allocate %s\n", __FUNCTION__,
+               printk(KERN_ERR "%s: Cannot allocate %s\n", __func__,
                       p->name);
                return;
        }
@@ -123,7 +137,9 @@ static void prealloc(struct ps3_prealloc *p)
        printk(KERN_INFO "%s: %lu bytes at %p\n", p->name, p->size,
               p->address);
 }
+#endif
 
+#if defined(CONFIG_FB_PS3) || defined(CONFIG_FB_PS3_MODULE)
 struct ps3_prealloc ps3fb_videomemory = {
        .name = "ps3fb videomemory",
        .size = CONFIG_FB_PS3_DEFAULT_SIZE_M*1024*1024,
@@ -146,7 +162,31 @@ early_param("ps3fb", early_parse_ps3fb);
 #define prealloc_ps3fb_videomemory()   do { } while (0)
 #endif
 
-static int ps3_set_dabr(u64 dabr)
+#if defined(CONFIG_PS3_FLASH) || defined(CONFIG_PS3_FLASH_MODULE)
+struct ps3_prealloc ps3flash_bounce_buffer = {
+       .name = "ps3flash bounce buffer",
+       .size = 256*1024,
+       .align = 256*1024
+};
+EXPORT_SYMBOL_GPL(ps3flash_bounce_buffer);
+#define prealloc_ps3flash_bounce_buffer()      prealloc(&ps3flash_bounce_buffer)
+
+static int __init early_parse_ps3flash(char *p)
+{
+       if (!p)
+               return 1;
+
+       if (!strcmp(p, "off"))
+               ps3flash_bounce_buffer.size = 0;
+
+       return 0;
+}
+early_param("ps3flash", early_parse_ps3flash);
+#else
+#define prealloc_ps3flash_bounce_buffer()      do { } while (0)
+#endif
+
+static int ps3_set_dabr(unsigned long dabr)
 {
        enum {DABR_USER = 1, DABR_KERNEL = 2,};
 
@@ -164,7 +204,6 @@ static void __init ps3_setup_arch(void)
               ps3_firmware_version.rev);
 
        ps3_spu_set_platform();
-       ps3_map_htab();
 
 #ifdef CONFIG_SMP
        smp_init_ps3();
@@ -175,7 +214,10 @@ static void __init ps3_setup_arch(void)
 #endif
 
        prealloc_ps3fb_videomemory();
+       prealloc_ps3flash_bounce_buffer();
+
        ppc_md.power_save = ps3_power_save;
+       ps3_os_area_init();
 
        DBG(" <- %s:%d\n", __func__, __LINE__);
 }
@@ -198,7 +240,7 @@ static int __init ps3_probe(void)
 
        powerpc_firmware_features |= FW_FEATURE_PS3_POSSIBLE;
 
-       ps3_os_area_init();
+       ps3_os_area_save_params();
        ps3_mm_init();
        ps3_mm_vas_create(&htab_size);
        ps3_hpte_init(htab_size);
@@ -235,10 +277,8 @@ define_machine(ps3) {
        .progress                       = ps3_progress,
        .restart                        = ps3_restart,
        .power_off                      = ps3_power_off,
+       .halt                           = ps3_halt,
 #if defined(CONFIG_KEXEC)
        .kexec_cpu_down                 = ps3_kexec_cpu_down,
-       .machine_kexec                  = default_machine_kexec,
-       .machine_kexec_prepare          = default_machine_kexec_prepare,
-       .machine_crash_shutdown         = default_machine_crash_shutdown,
 #endif
 };