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

input/vmmouse: Update the backdoor call with support for new instructions

Browse Source 
Use the definition provided by include/asm/vmware.h.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Doug Covelli <dcovelli@vmware.com>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: linux-input@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: VMware Graphics <linux-graphics-maintainer@vmware.com>
Cc: <pv-drivers@vmware.com>
Cc: x86-ml <x86@kernel.org>
Link: https://lkml.kernel.org/r/20190828080353.12658-5-thomas_os@shipmail.org
This commit is contained in:
Thomas Hellstrom 2019-08-28 10:03:53 +02:00 committed by Borislav Petkov
parent 6abe3778cf
commit f7b15c74cf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/input/mouse/vmmouse.c
View File

@ -16,12 +16,12 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/module.h> #include <linux/module.h>
#include <asm/hypervisor.h> #include <asm/hypervisor.h>
#include <asm/vmware.h>
#include "psmouse.h" #include "psmouse.h"
#include "vmmouse.h" #include "vmmouse.h"
#define VMMOUSE_PROTO_MAGIC 0x564D5868U #define VMMOUSE_PROTO_MAGIC 0x564D5868U
#define VMMOUSE_PROTO_PORT 0x5658
/* /*
* Main commands supported by the vmmouse hypervisor port. * Main commands supported by the vmmouse hypervisor port.
@ -84,7 +84,7 @@ struct vmmouse_data {
#define VMMOUSE_CMD(cmd, in1, out1, out2, out3, out4) \ #define VMMOUSE_CMD(cmd, in1, out1, out2, out3, out4) \
({ \ ({ \
unsigned long __dummy1, __dummy2; \ unsigned long __dummy1, __dummy2; \
__asm__ __volatile__ ("inl %%dx" : \ __asm__ __volatile__ (VMWARE_HYPERCALL : \
"=a"(out1), \ "=a"(out1), \
"=b"(out2), \ "=b"(out2), \
"=c"(out3), \ "=c"(out3), \
@ -94,7 +94,7 @@ struct vmmouse_data {
"a"(VMMOUSE_PROTO_MAGIC), \ "a"(VMMOUSE_PROTO_MAGIC), \
"b"(in1), \ "b"(in1), \
"c"(VMMOUSE_PROTO_CMD_##cmd), \ "c"(VMMOUSE_PROTO_CMD_##cmd), \
"d"(VMMOUSE_PROTO_PORT) : \ "d"(0) : \
"memory"); \ "memory"); \
}) })