Commit 88845f40 authored by David Kershner's avatar David Kershner Committed by Greg Kroah-Hartman
Browse files

staging: unisys: visorbus: move unisys_vmcall into visorchipset 



The only one using unisys_vmcall was visorchipset.c, it can be moved into
the visorchipset file directly instead of being in a header file.

Signed-off-by: default avatarDavid Kershner <david.kershner@unisys.com>
Reviewed-by: default avatarReviewed-by: Tim Sell <timothy.sell@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fd104099

drivers/staging/unisys/visorbus/visorchipset.c

+20 −1
Original line number Diff line number Diff line
@@ -1354,6 +1354,25 @@ chipset_notready_uevent(struct controlvm_message_header *msg_hdr) 
	return res;

}



static int unisys_vmcall(unsigned long tuple, unsigned long param)

{

	int result = 0;

	unsigned int cpuid_eax, cpuid_ebx, cpuid_ecx, cpuid_edx;

	unsigned long reg_ebx;

	unsigned long reg_ecx;



	reg_ebx = param & 0xFFFFFFFF;

	reg_ecx = param >> 32;



	cpuid(0x00000001, &cpuid_eax, &cpuid_ebx, &cpuid_ecx, &cpuid_edx);

	if (!(cpuid_ecx & 0x80000000))

		return -EPERM;



	__asm__ __volatile__(".byte 0x00f, 0x001, 0x0c1" : "=a"(result) :

		"a"(tuple), "b"(reg_ebx), "c"(reg_ecx));



	return result;

}

static unsigned int

issue_vmcall_io_controlvm_addr(u64 *control_addr, u32 *control_bytes)

{
@@ -1362,7 +1381,7 @@ issue_vmcall_io_controlvm_addr(u64 *control_addr, u32 *control_bytes) 
	u64 physaddr;



	physaddr = virt_to_phys(&params);

	unisys_vmcall(VMCALL_CONTROLVM_ADDR, physaddr, result);

	result = unisys_vmcall(VMCALL_CONTROLVM_ADDR, physaddr);

	if (VMCALL_SUCCESSFUL(result)) {

		*control_addr = params.address;

		*control_bytes = params.channel_bytes;

drivers/staging/unisys/visorbus/vmcallinterface.h

+0 −19
Original line number Diff line number Diff line
@@ -20,22 +20,6 @@ 
 * Virtualization.  The VMCALLs are provided by Monitor and used by s-Par

 * drivers running in a Linux guest partition.

 */

static inline unsigned long

__unisys_vmcall_gnuc(unsigned long tuple, unsigned long reg_ebx,

		     unsigned long reg_ecx)

{

	unsigned long result = 0;

	unsigned int cpuid_eax, cpuid_ebx, cpuid_ecx, cpuid_edx;



	cpuid(0x00000001, &cpuid_eax, &cpuid_ebx, &cpuid_ecx, &cpuid_edx);

	if (!(cpuid_ecx & 0x80000000))

		return -EPERM;



	__asm__ __volatile__(".byte 0x00f, 0x001, 0x0c1" : "=a"(result) :

		"a"(tuple), "b"(reg_ebx), "c"(reg_ecx));

	return result;

}



static inline unsigned long

__unisys_extended_vmcall_gnuc(unsigned long long tuple,

			      unsigned long long reg_ebx,
@@ -83,9 +67,6 @@ enum vmcall_monitor_interface_method_tuple { /* VMCALL identification tuples */ 


#define unisys_extended_vmcall(tuple, reg_ebx, reg_ecx, reg_edx) \

	__unisys_extended_vmcall_gnuc(tuple, reg_ebx, reg_ecx, reg_edx)

#define unisys_vmcall(method, param, result) \

	(result = __unisys_vmcall_gnuc((method), (param) & 0xFFFFFFFF, \

				       (param) >> 32))



/* Structures for IO VMCALLs */

CRA Git | Maintained and supported by SUSTech CRA and CCSE