leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds 2019-10-27 07:14:40 -04:00
commit 153a971ff5
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/x86/include/asm/vmware.h
View File

@ -4,6 +4,7 @@
#include <asm/cpufeatures.h> #include <asm/cpufeatures.h>
#include <asm/alternative.h> #include <asm/alternative.h>
#include <linux/stringify.h>
/* /*
* The hypercall definitions differ in the low word of the %edx argument * The hypercall definitions differ in the low word of the %edx argument
@ -20,8 +21,8 @@
*/ */
/* Old port-based version */ /* Old port-based version */
#define VMWARE_HYPERVISOR_PORT "0x5658" #define VMWARE_HYPERVISOR_PORT 0x5658
#define VMWARE_HYPERVISOR_PORT_HB "0x5659" #define VMWARE_HYPERVISOR_PORT_HB 0x5659
/* Current vmcall / vmmcall version */ /* Current vmcall / vmmcall version */
#define VMWARE_HYPERVISOR_HB BIT(0) #define VMWARE_HYPERVISOR_HB BIT(0)
@ -29,7 +30,8 @@
/* The low bandwidth call. The low word of edx is presumed clear. */ /* The low bandwidth call. The low word of edx is presumed clear. */
#define VMWARE_HYPERCALL \ #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, \ "vmcall", X86_FEATURE_VMCALL, \
"vmmcall", X86_FEATURE_VMW_VMMCALL) "vmmcall", X86_FEATURE_VMW_VMMCALL)
@ -38,7 +40,8 @@
* HB and OUT bits set. * HB and OUT bits set.
*/ */
#define VMWARE_HYPERCALL_HB_OUT \ #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, \ "vmcall", X86_FEATURE_VMCALL, \
"vmmcall", X86_FEATURE_VMW_VMMCALL) "vmmcall", X86_FEATURE_VMW_VMMCALL)
@ -47,7 +50,8 @@
* HB bit set. * HB bit set.
*/ */
#define VMWARE_HYPERCALL_HB_IN \ #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, \ "vmcall", X86_FEATURE_VMCALL, \
"vmmcall", X86_FEATURE_VMW_VMMCALL) "vmmcall", X86_FEATURE_VMW_VMMCALL)
#endif #endif