From patchwork Wed Aug 28 13:30:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: thermal-bot for Julien Panis X-Patchwork-Id: 11119009 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A5707174A for ; Wed, 28 Aug 2019 13:31:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8E3C422DA7 for ; Wed, 28 Aug 2019 13:31:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726454AbfH1NbD (ORCPT ); Wed, 28 Aug 2019 09:31:03 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:47258 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726368AbfH1NbC (ORCPT ); Wed, 28 Aug 2019 09:31:02 -0400 Received: from [5.158.153.53] (helo=tip-bot2.lab.linutronix.de) by Galois.linutronix.de with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1i2y2K-0004Mf-Ip; Wed, 28 Aug 2019 15:30:56 +0200 Received: from [127.0.1.1] (localhost [IPv6:::1]) by tip-bot2.lab.linutronix.de (Postfix) with ESMTP id 3114E1C0DE2; Wed, 28 Aug 2019 15:30:56 +0200 (CEST) Date: Wed, 28 Aug 2019 13:30:56 -0000 From: "tip-bot2 for Thomas Hellstrom" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/vmware] input/vmmouse: Update the backdoor call with support for new instructions Cc: Thomas Hellstrom , Borislav Petkov , Doug Covelli , Dmitry Torokhov , "H. Peter Anvin" , Ingo Molnar , linux-input@vger.kernel.org, Thomas Gleixner , VMware Graphics , , "x86-ml" , Ingo Molnar , Borislav Petkov , linux-kernel@vger.kernel.org In-Reply-To: <20190828080353.12658-5-thomas_os@shipmail.org> References: <20190828080353.12658-5-thomas_os@shipmail.org> MIME-Version: 1.0 Message-ID: <156699905611.5321.15444519862547054670.tip-bot2@tip-bot2> X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.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 AuthorDate: Wed, 28 Aug 2019 10:03:53 +02:00 Committer: Borislav Petkov 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 Signed-off-by: Borislav Petkov Reviewed-by: Doug Covelli Acked-by: Dmitry Torokhov Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: linux-input@vger.kernel.org Cc: Thomas Gleixner Cc: VMware Graphics Cc: Cc: x86-ml Link: https://lkml.kernel.org/r/20190828080353.12658-5-thomas_os@shipmail.org Signed-off-by: Borislav Petkov --- 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 #include #include +#include #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"); \ })