| Message ID | 20190818143316.4906-5-thomas_os@shipmail.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add support for updated vmware hypercall instruction | expand |
On Sun, Aug 18, 2019 at 04:33:16PM +0200, Thomas Hellström (VMware) wrote: > From: Thomas Hellstrom <thellstrom@vmware.com> > > Use the definition provided by include/asm/vmware.h > > Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> > Cc: <linux-input@vger.kernel.org> > Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> > Reviewed-by: Doug Covelli <dcovelli@vmware.com> Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Please feel free to merge with the rest of the patches introducing VMWARE_HYPERCALL. > --- > drivers/input/mouse/vmmouse.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/input/mouse/vmmouse.c b/drivers/input/mouse/vmmouse.c > index 871e5b5ab129..0c7707c7bede 100644 > --- a/drivers/input/mouse/vmmouse.c > +++ b/drivers/input/mouse/vmmouse.c > @@ -16,6 +16,7 @@ > #include <linux/slab.h> > #include <linux/module.h> > #include <asm/hypervisor.h> > +#include <asm/vmware.h> > > #include "psmouse.h" > #include "vmmouse.h" > @@ -84,7 +85,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), \ > -- > 2.20.1 > Thanks.
On 8/21/19 7:09 AM, Dmitry Torokhov wrote: > On Sun, Aug 18, 2019 at 04:33:16PM +0200, Thomas Hellström (VMware) wrote: >> From: Thomas Hellstrom <thellstrom@vmware.com> >> >> Use the definition provided by include/asm/vmware.h >> >> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> >> Cc: <linux-input@vger.kernel.org> >> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> >> Reviewed-by: Doug Covelli <dcovelli@vmware.com> > Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> > > Please feel free to merge with the rest of the patches introducing > VMWARE_HYPERCALL. Thanks, Dmitry! I have a version 2 of the patch were the only difference is that edx is initialized to zero which is default for vmcall / vmmcall. Can I use your ack for that one as well? Thanks, Thomas
On Wed, Aug 21, 2019 at 05:48:23PM +0200, Thomas Hellström (VMware) wrote: > On 8/21/19 7:09 AM, Dmitry Torokhov wrote: > > On Sun, Aug 18, 2019 at 04:33:16PM +0200, Thomas Hellström (VMware) wrote: > > > From: Thomas Hellstrom <thellstrom@vmware.com> > > > > > > Use the definition provided by include/asm/vmware.h > > > > > > Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> > > > Cc: <linux-input@vger.kernel.org> > > > Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> > > > Reviewed-by: Doug Covelli <dcovelli@vmware.com> > > Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> > > > > Please feel free to merge with the rest of the patches introducing > > VMWARE_HYPERCALL. > > Thanks, Dmitry! > > I have a version 2 of the patch were the only difference is that edx is > initialized to zero which is default for vmcall / vmmcall. Can I use your > ack for that one as well? Yes, sure.
diff --git a/drivers/input/mouse/vmmouse.c b/drivers/input/mouse/vmmouse.c index 871e5b5ab129..0c7707c7bede 100644 --- a/drivers/input/mouse/vmmouse.c +++ b/drivers/input/mouse/vmmouse.c @@ -16,6 +16,7 @@ #include <linux/slab.h> #include <linux/module.h> #include <asm/hypervisor.h> +#include <asm/vmware.h> #include "psmouse.h" #include "vmmouse.h" @@ -84,7 +85,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), \