powerpc/ps3: Fix hcall lv1_get_version_info

The lv1_get_version_info hcall takes 2, not 1 output
arguments.  Adjust the lv1 hcall table and all calls.

Usage:

  int lv1_get_version_info(u64 *version_number, u64 *vendor_id)

Signed-off-by: Geoff Levand <geoff@infradead.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

diff --git a/arch/powerpc/include/asm/lv1call.h b/arch/powerpc/include/asm/lv1call.h
index 3ddf66cb5c66da855f40448405b42b5964707754..84812211b8db1caba13afc94bcd7096b241ffd2c 100644 (file)
--- a/arch/powerpc/include/asm/lv1call.h
+++ b/arch/powerpc/include/asm/lv1call.h
@@ -276,7 +276,7 @@ LV1_CALL(construct_io_irq_outlet,                       1, 1, 120 )
 LV1_CALL(destruct_io_irq_outlet,                        1, 0, 121 )
 LV1_CALL(map_htab,                                      1, 1, 122 )
 LV1_CALL(unmap_htab,                                    1, 0, 123 )
-LV1_CALL(get_version_info,                              0, 1, 127 )
+LV1_CALL(get_version_info,                              0, 2, 127 )
 LV1_CALL(insert_htab_entry,                             6, 3, 158 )
 LV1_CALL(read_virtual_uart,                             3, 1, 162 )
 LV1_CALL(write_virtual_uart,                            3, 1, 163 )

diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 2ff4f5e596206c8bbadd0ed14a345f7bdcd01d1b..701d4aceb4f4ca72115426e32fb6fdc490370eb9 100644 (file)
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -186,8 +186,8 @@ notrace void arch_local_irq_restore(unsigned long en)
         * Any HV call will have this side effect.
         */
        if (firmware_has_feature(FW_FEATURE_PS3_LV1)) {
-               u64 tmp;
-               lv1_get_version_info(&tmp);
+               u64 tmp, tmp2;
+               lv1_get_version_info(&tmp, &tmp2);
        }
 
        __hard_irq_enable();

diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c
index e8ec1b2bfffd2a7b2f5eff77d57dc5ee872b27df..2d664c5a83b0230918979585af4eb06adea17ab9 100644 (file)
--- a/arch/powerpc/platforms/ps3/setup.c
+++ b/arch/powerpc/platforms/ps3/setup.c
@@ -193,10 +193,12 @@ static int ps3_set_dabr(unsigned long dabr)
 
 static void __init ps3_setup_arch(void)
 {
+       u64 tmp;
 
        DBG(" -> %s:%d\n", __func__, __LINE__);
 
-       lv1_get_version_info(&ps3_firmware_version.raw);
+       lv1_get_version_info(&ps3_firmware_version.raw, &tmp);
+
        printk(KERN_INFO "PS3 firmware version %u.%u.%u\n",
               ps3_firmware_version.major, ps3_firmware_version.minor,
               ps3_firmware_version.rev);