2 files changed, 32 insertions, 0 deletions

diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c
index 8b0569853fcd..cb91a81352bf 100644
--- a/arch/powerpc/platforms/ps3/setup.c
+++ b/arch/powerpc/platforms/ps3/setup.c
@@ -32,6 +32,7 @@
 #include <asm/udbg.h>
 #include <asm/prom.h>
 #include <asm/lv1call.h>
+#include <asm/ps3.h>
 
 #include "platform.h"
 
@@ -41,6 +42,19 @@
 #define DBG(fmt...) do{if(0)printk(fmt);}while(0)
 #endif
 
+int ps3_get_firmware_version(union ps3_firmware_version *v)
+{
+        int result = lv1_get_version_info(&v->raw);
+
+        if (result) {
+                v->raw = 0;
+                return -1;
+        }
+
+        return result;
+}
+EXPORT_SYMBOL_GPL(ps3_get_firmware_version);
+
 static void ps3_power_save(void)
 {
         /*
@@ -69,8 +83,14 @@ static void ps3_panic(char *str)
 
 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);
+
         ps3_spu_set_platform();
         ps3_map_htab();
 
diff --git a/include/asm-powerpc/ps3.h b/include/asm-powerpc/ps3.h
index 00a4c7d3c6d1..d1ae87df7776 100644
--- a/include/asm-powerpc/ps3.h
+++ b/include/asm-powerpc/ps3.h
@@ -27,6 +27,18 @@
 #include <linux/device.h>
 #include <scsi/scsi.h>
 
+union ps3_firmware_version {
+        u64 raw;
+        struct {
+                u16 pad;
+                u16 major;
+                u16 minor;
+                u16 rev;
+        };
+};
+
+int ps3_get_firmware_version(union ps3_firmware_version *v);
+
 /**
  * struct ps3_device_id - HV bus device identifier from the system repository
  * @bus_id: HV bus id, {1..} (zero invalid)