Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 816cb49a authored by Geoff Levand's avatar Geoff Levand Committed by Benjamin Herrenschmidt
Browse files

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: default avatarGeoff Levand <geoff@infradead.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent b5ecc559

arch/powerpc/include/asm/lv1call.h

+1 −1
Original line number Diff line number Diff line
@@ -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 )

arch/powerpc/kernel/irq.c

+2 −2
Original line number Diff line number Diff line
@@ -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();

arch/powerpc/platforms/ps3/setup.c

+3 −1
Original line number Diff line number Diff line
@@ -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);