[SPARC64]: Move devino_to_sysino out of pci_sun4v_asm.S (85dfa19b) · Commits · 戴 / test

arch/sparc64/kernel/entry.S

+12 −0

Original line number	Diff line number	Diff line
		@@ -1695,3 +1695,15 @@ hard_smp_processor_id:
		retl
		nop
		#endif

		/* %o0: devhandle
		* %o1: devino
		*
		* returns %o0: sysino
		*/
		.globl pci_sun4v_devino_to_sysino
		sun4v_devino_to_sysino:
		mov HV_FAST_INTR_DEVINO2SYSINO, %o5
		ta HV_FAST_TRAP
		retl
		mov %o1, %o0

+0 −2

Original line number	Diff line number	Diff line
		@@ -6,8 +6,6 @@
		#ifndef _PCI_SUN4V_H
		#define _PCI_SUN4V_H

		extern unsigned long pci_sun4v_devino_to_sysino(unsigned long devhandle,
		unsigned long deino);
		extern unsigned long pci_sun4v_iommu_map(unsigned long devhandle,
		unsigned long tsbid,
		unsigned long num_ttes,

+0 −12

Original line number	Diff line number	Diff line
		@@ -5,18 +5,6 @@

		#include <asm/hypervisor.h>

		/* %o0: devhandle
		* %o1: devino
		*
		* returns %o0: sysino
		*/
		.globl pci_sun4v_devino_to_sysino
		pci_sun4v_devino_to_sysino:
		mov HV_FAST_INTR_DEVINO2SYSINO, %o5
		ta HV_FAST_TRAP
		retl
		mov %o1, %o0

		/* %o0: devhandle
		* %o1: tsbid
		* %o2: num ttes

+5 −0

Original line number	Diff line number	Diff line
		@@ -1203,6 +1203,11 @@ struct hv_trap_trace_entry {
		*/
		#define HV_FAST_INTR_DEVINO2SYSINO 0xa0

		#ifndef __ASSEMBLY__
		extern unsigned long sun4v_devino_to_sysino(unsigned long devhandle,
		unsigned long devino);
		#endif

		/* intr_getenabled()
		* TRAP: HV_FAST_TRAP
		* FUNCTION: HV_FAST_INTR_GETENABLED