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

Commit 7db35f31 authored by David S. Miller's avatar David S. Miller
Browse files

[SPARC64]: Fill holes in hypervisor APIs and fix KTSB registry. 



Several interfaces were missing and others misnumbered or
improperly documented.

Also, make sure to check the return value when registering
the kernel TSBs with the hypervisor.  This helped to find
the 4MB kernel TSB alignment bug fixed in a previous changeset.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2d9e2763

arch/sparc64/kernel/entry.S

+547 −7
Original line number Diff line number Diff line
@@ -1725,96 +1725,142 @@ real_hard_smp_processor_id: 
	 * returns %o0: sysino

	 */

	.globl	sun4v_devino_to_sysino

	.type	sun4v_devino_to_sysino,#function

sun4v_devino_to_sysino:

	mov	HV_FAST_INTR_DEVINO2SYSINO, %o5

	ta	HV_FAST_TRAP

	retl

	 mov	%o1, %o0

	.size	sun4v_devino_to_sysino, .-sun4v_devino_to_sysino



	/* %o0: sysino

	 *

	 * returns %o0: intr_enabled (HV_INTR_{DISABLED,ENABLED})

	 */

	.globl	sun4v_intr_getenabled

	.type	sun4v_intr_getenabled,#function

sun4v_intr_getenabled:

	mov	HV_FAST_INTR_GETENABLED, %o5

	ta	HV_FAST_TRAP

	retl

	 mov	%o1, %o0

	.size	sun4v_intr_getenabled, .-sun4v_intr_getenabled



	/* %o0: sysino

	 * %o1: intr_enabled (HV_INTR_{DISABLED,ENABLED})

	 */

	.globl	sun4v_intr_setenabled

	.type	sun4v_intr_setenabled,#function

sun4v_intr_setenabled:

	mov	HV_FAST_INTR_SETENABLED, %o5

	ta	HV_FAST_TRAP

	retl

	 nop

	.size	sun4v_intr_setenabled, .-sun4v_intr_setenabled



	/* %o0: sysino

	 *

	 * returns %o0: intr_state (HV_INTR_STATE_*)

	 */

	.globl	sun4v_intr_getstate

	.type	sun4v_intr_getstate,#function

sun4v_intr_getstate:

	mov	HV_FAST_INTR_GETSTATE, %o5

	ta	HV_FAST_TRAP

	retl

	 mov	%o1, %o0

	.size	sun4v_intr_getstate, .-sun4v_intr_getstate



	/* %o0: sysino

	 * %o1: intr_state (HV_INTR_STATE_*)

	 */

	.globl	sun4v_intr_setstate

	.type	sun4v_intr_setstate,#function

sun4v_intr_setstate:

	mov	HV_FAST_INTR_SETSTATE, %o5

	ta	HV_FAST_TRAP

	retl

	 nop

	.size	sun4v_intr_setstate, .-sun4v_intr_setstate



	/* %o0: sysino

	 *

	 * returns %o0: cpuid

	 */

	.globl	sun4v_intr_gettarget

	.type	sun4v_intr_gettarget,#function

sun4v_intr_gettarget:

	mov	HV_FAST_INTR_GETTARGET, %o5

	ta	HV_FAST_TRAP

	retl

	 mov	%o1, %o0

	.size	sun4v_intr_gettarget, .-sun4v_intr_gettarget



	/* %o0: sysino

	 * %o1: cpuid

	 */

	.globl	sun4v_intr_settarget

	.type	sun4v_intr_settarget,#function

sun4v_intr_settarget:

	mov	HV_FAST_INTR_SETTARGET, %o5

	ta	HV_FAST_TRAP

	retl

	 nop

	.size	sun4v_intr_settarget, .-sun4v_intr_settarget



	/* %o0:	type

	 * %o1:	queue paddr

	 * %o2:	num queue entries

	/* %o0:	cpuid

	 * %o1: pc

	 * %o2:	rtba

	 * %o3:	arg0

	 *

	 * returns %o0:	status

	 */

	.globl	sun4v_cpu_qconf

sun4v_cpu_qconf:

	mov	HV_FAST_CPU_QCONF, %o5

	.globl	sun4v_cpu_start

	.type	sun4v_cpu_start,#function

sun4v_cpu_start:

	mov	HV_FAST_CPU_START, %o5

	ta	HV_FAST_TRAP

	retl

	 nop

	.size	sun4v_cpu_start, .-sun4v_cpu_start



	/* returns %o0:	status

	/* %o0:	cpuid

	 *

	 * returns %o0: status

	 */

	.globl	sun4v_cpu_stop

	.type	sun4v_cpu_stop,#function

sun4v_cpu_stop:

	mov	HV_FAST_CPU_STOP, %o5

	ta	HV_FAST_TRAP

	retl

	 nop

	.size	sun4v_cpu_stop, .-sun4v_cpu_stop



	/* returns %o0:	status  */

	.globl	sun4v_cpu_yield

	.type	sun4v_cpu_yield, #function

sun4v_cpu_yield:

	mov	HV_FAST_CPU_YIELD, %o5

	ta	HV_FAST_TRAP

	retl

	 nop

	.size	sun4v_cpu_yield, .-sun4v_cpu_yield



	/* %o0:	type

	 * %o1:	queue paddr

	 * %o2:	num queue entries

	 *

	 * returns %o0:	status

	 */

	.globl	sun4v_cpu_qconf

	.type	sun4v_cpu_qconf,#function

sun4v_cpu_qconf:

	mov	HV_FAST_CPU_QCONF, %o5

	ta	HV_FAST_TRAP

	retl

	 nop

	.size	sun4v_cpu_qconf, .-sun4v_cpu_qconf



	/* %o0:	num cpus in cpu list

	 * %o1:	cpu list paddr
@@ -1823,11 +1869,13 @@ sun4v_cpu_yield: 
	 * returns %o0: status

	 */

	.globl	sun4v_cpu_mondo_send

	.type	sun4v_cpu_mondo_send,#function

sun4v_cpu_mondo_send:

	mov	HV_FAST_CPU_MONDO_SEND, %o5

	ta	HV_FAST_TRAP

	retl

	 nop

	.size	sun4v_cpu_mondo_send, .-sun4v_cpu_mondo_send



	/* %o0:	CPU ID

	 *
@@ -1835,6 +1883,7 @@ sun4v_cpu_mondo_send: 
	 *         %o0:	cpu state as HV_CPU_STATE_*

	 */

	.globl	sun4v_cpu_state

	.type	sun4v_cpu_state,#function

sun4v_cpu_state:

	mov	HV_FAST_CPU_STATE, %o5

	ta	HV_FAST_TRAP
@@ -1843,6 +1892,37 @@ sun4v_cpu_state: 
	mov	%o1, %o0

1:	retl

	 nop

	.size	sun4v_cpu_state, .-sun4v_cpu_state



	/* %o0: virtual address

	 * %o1: must be zero

	 * %o2: TTE

	 * %o3: HV_MMU_* flags

	 *

	 * returns %o0: status

	 */

	.globl	sun4v_mmu_map_perm_addr

	.type	sun4v_mmu_map_perm_addr,#function

sun4v_mmu_map_perm_addr:

	mov	HV_FAST_MMU_MAP_PERM_ADDR, %o5

	ta	HV_FAST_TRAP

	retl

	 nop

	.size	sun4v_mmu_map_perm_addr, .-sun4v_mmu_map_perm_addr



	/* %o0: number of TSB descriptions

	 * %o1: TSB descriptions real address

	 *

	 * returns %o0: status

	 */

	.globl	sun4v_mmu_tsb_ctx0

	.type	sun4v_mmu_tsb_ctx0,#function

sun4v_mmu_tsb_ctx0:

	mov	HV_FAST_MMU_TSB_CTX0, %o5

	ta	HV_FAST_TRAP

	retl

	 nop

	.size	sun4v_mmu_tsb_ctx0, .-sun4v_mmu_tsb_ctx0



	/* %o0:	API group number

	 * %o1: pointer to unsigned long major number storage
@@ -1851,6 +1931,7 @@ sun4v_cpu_state: 
	 * returns %o0: status

	 */

	.globl	sun4v_get_version

	.type	sun4v_get_version,#function

sun4v_get_version:

	mov	HV_CORE_GET_VER, %o5

	mov	%o1, %o3
@@ -1859,6 +1940,7 @@ sun4v_get_version: 
	stx	%o1, [%o3]

	retl

	 stx	%o2, [%o4]

	.size	sun4v_get_version, .-sun4v_get_version



	/* %o0: API group number

	 * %o1: desired major number
@@ -1868,18 +1950,49 @@ sun4v_get_version: 
	 * returns %o0: status

	 */

	.globl	sun4v_set_version

	.type	sun4v_set_version,#function

sun4v_set_version:

	mov	HV_CORE_SET_VER, %o5

	mov	%o3, %o4

	ta	HV_CORE_TRAP

	retl

	 stx	%o1, [%o4]

	.size	sun4v_set_version, .-sun4v_set_version



	/* %o0: pointer to unsigned long time

	 *

	 * returns %o0: status

	 */

	.globl	sun4v_tod_get

	.type	sun4v_tod_get,#function

sun4v_tod_get:

	mov	%o0, %o4

	mov	HV_FAST_TOD_GET, %o5

	ta	HV_FAST_TRAP

	stx	%o1, [%o4]

	retl

	 nop

	.size	sun4v_tod_get, .-sun4v_tod_get



	/* %o0: time

	 *

	 * returns %o0: status

	 */

	.globl	sun4v_tod_set

	.type	sun4v_tod_set,#function

sun4v_tod_set:

	mov	HV_FAST_TOD_SET, %o5

	ta	HV_FAST_TRAP

	retl

	 nop

	.size	sun4v_tod_set, .-sun4v_tod_set



	/* %o0: pointer to unsigned long status

	 *

	 * returns %o0: signed character

	 */

	.globl	sun4v_con_getchar

	.type	sun4v_con_getchar,#function

sun4v_con_getchar:

	mov	%o0, %o4

	mov	HV_FAST_CONS_GETCHAR, %o5
@@ -1889,17 +2002,20 @@ sun4v_con_getchar: 
	stx	%o0, [%o4]

	retl

	 sra	%o1, 0, %o0

	.size	sun4v_con_getchar, .-sun4v_con_getchar



	/* %o0: signed long character

	 *

	 * returns %o0: status

	 */

	.globl	sun4v_con_putchar

	.type	sun4v_con_putchar,#function

sun4v_con_putchar:

	mov	HV_FAST_CONS_PUTCHAR, %o5

	ta	HV_FAST_TRAP

	retl

	 sra	%o0, 0, %o0

	.size	sun4v_con_putchar, .-sun4v_con_putchar



	/* %o0: buffer real address

	 * %o1: buffer size
@@ -1908,6 +2024,7 @@ sun4v_con_putchar: 
	 * returns %o0: status

	 */

	.globl	sun4v_con_read

	.type	sun4v_con_read,#function

sun4v_con_read:

	mov	%o2, %o4

	mov	HV_FAST_CONS_READ, %o5
@@ -1922,6 +2039,7 @@ sun4v_con_read: 
	stx	%o1, [%o4]

1:	retl

	 nop

	.size	sun4v_con_read, .-sun4v_con_read



	/* %o0: buffer real address

	 * %o1: buffer size
@@ -1930,6 +2048,7 @@ sun4v_con_read: 
	 * returns %o0: status

	 */

	.globl	sun4v_con_write

	.type	sun4v_con_write,#function

sun4v_con_write:

	mov	%o2, %o4

	mov	HV_FAST_CONS_WRITE, %o5
@@ -1937,6 +2056,7 @@ sun4v_con_write: 
	stx	%o1, [%o4]

	retl

	 nop

	.size	sun4v_con_write, .-sun4v_con_write



	/* %o0:	soft state

	 * %o1:	address of description string
@@ -1944,13 +2064,35 @@ sun4v_con_write: 
	 * returns %o0: status

	 */

	.globl	sun4v_mach_set_soft_state

	.type	sun4v_mach_set_soft_state,#function

sun4v_mach_set_soft_state:

	mov	HV_FAST_MACH_SET_SOFT_STATE, %o5

	ta	HV_FAST_TRAP

	retl

	 nop

	.size	sun4v_mach_set_soft_state, .-sun4v_mach_set_soft_state



	/* %o0: exit code

	 *

	 * Does not return.

	 */

	.globl	sun4v_mach_exit

	.type	sun4v_mach_exit,#function

sun4v_mach_exit:

	mov	HV_FAST_MACH_EXIT, %o5

	ta	HV_FAST_TRAP

	retl

	 nop

	.size	sun4v_mach_exit, .-sun4v_mach_exit



	/* %o0: buffer real address

	 * %o1: buffer length

	 * %o2: pointer to unsigned long real_buf_len

	 *

	 * returns %o0: status

	 */

	.globl	sun4v_mach_desc

	.type	sun4v_mach_desc,#function

sun4v_mach_desc:

	mov	%o2, %o4

	mov	HV_FAST_MACH_DESC, %o5
@@ -1958,3 +2100,401 @@ sun4v_mach_desc: 
	stx	%o1, [%o4]

	retl

	 nop

	.size	sun4v_mach_desc, .-sun4v_mach_desc



	/* %o0: new timeout in milliseconds

	 * %o1: pointer to unsigned long orig_timeout

	 *

	 * returns %o0: status

	 */

	.globl	sun4v_mach_set_watchdog

	.type	sun4v_mach_set_watchdog,#function

sun4v_mach_set_watchdog:

	mov	%o1, %o4

	mov	HV_FAST_MACH_SET_WATCHDOG, %o5

	ta	HV_FAST_TRAP

	stx	%o1, [%o4]

	retl

	 nop

	.size	sun4v_mach_set_watchdog, .-sun4v_mach_set_watchdog



	/* No inputs and does not return.  */

	.globl	sun4v_mach_sir

	.type	sun4v_mach_sir,#function

sun4v_mach_sir:

	mov	%o1, %o4

	mov	HV_FAST_MACH_SIR, %o5

	ta	HV_FAST_TRAP

	stx	%o1, [%o4]

	retl

	 nop

	.size	sun4v_mach_sir, .-sun4v_mach_sir



	/* %o0: channel

	 * %o1:	ra

	 * %o2:	num_entries

	 *

	 * returns %o0:	status

	 */

	.globl	sun4v_ldc_tx_qconf

	.type	sun4v_ldc_tx_qconf,#function

sun4v_ldc_tx_qconf:

	mov	HV_FAST_LDC_TX_QCONF, %o5

	ta	HV_FAST_TRAP

	retl

	 nop

	.size	sun4v_ldc_tx_qconf, .-sun4v_ldc_tx_qconf



	/* %o0: channel

	 * %o1:	pointer to unsigned long ra

	 * %o2:	pointer to unsigned long num_entries

	 *

	 * returns %o0:	status

	 */

	.globl	sun4v_ldc_tx_qinfo

	.type	sun4v_ldc_tx_qinfo,#function

sun4v_ldc_tx_qinfo:

	mov	%o1, %g1

	mov	%o2, %g2

	mov	HV_FAST_LDC_TX_QINFO, %o5

	ta	HV_FAST_TRAP

	stx	%o1, [%g1]

	stx	%o2, [%g2]

	retl

	 nop

	.size	sun4v_ldc_tx_qinfo, .-sun4v_ldc_tx_qinfo



	/* %o0: channel

	 * %o1:	pointer to unsigned long head_off

	 * %o2:	pointer to unsigned long tail_off

	 * %o2:	pointer to unsigned long chan_state

	 *

	 * returns %o0:	status

	 */

	.globl	sun4v_ldc_tx_get_state

	.type	sun4v_ldc_tx_get_state,#function

sun4v_ldc_tx_get_state:

	mov	%o1, %g1

	mov	%o2, %g2

	mov	%o3, %g3

	mov	HV_FAST_LDC_TX_GET_STATE, %o5

	ta	HV_FAST_TRAP

	stx	%o1, [%g1]

	stx	%o2, [%g2]

	stx	%o3, [%g3]

	retl

	 nop

	.size	sun4v_ldc_tx_get_state, .-sun4v_ldc_tx_get_state



	/* %o0: channel

	 * %o1:	tail_off

	 *

	 * returns %o0:	status

	 */

	.globl	sun4v_ldc_tx_set_qtail

	.type	sun4v_ldc_tx_set_qtail,#function

sun4v_ldc_tx_set_qtail:

	mov	HV_FAST_LDC_TX_SET_QTAIL, %o5

	ta	HV_FAST_TRAP

	retl

	 nop

	.size	sun4v_ldc_tx_set_qtail, .-sun4v_ldc_tx_set_qtail



	/* %o0: channel

	 * %o1:	ra

	 * %o2:	num_entries

	 *

	 * returns %o0:	status

	 */

	.globl	sun4v_ldc_rx_qconf

	.type	sun4v_ldc_rx_qconf,#function

sun4v_ldc_rx_qconf:

	mov	HV_FAST_LDC_RX_QCONF, %o5

	ta	HV_FAST_TRAP

	retl

	 nop

	.size	sun4v_ldc_rx_qconf, .-sun4v_ldc_rx_qconf



	/* %o0: channel

	 * %o1:	pointer to unsigned long ra

	 * %o2:	pointer to unsigned long num_entries

	 *

	 * returns %o0:	status

	 */

	.globl	sun4v_ldc_rx_qinfo

	.type	sun4v_ldc_rx_qinfo,#function

sun4v_ldc_rx_qinfo:

	mov	%o1, %g1

	mov	%o2, %g2

	mov	HV_FAST_LDC_RX_QINFO, %o5

	ta	HV_FAST_TRAP

	stx	%o1, [%g1]

	stx	%o2, [%g2]

	retl

	 nop

	.size	sun4v_ldc_rx_qinfo, .-sun4v_ldc_rx_qinfo



	/* %o0: channel

	 * %o1:	pointer to unsigned long head_off

	 * %o2:	pointer to unsigned long tail_off

	 * %o2:	pointer to unsigned long chan_state

	 *

	 * returns %o0:	status

	 */

	.globl	sun4v_ldc_rx_get_state

	.type	sun4v_ldc_rx_get_state,#function

sun4v_ldc_rx_get_state:

	mov	%o1, %g1

	mov	%o2, %g2

	mov	%o3, %g3

	mov	HV_FAST_LDC_RX_GET_STATE, %o5

	ta	HV_FAST_TRAP

	stx	%o1, [%g1]

	stx	%o2, [%g2]

	stx	%o3, [%g3]

	retl

	 nop

	.size	sun4v_ldc_rx_get_state, .-sun4v_ldc_rx_get_state



	/* %o0: channel

	 * %o1:	head_off

	 *

	 * returns %o0:	status

	 */

	.globl	sun4v_ldc_rx_set_qhead

	.type	sun4v_ldc_rx_set_qhead,#function

sun4v_ldc_rx_set_qhead:

	mov	HV_FAST_LDC_RX_SET_QHEAD, %o5

	ta	HV_FAST_TRAP

	retl

	 nop

	.size	sun4v_ldc_rx_set_qhead, .-sun4v_ldc_rx_set_qhead



	/* %o0: channel

	 * %o1:	ra

	 * %o2:	num_entries

	 *

	 * returns %o0: status

	 */

	.globl	sun4v_ldc_set_map_table

	.type	sun4v_ldc_set_map_table,#function

sun4v_ldc_set_map_table:

	mov	HV_FAST_LDC_SET_MAP_TABLE, %o5

	ta	HV_FAST_TRAP

	retl

	 nop

	.size	sun4v_ldc_set_map_table, .-sun4v_ldc_set_map_table



	/* %o0: channel

	 * %o1:	pointer to unsigned long ra

	 * %o2:	pointer to unsigned long num_entries

	 *

	 * returns %o0: status

	 */

	.globl	sun4v_ldc_get_map_table

	.type	sun4v_ldc_get_map_table,#function

sun4v_ldc_get_map_table:

	mov	%o1, %g1

	mov	%o2, %g2

	mov	HV_FAST_LDC_GET_MAP_TABLE, %o5

	ta	HV_FAST_TRAP

	stx	%o1, [%g1]

	stx	%o2, [%g2]

	retl

	 nop

	.size	sun4v_ldc_get_map_table, .-sun4v_ldc_get_map_table



	/* %o0:	channel

	 * %o1:	dir_code

	 * %o2:	tgt_raddr

	 * %o3:	lcl_raddr

	 * %o4:	len

	 * %o5:	pointer to unsigned long actual_len

	 *

	 * returns %o0:	status

	 */

	.globl	sun4v_ldc_copy

	.type	sun4v_ldc_copy,#function

sun4v_ldc_copy:

	mov	%o5, %g1

	mov	HV_FAST_LDC_COPY, %o5

	ta	HV_FAST_TRAP

	stx	%o1, [%g1]

	retl

	 nop

	.size	sun4v_ldc_copy, .-sun4v_ldc_copy



	/* %o0:	channel

	 * %o1:	cookie

	 * %o2:	pointer to unsigned long ra

	 * %o3:	pointer to unsigned long perm

	 *

	 * returns %o0:	status

	 */

	.globl	sun4v_ldc_mapin

	.type	sun4v_ldc_mapin,#function

sun4v_ldc_mapin:

	mov	%o2, %g1

	mov	%o3, %g2

	mov	HV_FAST_LDC_MAPIN, %o5

	ta	HV_FAST_TRAP

	stx	%o1, [%g1]

	stx	%o2, [%g2]

	retl

	 nop

	.size	sun4v_ldc_mapin, .-sun4v_ldc_mapin



	/* %o0:	ra

	 *

	 * returns %o0:	status

	 */

	.globl	sun4v_ldc_unmap

	.type	sun4v_ldc_unmap,#function

sun4v_ldc_unmap:

	mov	HV_FAST_LDC_UNMAP, %o5

	ta	HV_FAST_TRAP

	retl

	 nop

	.size	sun4v_ldc_unmap, .-sun4v_ldc_unmap



	/* %o0:	cookie

	 * %o1:	mte_cookie

	 *

	 * returns %o0:	status

	 */

	.globl	sun4v_ldc_revoke

	.type	sun4v_ldc_revoke,#function

sun4v_ldc_revoke:

	mov	HV_FAST_LDC_REVOKE, %o5

	ta	HV_FAST_TRAP

	retl

	 nop

	.size	sun4v_ldc_revoke, .-sun4v_ldc_revoke



	/* %o0: device handle

	 * %o1:	device INO

	 * %o2:	pointer to unsigned long cookie

	 *

	 * returns %o0: status

	 */

	.globl	sun4v_vintr_get_cookie

	.type	sun4v_vintr_get_cookie,#function

sun4v_vintr_get_cookie:

	mov	%o2, %g1

	mov	HV_FAST_VINTR_GET_COOKIE, %o5

	ta	HV_FAST_TRAP

	stx	%o1, [%g1]

	retl

	 nop

	.size	sun4v_vintr_get_cookie, .-sun4v_vintr_get_cookie



	/* %o0: device handle

	 * %o1:	device INO

	 * %o2:	cookie

	 *

	 * returns %o0: status

	 */

	.globl	sun4v_vintr_set_cookie

	.type	sun4v_vintr_set_cookie,#function

sun4v_vintr_set_cookie:

	mov	HV_FAST_VINTR_SET_COOKIE, %o5

	ta	HV_FAST_TRAP

	retl

	 nop

	.size	sun4v_vintr_set_cookie, .-sun4v_vintr_set_cookie



	/* %o0: device handle

	 * %o1:	device INO

	 * %o2:	pointer to unsigned long valid_state

	 *

	 * returns %o0: status

	 */

	.globl	sun4v_vintr_get_valid

	.type	sun4v_vintr_get_valid,#function

sun4v_vintr_get_valid:

	mov	%o2, %g1

	mov	HV_FAST_VINTR_GET_VALID, %o5

	ta	HV_FAST_TRAP

	stx	%o1, [%g1]

	retl

	 nop

	.size	sun4v_vintr_get_valid, .-sun4v_vintr_get_valid



	/* %o0: device handle

	 * %o1:	device INO

	 * %o2:	valid_state

	 *

	 * returns %o0: status

	 */

	.globl	sun4v_vintr_set_valid

	.type	sun4v_vintr_set_valid,#function

sun4v_vintr_set_valid:

	mov	HV_FAST_VINTR_SET_VALID, %o5

	ta	HV_FAST_TRAP

	retl

	 nop

	.size	sun4v_vintr_set_valid, .-sun4v_vintr_set_valid



	/* %o0: device handle

	 * %o1:	device INO

	 * %o2:	pointer to unsigned long state

	 *

	 * returns %o0: status

	 */

	.globl	sun4v_vintr_get_state

	.type	sun4v_vintr_get_state,#function

sun4v_vintr_get_state:

	mov	%o2, %g1

	mov	HV_FAST_VINTR_GET_STATE, %o5

	ta	HV_FAST_TRAP

	stx	%o1, [%g1]

	retl

	 nop

	.size	sun4v_vintr_get_state, .-sun4v_vintr_get_state



	/* %o0: device handle

	 * %o1:	device INO

	 * %o2:	state

	 *

	 * returns %o0: status

	 */

	.globl	sun4v_vintr_set_state

	.type	sun4v_vintr_set_state,#function

sun4v_vintr_set_state:

	mov	HV_FAST_VINTR_SET_STATE, %o5

	ta	HV_FAST_TRAP

	retl

	 nop

	.size	sun4v_vintr_set_state, .-sun4v_vintr_set_state



	/* %o0: device handle

	 * %o1:	device INO

	 * %o2:	pointer to unsigned long cpuid

	 *

	 * returns %o0: status

	 */

	.globl	sun4v_vintr_get_target

	.type	sun4v_vintr_get_target,#function

sun4v_vintr_get_target:

	mov	%o2, %g1

	mov	HV_FAST_VINTR_GET_TARGET, %o5

	ta	HV_FAST_TRAP

	stx	%o1, [%g1]

	retl

	 nop

	.size	sun4v_vintr_get_target, .-sun4v_vintr_get_target



	/* %o0: device handle

	 * %o1:	device INO

	 * %o2:	cpuid

	 *

	 * returns %o0: status

	 */

	.globl	sun4v_vintr_set_target

	.type	sun4v_vintr_set_target,#function

sun4v_vintr_set_target:

	mov	HV_FAST_VINTR_SET_TARGET, %o5

	ta	HV_FAST_TRAP

	retl

	 nop

	.size	sun4v_vintr_set_target, .-sun4v_vintr_set_target

arch/sparc64/kernel/time.c

+9 −23
Original line number Diff line number Diff line
@@ -680,22 +680,14 @@ static int starfire_set_time(u32 val) 


static u32 hypervisor_get_time(void)

{

	register unsigned long func asm("%o5");

	register unsigned long arg0 asm("%o0");

	register unsigned long arg1 asm("%o1");

	unsigned long ret, time;

	int retries = 10000;



retry:

	func = HV_FAST_TOD_GET;

	arg0 = 0;

	arg1 = 0;

	__asm__ __volatile__("ta	%6"

			     : "=&r" (func), "=&r" (arg0), "=&r" (arg1)

			     : "0" (func), "1" (arg0), "2" (arg1),

			       "i" (HV_FAST_TRAP));

	if (arg0 == HV_EOK)

		return arg1;

	if (arg0 == HV_EWOULDBLOCK) {

	ret = sun4v_tod_get(&time);

	if (ret == HV_EOK)

		return time;

	if (ret == HV_EWOULDBLOCK) {

		if (--retries > 0) {

			udelay(100);

			goto retry;
@@ -709,20 +701,14 @@ static u32 hypervisor_get_time(void) 


static int hypervisor_set_time(u32 secs)

{

	register unsigned long func asm("%o5");

	register unsigned long arg0 asm("%o0");

	unsigned long ret;

	int retries = 10000;



retry:

	func = HV_FAST_TOD_SET;

	arg0 = secs;

	__asm__ __volatile__("ta	%4"

			     : "=&r" (func), "=&r" (arg0)

			     : "0" (func), "1" (arg0),

			       "i" (HV_FAST_TRAP));

	if (arg0 == HV_EOK)

	ret = sun4v_tod_set(secs);

	if (ret == HV_EOK)

		return 0;

	if (arg0 == HV_EWOULDBLOCK) {

	if (ret == HV_EWOULDBLOCK) {

		if (--retries > 0) {

			udelay(100);

			goto retry;

arch/sparc64/mm/init.c

+11 −30
Original line number Diff line number Diff line
@@ -558,26 +558,11 @@ static void __init hypervisor_tlb_lock(unsigned long vaddr, 
				       unsigned long pte,

				       unsigned long mmu)

{

	register unsigned long func asm("%o5");

	register unsigned long arg0 asm("%o0");

	register unsigned long arg1 asm("%o1");

	register unsigned long arg2 asm("%o2");

	register unsigned long arg3 asm("%o3");



	func = HV_FAST_MMU_MAP_PERM_ADDR;

	arg0 = vaddr;

	arg1 = 0;

	arg2 = pte;

	arg3 = mmu;

	__asm__ __volatile__("ta	0x80"

			     : "=&r" (func), "=&r" (arg0),

			       "=&r" (arg1), "=&r" (arg2),

			       "=&r" (arg3)

			     : "0" (func), "1" (arg0), "2" (arg1),

			       "3" (arg2), "4" (arg3));

	if (arg0 != 0) {

	unsigned long ret = sun4v_mmu_map_perm_addr(vaddr, 0, pte, mmu);



	if (ret != 0) {

		prom_printf("hypervisor_tlb_lock[%lx:%lx:%lx:%lx]: "

			    "errors with %lx\n", vaddr, 0, pte, mmu, arg0);

			    "errors with %lx\n", vaddr, 0, pte, mmu, ret);

		prom_halt();

	}

}
@@ -1314,20 +1299,16 @@ static void __init sun4v_ktsb_init(void) 


void __cpuinit sun4v_ktsb_register(void)

{

	register unsigned long func asm("%o5");

	register unsigned long arg0 asm("%o0");

	register unsigned long arg1 asm("%o1");

	unsigned long pa;

	unsigned long pa, ret;



	pa = kern_base + ((unsigned long)&ktsb_descr[0] - KERNBASE);



	func = HV_FAST_MMU_TSB_CTX0;

	arg0 = NUM_KTSB_DESCR;

	arg1 = pa;

	__asm__ __volatile__("ta	%6"

			     : "=&r" (func), "=&r" (arg0), "=&r" (arg1)

			     : "0" (func), "1" (arg0), "2" (arg1),

			       "i" (HV_FAST_TRAP));

	ret = sun4v_mmu_tsb_ctx0(NUM_KTSB_DESCR, pa);

	if (ret != 0) {

		prom_printf("hypervisor_mmu_tsb_ctx0[%lx]: "

			    "errors with %lx\n", pa, ret);

		prom_halt();

	}

}



/* paging_init() sets up the page tables */

include/asm-sparc64/hypervisor.h

+593 −47

File changed.

Preview size limit exceeded, changes collapsed.