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

Commit 153a971f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fixes from Thomas Gleixner:
 "Two fixes for the VMWare guest support:

   - Unbreak VMWare platform detection which got wreckaged by converting
     an integer constant to a string constant.

   - Fix the clang build of the VMWAre hypercall by explicitely
     specifying the ouput register for INL instead of using the short
     form"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/cpu/vmware: Fix platform detection VMWARE_PORT macro
  x86/cpu/vmware: Use the full form of INL in VMWARE_HYPERCALL, for clang/llvm
parents 2b776b54 6fee2a0b

arch/x86/include/asm/vmware.h

+9 −5
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 


#include <asm/cpufeatures.h>

#include <asm/alternative.h>

#include <linux/stringify.h>



/*

 * The hypercall definitions differ in the low word of the %edx argument
@@ -20,8 +21,8 @@ 
 */



/* Old port-based version */

#define VMWARE_HYPERVISOR_PORT    "0x5658"

#define VMWARE_HYPERVISOR_PORT_HB "0x5659"

#define VMWARE_HYPERVISOR_PORT    0x5658

#define VMWARE_HYPERVISOR_PORT_HB 0x5659



/* Current vmcall / vmmcall version */

#define VMWARE_HYPERVISOR_HB   BIT(0)
@@ -29,7 +30,8 @@ 


/* The low bandwidth call. The low word of edx is presumed clear. */

#define VMWARE_HYPERCALL						\

	ALTERNATIVE_2("movw $" VMWARE_HYPERVISOR_PORT ", %%dx; inl (%%dx)", \

	ALTERNATIVE_2("movw $" __stringify(VMWARE_HYPERVISOR_PORT) ", %%dx; " \

		      "inl (%%dx), %%eax",				\

		      "vmcall", X86_FEATURE_VMCALL,			\

		      "vmmcall", X86_FEATURE_VMW_VMMCALL)
@@ -38,7 +40,8 @@ 
 * HB and OUT bits set.

 */

#define VMWARE_HYPERCALL_HB_OUT						\

	ALTERNATIVE_2("movw $" VMWARE_HYPERVISOR_PORT_HB ", %%dx; rep outsb", \

	ALTERNATIVE_2("movw $" __stringify(VMWARE_HYPERVISOR_PORT_HB) ", %%dx; " \

		      "rep outsb",					\

		      "vmcall", X86_FEATURE_VMCALL,			\

		      "vmmcall", X86_FEATURE_VMW_VMMCALL)
@@ -47,7 +50,8 @@ 
 * HB bit set.

 */

#define VMWARE_HYPERCALL_HB_IN						\

	ALTERNATIVE_2("movw $" VMWARE_HYPERVISOR_PORT_HB ", %%dx; rep insb", \

	ALTERNATIVE_2("movw $" __stringify(VMWARE_HYPERVISOR_PORT_HB) ", %%dx; " \

		      "rep insb",					\

		      "vmcall", X86_FEATURE_VMCALL,			\

		      "vmmcall", X86_FEATURE_VMW_VMMCALL)

#endif