[POWERPC] PS3: Compare firmware version

[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 ac5df9688dcb9685e06434e901b0b200498dba84..b79d62b68df594db567c88b186eb429b609d647a 100644 (file)
--- a/arch/powerpc/platforms/ps3/setup.c
+++ b/arch/powerpc/platforms/ps3/setup.c
@@ -46,18 +46,26 @@
 static void smp_send_stop(void) {}
 #endif
 
-int ps3_get_firmware_version(union ps3_firmware_version *v)
+static union ps3_firmware_version ps3_firmware_version;
+
+void ps3_get_firmware_version(union ps3_firmware_version *v)
+{
+       *v = ps3_firmware_version;
+}
+EXPORT_SYMBOL_GPL(ps3_get_firmware_version);
+
+int ps3_compare_firmware_version(u16 major, u16 minor, u16 rev)
 {
-       int result = lv1_get_version_info(&v->raw);
+       union ps3_firmware_version x;
 
-       if (result) {
-               v->raw = 0;
-               return -1;
-       }
+       x.pad = 0;
+       x.major = major;
+       x.minor = minor;
+       x.rev = rev;
 
-       return result;
+       return (ps3_firmware_version.raw - x.raw);
 }
-EXPORT_SYMBOL_GPL(ps3_get_firmware_version);
+EXPORT_SYMBOL_GPL(ps3_compare_firmware_version);
 
 static void ps3_power_save(void)
 {
@@ -99,6 +107,7 @@ static void ps3_panic(char *str)
        while(1);
 }
 
+#ifdef CONFIG_FB_PS3
 static void prealloc(struct ps3_prealloc *p)
 {
        if (!p->size)
@@ -115,7 +124,6 @@ static void prealloc(struct ps3_prealloc *p)
               p->address);
 }
 
-#ifdef CONFIG_FB_PS3
 struct ps3_prealloc ps3fb_videomemory = {
     .name = "ps3fb videomemory",
     .size = CONFIG_FB_PS3_DEFAULT_SIZE_M*1024*1024,
@@ -137,16 +145,22 @@ early_param("ps3fb", early_parse_ps3fb);
 #define prealloc_ps3fb_videomemory()   do { } while (0)
 #endif
 
+static int ps3_set_dabr(u64 dabr)
+{
+       enum {DABR_USER = 1, DABR_KERNEL = 2,};
+
+       return lv1_set_dabr(dabr, DABR_KERNEL | DABR_USER) ? -1 : 0;
+}
 
 static void __init ps3_setup_arch(void)
 {
-       union ps3_firmware_version v;
 
        DBG(" -> %s:%d\n", __func__, __LINE__);
 
-       ps3_get_firmware_version(&v);
-       printk(KERN_INFO "PS3 firmware version %u.%u.%u\n", v.major, v.minor,
-               v.rev);
+       lv1_get_version_info(&ps3_firmware_version.raw);
+       printk(KERN_INFO "PS3 firmware version %u.%u.%u\n",
+              ps3_firmware_version.major, ps3_firmware_version.minor,
+              ps3_firmware_version.rev);
 
        ps3_spu_set_platform();
        ps3_map_htab();
@@ -234,6 +248,7 @@ define_machine(ps3) {
        .get_boot_time                  = ps3_get_boot_time,
        .set_rtc_time                   = ps3_set_rtc_time,
        .get_rtc_time                   = ps3_get_rtc_time,
+       .set_dabr                       = ps3_set_dabr,
        .calibrate_decr                 = ps3_calibrate_decr,
        .progress                       = ps3_progress,
        .restart                        = ps3_restart,