From: "Sinclair Yeh" <syeh@vmware.com> To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org, Sinclair Yeh <syeh@vmware.com>, pv-drivers@vmware.com, Xavier Deguillard <xdeguillard@vmware.com>, virtualization@lists.linux-foundation.org Subject: [PATCH 6/6] VMware balloon: Update vmw_balloon.c to use the VMW_PORT macro Date: Tue, 19 Jan 2016 13:46:05 -0800 [thread overview] Message-ID: <1453239965-1466-7-git-send-email-syeh@vmware.com> (raw) In-Reply-To: <1453239965-1466-1-git-send-email-syeh@vmware.com> Updated VMWARE_BALLOON_CMD to use the common VMW_PORT macro. Doing this rather than replacing all instances of VMWARE_BALLOON_CMD to minimize code change. Signed-off-by: Sinclair Yeh <syeh@vmware.com> Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Alok N Kataria <akataria@vmware.com> Acked-by: Xavier Deguillard <xdeguillard@vmware.com> Cc: pv-drivers@vmware.com Cc: Xavier Deguillard <xdeguillard@vmware.com> Cc: linux-kernel@vger.kernel.org Cc: virtualization@lists.linux-foundation.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- v1 Swapped parameters 1 and 2 to VMW_PORT because the macro has been updated v2 Updated VMW_PORT() usage because the macro and vmw_balloon.c's usage have changed. --- drivers/misc/vmw_balloon.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c index 1e688bf..6476b74 100644 --- a/drivers/misc/vmw_balloon.c +++ b/drivers/misc/vmw_balloon.c @@ -46,6 +46,7 @@ #include <linux/vmw_vmci_defs.h> #include <linux/vmw_vmci_api.h> #include <asm/hypervisor.h> +#include <asm/vmware.h> MODULE_AUTHOR("VMware, Inc."); MODULE_DESCRIPTION("VMware Memory Control (Balloon) Driver"); @@ -197,25 +198,17 @@ static void vmballoon_batch_set_pa(struct vmballoon_batch_page *batch, int idx, } -#define VMWARE_BALLOON_CMD(cmd, arg1, arg2, result) \ -({ \ - unsigned long __status, __dummy1, __dummy2, __dummy3; \ - __asm__ __volatile__ ("inl %%dx" : \ - "=a"(__status), \ - "=c"(__dummy1), \ - "=d"(__dummy2), \ - "=b"(result), \ - "=S" (__dummy3) : \ - "0"(VMW_BALLOON_HV_MAGIC), \ - "1"(VMW_BALLOON_CMD_##cmd), \ - "2"(VMW_BALLOON_HV_PORT), \ - "3"(arg1), \ - "4" (arg2) : \ - "memory"); \ - if (VMW_BALLOON_CMD_##cmd == VMW_BALLOON_CMD_START) \ - result = __dummy1; \ - result &= -1UL; \ - __status & -1UL; \ +#define VMWARE_BALLOON_CMD(cmd, arg1, arg2, result) \ +({ \ + unsigned long __status, __dummy1, __dummy2; \ + unsigned long __si, __di; \ + VMW_PORT(VMW_BALLOON_CMD_##cmd, arg1, arg2, 0, \ + VMW_BALLOON_HV_PORT, VMW_BALLOON_HV_MAGIC, \ + __status, result, __dummy1, __dummy2, __si, __di); \ + if (VMW_BALLOON_CMD_##cmd == VMW_BALLOON_CMD_START) \ + result = __dummy1; \ + result &= -1UL; \ + __status & -1UL; \ }) #ifdef CONFIG_DEBUG_FS -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: "Sinclair Yeh" <syeh@vmware.com> To: x86@kernel.org Cc: Sinclair Yeh <syeh@vmware.com>, pv-drivers@vmware.com, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, Xavier Deguillard <xdeguillard@vmware.com> Subject: [PATCH 6/6] VMware balloon: Update vmw_balloon.c to use the VMW_PORT macro Date: Tue, 19 Jan 2016 13:46:05 -0800 [thread overview] Message-ID: <1453239965-1466-7-git-send-email-syeh@vmware.com> (raw) In-Reply-To: <1453239965-1466-1-git-send-email-syeh@vmware.com> Updated VMWARE_BALLOON_CMD to use the common VMW_PORT macro. Doing this rather than replacing all instances of VMWARE_BALLOON_CMD to minimize code change. Signed-off-by: Sinclair Yeh <syeh@vmware.com> Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Alok N Kataria <akataria@vmware.com> Acked-by: Xavier Deguillard <xdeguillard@vmware.com> Cc: pv-drivers@vmware.com Cc: Xavier Deguillard <xdeguillard@vmware.com> Cc: linux-kernel@vger.kernel.org Cc: virtualization@lists.linux-foundation.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- v1 Swapped parameters 1 and 2 to VMW_PORT because the macro has been updated v2 Updated VMW_PORT() usage because the macro and vmw_balloon.c's usage have changed. --- drivers/misc/vmw_balloon.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c index 1e688bf..6476b74 100644 --- a/drivers/misc/vmw_balloon.c +++ b/drivers/misc/vmw_balloon.c @@ -46,6 +46,7 @@ #include <linux/vmw_vmci_defs.h> #include <linux/vmw_vmci_api.h> #include <asm/hypervisor.h> +#include <asm/vmware.h> MODULE_AUTHOR("VMware, Inc."); MODULE_DESCRIPTION("VMware Memory Control (Balloon) Driver"); @@ -197,25 +198,17 @@ static void vmballoon_batch_set_pa(struct vmballoon_batch_page *batch, int idx, } -#define VMWARE_BALLOON_CMD(cmd, arg1, arg2, result) \ -({ \ - unsigned long __status, __dummy1, __dummy2, __dummy3; \ - __asm__ __volatile__ ("inl %%dx" : \ - "=a"(__status), \ - "=c"(__dummy1), \ - "=d"(__dummy2), \ - "=b"(result), \ - "=S" (__dummy3) : \ - "0"(VMW_BALLOON_HV_MAGIC), \ - "1"(VMW_BALLOON_CMD_##cmd), \ - "2"(VMW_BALLOON_HV_PORT), \ - "3"(arg1), \ - "4" (arg2) : \ - "memory"); \ - if (VMW_BALLOON_CMD_##cmd == VMW_BALLOON_CMD_START) \ - result = __dummy1; \ - result &= -1UL; \ - __status & -1UL; \ +#define VMWARE_BALLOON_CMD(cmd, arg1, arg2, result) \ +({ \ + unsigned long __status, __dummy1, __dummy2; \ + unsigned long __si, __di; \ + VMW_PORT(VMW_BALLOON_CMD_##cmd, arg1, arg2, 0, \ + VMW_BALLOON_HV_PORT, VMW_BALLOON_HV_MAGIC, \ + __status, result, __dummy1, __dummy2, __si, __di); \ + if (VMW_BALLOON_CMD_##cmd == VMW_BALLOON_CMD_START) \ + result = __dummy1; \ + result &= -1UL; \ + __status & -1UL; \ }) #ifdef CONFIG_DEBUG_FS -- 1.9.1
next prev parent reply other threads:[~2016-01-19 21:45 UTC|newest] Thread overview: 96+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <1449008047-8252-1-git-send-email-syeh@vmware.com> 2015-12-01 22:18 ` [PATCH 1/6] x86: Add VMWare Host Communication Macros Sinclair Yeh 2015-12-01 22:18 ` Sinclair Yeh 2015-12-01 22:18 ` [PATCH 2/6] x86: Update vmware.c to use the common VMW_PORT macros Sinclair Yeh 2015-12-01 22:18 ` Sinclair Yeh 2015-12-01 22:18 ` [PATCH 3/6] Input: Update vmmouse.c " Sinclair Yeh 2015-12-01 22:18 ` Sinclair Yeh 2015-12-01 22:24 ` Dmitry Torokhov 2015-12-01 22:32 ` Sinclair Yeh 2015-12-01 22:45 ` Dmitry Torokhov 2015-12-01 22:45 ` Dmitry Torokhov 2015-12-01 22:45 ` Dmitry Torokhov 2015-12-01 22:54 ` Sinclair Yeh 2015-12-01 22:54 ` Sinclair Yeh 2015-12-01 23:56 ` Dmitry Torokhov 2015-12-01 23:56 ` Dmitry Torokhov 2015-12-01 23:56 ` Dmitry Torokhov 2015-12-02 0:04 ` Greg Kroah-Hartman 2015-12-02 0:04 ` Greg Kroah-Hartman 2015-12-02 2:21 ` Sinclair Yeh 2015-12-02 2:21 ` Sinclair Yeh 2015-12-02 15:31 ` Greg Kroah-Hartman 2015-12-02 15:31 ` Greg Kroah-Hartman 2015-12-02 15:57 ` Sinclair Yeh 2015-12-02 15:57 ` Sinclair Yeh 2015-12-02 15:57 ` Sinclair Yeh 2015-12-02 17:26 ` Dmitry Torokhov 2015-12-02 17:26 ` Dmitry Torokhov 2015-12-02 17:29 ` [Linux-graphics-maintainer] " Thomas Hellstrom 2015-12-02 17:29 ` Thomas Hellstrom 2015-12-02 18:45 ` Greg Kroah-Hartman 2015-12-02 18:45 ` Greg Kroah-Hartman 2015-12-02 18:58 ` Dmitry Torokhov 2015-12-02 18:58 ` Dmitry Torokhov 2015-12-02 18:58 ` Dmitry Torokhov 2015-12-02 19:02 ` Sinclair Yeh 2015-12-02 19:02 ` Sinclair Yeh 2015-12-02 2:21 ` Sinclair Yeh 2015-12-02 7:07 ` [Linux-graphics-maintainer] " Thomas Hellstrom 2015-12-02 7:07 ` Thomas Hellstrom 2015-12-02 7:07 ` Thomas Hellstrom 2015-12-01 22:32 ` Sinclair Yeh 2015-12-01 22:24 ` Dmitry Torokhov 2015-12-02 0:01 ` Greg Kroah-Hartman 2015-12-02 0:01 ` Greg Kroah-Hartman 2015-12-01 22:18 ` [PATCH 4/6] Input: Remove vmmouse port reservation Sinclair Yeh 2015-12-01 22:30 ` Dmitry Torokhov 2015-12-01 22:30 ` Dmitry Torokhov 2015-12-01 23:04 ` Sinclair Yeh 2015-12-01 23:04 ` Sinclair Yeh 2015-12-01 23:52 ` Dmitry Torokhov 2015-12-01 23:52 ` Dmitry Torokhov 2015-12-01 22:18 ` Sinclair Yeh 2015-12-01 22:18 ` [PATCH 5/6] x86: Remove address from the vmware.c header Sinclair Yeh 2015-12-01 22:18 ` [PATCH 6/6] VMware balloon: Update vmw_balloon.c to use the VMW_PORT macro Sinclair Yeh 2015-12-01 22:38 ` Xavier Deguillard 2015-12-01 23:17 ` Sinclair Yeh 2015-12-01 23:17 ` Sinclair Yeh 2015-12-01 22:38 ` Xavier Deguillard 2015-12-01 22:18 ` Sinclair Yeh 2015-12-01 22:32 ` [PATCH 1/6] x86: Add VMWare Host Communication Macros Xavier Deguillard 2015-12-01 22:32 ` Xavier Deguillard 2015-12-01 22:49 ` H. Peter Anvin 2015-12-04 22:33 ` Sinclair Yeh 2015-12-04 22:33 ` Sinclair Yeh 2015-12-01 22:49 ` H. Peter Anvin [not found] ` <1449271183-1746-1-git-send-email-syeh@vmware.com> 2015-12-04 23:19 ` Sinclair Yeh 2015-12-04 23:19 ` Sinclair Yeh 2015-12-04 23:19 ` [PATCH 2/6] x86: Update vmware.c to use the common VMW_PORT macros Sinclair Yeh 2015-12-04 23:19 ` Sinclair Yeh 2015-12-04 23:19 ` [PATCH 3/6] Input: Update vmmouse.c " Sinclair Yeh 2015-12-04 23:19 ` Sinclair Yeh 2015-12-04 23:19 ` [PATCH 4/6] Input: Remove vmmouse port reservation Sinclair Yeh 2015-12-04 23:19 ` Sinclair Yeh 2015-12-04 23:19 ` [PATCH 5/6] x86: Remove address from the vmware.c header Sinclair Yeh 2015-12-04 23:19 ` [PATCH 6/6] VMware balloon: Update vmw_balloon.c to use the VMW_PORT macro Sinclair Yeh 2015-12-04 23:19 ` Sinclair Yeh 2016-01-19 21:45 ` [PATCH 0/6] Create common VMWare host port communication macros v3 Sinclair Yeh 2016-01-19 21:46 ` [PATCH 1/6] x86: Add VMWare Host Communication Macros Sinclair Yeh 2016-01-19 21:46 ` Sinclair Yeh 2016-01-19 21:46 ` [PATCH 2/6] x86: Update vmware.c to use the common VMW_PORT macros Sinclair Yeh 2016-01-19 21:46 ` Sinclair Yeh 2016-01-19 21:46 ` [PATCH 3/6] Input: Update vmmouse.c " Sinclair Yeh 2016-01-19 21:46 ` Sinclair Yeh 2016-01-19 21:46 ` [PATCH 4/6] Input: Remove vmmouse port reservation Sinclair Yeh 2016-01-19 21:46 ` Sinclair Yeh 2016-01-19 21:46 ` [PATCH 5/6] x86: Remove address from the vmware.c header Sinclair Yeh 2016-01-19 21:46 ` Sinclair Yeh [this message] 2016-01-19 21:46 ` [PATCH 6/6] VMware balloon: Update vmw_balloon.c to use the VMW_PORT macro Sinclair Yeh 2016-02-08 19:41 ` Greg KH 2016-02-08 19:41 ` Greg KH 2016-03-31 14:39 ` Sinclair Yeh 2016-03-31 14:39 ` Sinclair Yeh 2016-03-31 16:30 ` Greg KH 2016-03-31 16:30 ` Greg KH 2016-03-31 17:32 ` Sinclair Yeh 2016-03-31 17:32 ` Sinclair Yeh
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=1453239965-1466-7-git-send-email-syeh@vmware.com \ --to=syeh@vmware.com \ --cc=gregkh@linuxfoundation.org \ --cc=linux-kernel@vger.kernel.org \ --cc=pv-drivers@vmware.com \ --cc=virtualization@lists.linux-foundation.org \ --cc=x86@kernel.org \ --cc=xdeguillard@vmware.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.