From: "tip-bot2 for Thomas Hellstrom" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Thomas Hellstrom <thellstrom@vmware.com>,
Borislav Petkov <bp@suse.de>, Doug Covelli <dcovelli@vmware.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
"H. Peter Anvin" <hpa@zytor.com>, Ingo Molnar <mingo@redhat.com>,
linux-input@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>,
VMware Graphics <linux-graphics-maintainer@vmware.com>,
<pv-drivers@vmware.com>, "x86-ml" <x86@kernel.org>,
Ingo Molnar <mingo@kernel.org>, Borislav Petkov <bp@alien8.de>,
linux-kernel@vger.kernel.org
Subject: [tip: x86/vmware] input/vmmouse: Update the backdoor call with support for new instructions
Date: Wed, 28 Aug 2019 13:30:56 -0000 [thread overview]
Message-ID: <156699905611.5321.15444519862547054670.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20190828080353.12658-5-thomas_os@shipmail.org>
The following commit has been merged into the x86/vmware branch of tip:
Commit-ID: f7b15c74cffd760ec9959078982d8268a38456c4
Gitweb: https://git.kernel.org/tip/f7b15c74cffd760ec9959078982d8268a38456c4
Author: Thomas Hellstrom <thellstrom@vmware.com>
AuthorDate: Wed, 28 Aug 2019 10:03:53 +02:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Wed, 28 Aug 2019 13:43:01 +02:00
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 <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
---
drivers/input/mouse/vmmouse.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/input/mouse/vmmouse.c b/drivers/input/mouse/vmmouse.c
index 871e5b5..148245c 100644
--- a/drivers/input/mouse/vmmouse.c
+++ b/drivers/input/mouse/vmmouse.c
@@ -16,12 +16,12 @@
#include <linux/slab.h>
#include <linux/module.h>
#include <asm/hypervisor.h>
+#include <asm/vmware.h>
#include "psmouse.h"
#include "vmmouse.h"
#define VMMOUSE_PROTO_MAGIC 0x564D5868U
-#define VMMOUSE_PROTO_PORT 0x5658
/*
* Main commands supported by the vmmouse hypervisor port.
@@ -84,7 +84,7 @@ struct vmmouse_data {
#define VMMOUSE_CMD(cmd, in1, out1, out2, out3, out4) \
({ \
unsigned long __dummy1, __dummy2; \
- __asm__ __volatile__ ("inl %%dx" : \
+ __asm__ __volatile__ (VMWARE_HYPERCALL : \
"=a"(out1), \
"=b"(out2), \
"=c"(out3), \
@@ -94,7 +94,7 @@ struct vmmouse_data {
"a"(VMMOUSE_PROTO_MAGIC), \
"b"(in1), \
"c"(VMMOUSE_PROTO_CMD_##cmd), \
- "d"(VMMOUSE_PROTO_PORT) : \
+ "d"(0) : \
"memory"); \
})
next prev parent reply other threads:[~2019-08-28 13:31 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-28 8:03 [PATCH v3 0/4] Add support for updated vmware hypercall instruction Thomas Hellström (VMware)
2019-08-28 8:03 ` [PATCH v3 1/4] x86/vmware: Update platform detection code for VMCALL/VMMCALL hypercalls Thomas Hellström (VMware)
2019-08-28 13:30 ` [tip: x86/vmware] " tip-bot2 for Thomas Hellstrom
2019-08-28 8:03 ` [PATCH v3 2/4] x86/vmware: Add a header file for hypercall definitions Thomas Hellström (VMware)
2019-08-28 13:30 ` [tip: x86/vmware] " tip-bot2 for Thomas Hellstrom
2019-08-28 8:03 ` [PATCH v3 3/4] drm/vmwgfx: Update the backdoor call with support for new instructions Thomas Hellström (VMware)
2019-08-28 13:30 ` [tip: x86/vmware] " tip-bot2 for Thomas Hellstrom
2019-08-28 8:03 ` [PATCH v3 4/4] input/vmmouse: " Thomas Hellström (VMware)
2019-08-28 13:30 ` tip-bot2 for Thomas Hellstrom [this message]
2019-08-29 16:01 ` [tip: x86/vmware] " kbuild test robot
2019-08-29 16:33 ` Borislav Petkov
2019-08-30 1:03 ` [kbuild-all] " Philip Li
2019-08-30 6:06 ` Thomas Gleixner
2019-08-30 6:20 ` Philip Li
2019-08-30 6:33 ` Philip Li
2019-08-30 7:58 ` Thomas Gleixner
2019-08-30 8:06 ` Borislav Petkov
2019-08-30 14:36 ` Philip Li
2019-08-30 14:46 ` Borislav Petkov
2019-08-30 15:00 ` Philip Li
2019-08-30 15:06 ` Borislav Petkov
2019-08-30 15:26 ` Philip Li
2019-08-30 15:08 ` Philip Li
2019-08-30 19:35 ` Borislav Petkov
2019-09-02 1:13 ` Philip Li
2019-09-02 9:36 ` Borislav Petkov
2019-09-03 1:06 ` Philip Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=156699905611.5321.15444519862547054670.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@alien8.de \
--cc=bp@suse.de \
--cc=dcovelli@vmware.com \
--cc=dmitry.torokhov@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-graphics-maintainer@vmware.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mingo@redhat.com \
--cc=pv-drivers@vmware.com \
--cc=tglx@linutronix.de \
--cc=thellstrom@vmware.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).