FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-20 00:11:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

powerpc/ps3: Fix hcall lv1_get_version_info

Browse Source 
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>
This commit is contained in:
Geoff Levand 2011-11-29 15:38:50 +00:00 committed by Benjamin Herrenschmidt
parent b5ecc5595e
commit 816cb49a4b
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/include/asm/lv1call.h
View File

@ -276,7 +276,7 @@ LV1_CALL(construct_io_irq_outlet, 1, 1, 120 )
LV1_CALL(destruct_io_irq_outlet, 1, 0, 121 ) LV1_CALL(destruct_io_irq_outlet, 1, 0, 121 )
LV1_CALL(map_htab, 1, 1, 122 ) LV1_CALL(map_htab, 1, 1, 122 )
LV1_CALL(unmap_htab, 1, 0, 123 ) 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(insert_htab_entry, 6, 3, 158 )
LV1_CALL(read_virtual_uart, 3, 1, 162 ) LV1_CALL(read_virtual_uart, 3, 1, 162 )
LV1_CALL(write_virtual_uart, 3, 1, 163 ) LV1_CALL(write_virtual_uart, 3, 1, 163 )

4
arch/powerpc/kernel/irq.c
View File

@ -186,8 +186,8 @@ notrace void arch_local_irq_restore(unsigned long en)
* Any HV call will have this side effect. * Any HV call will have this side effect.
*/ */
if (firmware_has_feature(FW_FEATURE_PS3_LV1)) { if (firmware_has_feature(FW_FEATURE_PS3_LV1)) {
u64 tmp; u64 tmp, tmp2;
lv1_get_version_info(&tmp); lv1_get_version_info(&tmp, &tmp2);
} }
__hard_irq_enable(); __hard_irq_enable();

4
arch/powerpc/platforms/ps3/setup.c
View File

@ -193,10 +193,12 @@ static int ps3_set_dabr(unsigned long dabr)
static void __init ps3_setup_arch(void) static void __init ps3_setup_arch(void)
{ {
u64 tmp;
DBG(" -> %s:%d\n", __func__, __LINE__); 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", printk(KERN_INFO "PS3 firmware version %u.%u.%u\n",
ps3_firmware_version.major, ps3_firmware_version.minor, ps3_firmware_version.major, ps3_firmware_version.minor,
ps3_firmware_version.rev); ps3_firmware_version.rev);