[PATCH 3/6] Input: Update vmmouse.c to use the common VMW_PORT macros
From: Sinclair Yeh <hidden>
Date: 2015-12-04 23:18:47
Also in:
linux-input, lkml
Subsystem:
input (keyboard, mouse, joystick, touchscreen) drivers, the rest, vmware vmmouse subdriver · Maintainers:
Dmitry Torokhov, Linus Torvalds, Zack Rusin
Possibly related (same subject, not in this thread)
- 2016-01-19 · [PATCH 3/6] Input: Update vmmouse.c to use the common VMW_PORT macros · Sinclair Yeh <hidden>
- 2015-12-02 · Re: [PATCH 3/6] Input: Update vmmouse.c to use the common VMW_PORT macros · Sinclair Yeh <hidden>
- 2015-12-02 · Re: [PATCH 3/6] Input: Update vmmouse.c to use the common VMW_PORT macros · Dmitry Torokhov <dmitry.torokhov@gmail.com>
- 2015-12-02 · Re: [PATCH 3/6] Input: Update vmmouse.c to use the common VMW_PORT macros · Greg Kroah-Hartman <gregkh@linuxfoundation.org>
- 2015-12-02 · Re: [PATCH 3/6] Input: Update vmmouse.c to use the common VMW_PORT macros · Dmitry Torokhov <dmitry.torokhov@gmail.com>
Updated the VMMOUSE macro to use the new VMW_PORT macro. Doing this instead of replacing all existing instances of VMWMOUSE to minimize code change. Signed-off-by: Sinclair Yeh <redacted> Reviewed-by: Thomas Hellstrom <redacted> Reviewed-by: Alok N Kataria <redacted> Cc: pv-drivers@vmware.com Cc: linux-graphics-maintainer@vmware.com Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: linux-kernel@vger.kernel.org Cc: virtualization@lists.linux-foundation.org Cc: linux-input@vger.kernel.org --- v2: Instead of replacing existing VMMOUSE defines, only modify enough to use the new VMW_PORT define. v3: Use updated VMWARE_PORT() which requires hypervisor magic as an added parameter v4: Swapped parameters 1 and 2 when calling VMW_PORT because the macro has been updated --- drivers/input/mouse/vmmouse.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-)
diff --git a/drivers/input/mouse/vmmouse.c b/drivers/input/mouse/vmmouse.c
index e272f06..ddb152c 100644
--- a/drivers/input/mouse/vmmouse.c
+++ b/drivers/input/mouse/vmmouse.c@@ -19,6 +19,7 @@ #include <linux/slab.h> #include <linux/module.h> #include <asm/hypervisor.h> +#include <asm/vmware.h> #include "psmouse.h" #include "vmmouse.h"
@@ -84,21 +85,12 @@ struct vmmouse_data { * implementing the vmmouse protocol. Should never execute on * bare metal hardware. */ -#define VMMOUSE_CMD(cmd, in1, out1, out2, out3, out4) \ -({ \ - unsigned long __dummy1, __dummy2; \ - __asm__ __volatile__ ("inl %%dx" : \ - "=a"(out1), \ - "=b"(out2), \ - "=c"(out3), \ - "=d"(out4), \ - "=S"(__dummy1), \ - "=D"(__dummy2) : \ - "a"(VMMOUSE_PROTO_MAGIC), \ - "b"(in1), \ - "c"(VMMOUSE_PROTO_CMD_##cmd), \ - "d"(VMMOUSE_PROTO_PORT) : \ - "memory"); \ +#define VMMOUSE_CMD(cmd, in1, out1, out2, out3, out4) \ +({ \ + unsigned long __dummy1 = 0, __dummy2 = 0; \ + VMW_PORT(VMMOUSE_PROTO_CMD_##cmd, in1, VMMOUSE_PROTO_PORT, \ + VMMOUSE_PROTO_MAGIC, \ + out1, out2, out3, out4, __dummy1, __dummy2); \ }) /**
--
1.9.1