From patchwork Tue Jan 19 21:46:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinclair Yeh X-Patchwork-Id: 8065021 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 74ACDBEEE5 for ; Tue, 19 Jan 2016 21:45:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6CD6A20392 for ; Tue, 19 Jan 2016 21:45:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7A723204EC for ; Tue, 19 Jan 2016 21:45:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757681AbcASVpE (ORCPT ); Tue, 19 Jan 2016 16:45:04 -0500 Received: from smtp-outbound-2.vmware.com ([208.91.2.13]:33662 "EHLO smtp-outbound-2.vmware.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757521AbcASVo5 (ORCPT ); Tue, 19 Jan 2016 16:44:57 -0500 Received: from sc9-mailhost3.vmware.com (sc9-mailhost3.vmware.com [10.113.161.73]) by smtp-outbound-2.vmware.com (Postfix) with ESMTP id 3E5A928D04; Tue, 19 Jan 2016 13:44:56 -0800 (PST) Received: from vmware.com (unknown [10.20.88.147]) by sc9-mailhost3.vmware.com (Postfix) with SMTP id 275D540572; Tue, 19 Jan 2016 13:44:56 -0800 (PST) Received: by vmware.com (sSMTP sendmail emulation); Tue, 19 Jan 2016 13:46:44 -0800 From: "Sinclair Yeh" To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org, Sinclair Yeh , pv-drivers@vmware.com, linux-graphics-maintainer@vmware.com, Dmitry Torokhov , Arnd Bergmann , virtualization@lists.linux-foundation.org, linux-input@vger.kernel.org Subject: [PATCH 3/6] Input: Update vmmouse.c to use the common VMW_PORT macros Date: Tue, 19 Jan 2016 13:46:02 -0800 Message-Id: <1453239965-1466-4-git-send-email-syeh@vmware.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1453239965-1466-1-git-send-email-syeh@vmware.com> References: <1449271183-1746-1-git-send-email-syeh@vmware.com> <1453239965-1466-1-git-send-email-syeh@vmware.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Thomas Hellstrom Reviewed-by: Alok N Kataria Cc: pv-drivers@vmware.com Cc: linux-graphics-maintainer@vmware.com Cc: Dmitry Torokhov Cc: Arnd Bergmann Cc: Greg Kroah-Hartman 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 v5: Updated VMW_PORT() usage since 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..d06daf6 100644 --- a/drivers/input/mouse/vmmouse.c +++ b/drivers/input/mouse/vmmouse.c @@ -19,6 +19,7 @@ #include #include #include +#include #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, __dummy2; \ + VMW_PORT(VMMOUSE_PROTO_CMD_##cmd, in1, 0, 0, \ + VMMOUSE_PROTO_PORT, VMMOUSE_PROTO_MAGIC, \ + out1, out2, out3, out4, __dummy1, __dummy2); \ }) /**