Skip to content

Commit f7b15c7

Browse files
thomashvmwsuryasaimadhu
authored andcommitted
input/vmmouse: Update the backdoor call with support for new instructions
Use the definition provided by include/asm/vmware.h. Signed-off-by: Thomas Hellstrom <[email protected]> Signed-off-by: Borislav Petkov <[email protected]> Reviewed-by: Doug Covelli <[email protected]> Acked-by: Dmitry Torokhov <[email protected]> Cc: "H. Peter Anvin" <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: [email protected] Cc: Thomas Gleixner <[email protected]> Cc: VMware Graphics <[email protected]> Cc: <[email protected]> Cc: x86-ml <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent 6abe377 commit f7b15c7

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/input/mouse/vmmouse.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
#include <linux/slab.h>
1717
#include <linux/module.h>
1818
#include <asm/hypervisor.h>
19+
#include <asm/vmware.h>
1920

2021
#include "psmouse.h"
2122
#include "vmmouse.h"
2223

2324
#define VMMOUSE_PROTO_MAGIC 0x564D5868U
24-
#define VMMOUSE_PROTO_PORT 0x5658
2525

2626
/*
2727
* Main commands supported by the vmmouse hypervisor port.
@@ -84,7 +84,7 @@ struct vmmouse_data {
8484
#define VMMOUSE_CMD(cmd, in1, out1, out2, out3, out4) \
8585
({ \
8686
unsigned long __dummy1, __dummy2; \
87-
__asm__ __volatile__ ("inl %%dx" : \
87+
__asm__ __volatile__ (VMWARE_HYPERCALL : \
8888
"=a"(out1), \
8989
"=b"(out2), \
9090
"=c"(out3), \
@@ -94,7 +94,7 @@ struct vmmouse_data {
9494
"a"(VMMOUSE_PROTO_MAGIC), \
9595
"b"(in1), \
9696
"c"(VMMOUSE_PROTO_CMD_##cmd), \
97-
"d"(VMMOUSE_PROTO_PORT) : \
97+
"d"(0) : \
9898
"memory"); \
9999
})
100100

0 commit comments

Comments
 (0)