Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37;
From:   Alexey Makhalov <amakhalov@vmware.com>
To:     linux-kernel@vger.kernel.org, virtualization@lists.linux.dev,
        hpa@zytor.com, x86@kernel.org, dave.hansen@linux.intel.co,
        bp@alien8.d, mingo@redhat.com, tglx@linutronix.de,
        zackr@vmware.com, timothym@vmware.com,
        dri-devel@lists.freedesktop.org, daniel@ffwll.ch,
        airlied@gmail.com, tzimmermann@suse.de, mripard@kernel.org,
        maarten.lankhorst@linux.intel.com
Cc:     netdev@vger.kernel.org, richardcochran@gmail.com,
        linux-input@vger.kernel.org, dmitry.torokhov@gmail.com,
        linux-graphics-maintainer@vmware.com, pv-drivers@vmware.com,
        namit@vmware.com, akaher@vmware.com, jsipek@vmware.com,
        Alexey Makhalov <amakhalov@vmware.com>
Subject: [PATCH 1/6] x86/vmware: Move common macros to vmware.h
Date:   Wed, 22 Nov 2023 15:30:53 -0800
Message-Id: <20231122233058.185601-9-amakhalov@vmware.com>
In-Reply-To: <20231122233058.185601-1-amakhalov@vmware.com>
References: <20231122233058.185601-1-amakhalov@vmware.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Kzk5tdDkNOXMDS2RnMHxgnxPTlg1Yo81SJhmErD6LhX5ooaoikhmU04d7WCW?=
 =?us-ascii?Q?nfVUUA8E30uQY8Nxt9uUagNx1FRpecR8YB2bWqUypNUy4HHSFKqVUDx370Lj?=
 =?us-ascii?Q?HmYEkWgrGvwZiixqPhjp5hLVlcHWMoNI5b4qjOgEePM1mgTdx4c2yfWRehuf?=
 =?us-ascii?Q?BkbEMuCJUdPpZBeTF2WW5Zc1K4xixQ0YHVfEItWOmmNWh4waujD98QkFrU5I?=
 =?us-ascii?Q?N3VEGCw2Zc+UyR64QpSNV+j69gZE586q+ZPBUdiTEj3eYB17WR6FpNw+rXOj?=
 =?us-ascii?Q?exiixdFAJ1R2+lSfd7SeWNyKOTx4bGrqE/foFbgqw+rYa63N7SE7HYAAb6Qy?=
 =?us-ascii?Q?NsY9uvzaOLiF0mvLfc5j4s5VKzVr2qSVz2J8zC1N2+Jo5L1+NkWMsBtWeE7E?=
 =?us-ascii?Q?eaVDWnt0qd3/ukTFDl81uVib7AdgMG5zbemgKh9G3Ge8xUww4F7mh9DeLRCk?=
 =?us-ascii?Q?lh67B0TTEBN49rSPDOZ7EBRdEaSP+44wbqHyxhgKX6tPS/qk4TTy1OQXei7j?=
 =?us-ascii?Q?bzIqZAVc0ZwPWTtSv64urjAGgnWH0ZKuKdCHwO8EjIKMFQs3zzq6Cn6fi/4V?=
 =?us-ascii?Q?k8Qd7sxS5l6xIthJUZzFZIJ/WrCLdaC+kuHwCqyZ3bWEYaU5b2zi1INFRrzC?=
 =?us-ascii?Q?hi66sfbtbtJ/aC+JTzsKOlcYSUN6T6E+p4vy2BYdRyAmnwnRro313Yu4A0kQ?=
 =?us-ascii?Q?AeH2RGLQlestEJs6jLk8UgWJgjo1asOK1dipGFbRKWhNFm2n/sPd2gTsdWLa?=
 =?us-ascii?Q?gKH8Jp39wf0QdTQUjCcg4LmtKhSMaHqoOHJJ8QehoTqQaWD1baQfnE1YiW4i?=
 =?us-ascii?Q?QFre4oNVI6mHDKht/MI253/PSQkU56N+TJdi2xg2pPewmzLwjlMhoZI3jHW7?=
 =?us-ascii?Q?GSZ9pQ5m8PrpaX1qiGWUhJMpSfcjX9cNK8+CxjewZ/0saE8DQq6dFiW0jVEO?=
 =?us-ascii?Q?oFayvB8duO5Q9cQsXFJQwQdwnpktJ8vTedcNWQQ83ke8/yy4bHYz6rdJ8eh7?=
 =?us-ascii?Q?iTA5ivFZoT4HYlSWB4bOFWaHuhJTWF6QL7raihdm9w7wKqnv73bkYNsYOLt5?=
 =?us-ascii?Q?xel1viZ1v21RxeTy45VFeky1IFJV6Ph4bg/1zDPm6+GV9CRJEmvQpWYDSTVx?=
 =?us-ascii?Q?qxbcngnCrOVV++ADDJ+rWVyIV/DTA7LZX0aHx2Xsdpi09qsASl/1AtBqJMIG?=
 =?us-ascii?Q?gq0ErSLHpLofP8gS98B4Wroa5lslYVCo1Ql0lWxLJyNzzAOeDQpoSEkCrR73?=
 =?us-ascii?Q?D/T7bWfzGuesHrJFC5ij/GXO2n4EkGnsGwLFeT9yOhqYKQDIO1B7Yl2e8/ge?=
 =?us-ascii?Q?JrswkhE4b6HBlnkVi9cGea6Bybcds/JPkaKbUzSPumgnirhlH10HQ4x2yBfT?=
 =?us-ascii?Q?vE9PfpzYrs8WDTawfWSjIa8XU1Wp9jrT8ctxKIBSSPij0RQ3iN98K+N4rJWh?=
 =?us-ascii?Q?qvFMRU6Ns3rzRG6QcHjV9bZiJ0vjHolhlXS/vNL2KJulAuZiJ0/1XoXdB8rn?=
 =?us-ascii?Q?2w8hyesTlkl9S4MOcf/PDaNE8mBwzyUrN3J006yvFe4V7yHjrHKx5fEJsS+H?=
 =?us-ascii?Q?/PxLLrKAecxRQo3qCjsP1+//HZUymCcf9Q5WWxe/?=
X-OriginatorOrg: vmware.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 77908538-e7b9-41ca-bc27-08dbebb323e1
X-MS-Exchange-CrossTenant-AuthSource: MWHPR05MB3648.namprd05.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Nov 2023 23:31:24.0467
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: QuVI+V4o+EYHRvfXj2OXGdr9ejQMIB/9tg37Jdq2gexJ3TvT1ynGumtNUWzwEUTEYe9n1qZ8T7ePA+W5MYwkjA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY3PR05MB8275
X-Spam-Status: No, score=-2.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,
        RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 22 Nov 2023 15:32:23 -0800 (PST)

Move VMware hypercall macros to vmware.h as a preparation step
for the next commit. No functional changes besides exporting
vmware_hypercall_mode symbol.

Signed-off-by: Alexey Makhalov <amakhalov@vmware.com>
---
 arch/x86/include/asm/vmware.h | 69 ++++++++++++++++++++++++++++++-----
 arch/x86/kernel/cpu/vmware.c  | 57 +++--------------------------
 2 files changed, 66 insertions(+), 60 deletions(-)

diff --git a/arch/x86/include/asm/vmware.h b/arch/x86/include/asm/vmware.h
index ac9fc51e2b18..8cabf4a577bf 100644
--- a/arch/x86/include/asm/vmware.h
+++ b/arch/x86/include/asm/vmware.h
@@ -8,25 +8,37 @@
 
 /*
  * The hypercall definitions differ in the low word of the %edx argument
- * in the following way: the old port base interface uses the port
- * number to distinguish between high- and low bandwidth versions.
+ * in the following way: the old I/O port based interface uses the port
+ * number to distinguish between high- and low bandwidth versions, and
+ * uses IN/OUT instructions to define transfer direction.
  *
  * The new vmcall interface instead uses a set of flags to select
  * bandwidth mode and transfer direction. The flags should be loaded
  * into %dx by any user and are automatically replaced by the port
- * number if the VMWARE_HYPERVISOR_PORT method is used.
+ * number if the I/O port method is used.
  *
  * In short, new driver code should strictly use the new definition of
  * %dx content.
  */
 
-/* Old port-based version */
-#define VMWARE_HYPERVISOR_PORT    0x5658
-#define VMWARE_HYPERVISOR_PORT_HB 0x5659
+#define VMWARE_HYPERVISOR_HB		BIT(0)
+#define VMWARE_HYPERVISOR_OUT		BIT(1)
 
-/* Current vmcall / vmmcall version */
-#define VMWARE_HYPERVISOR_HB   BIT(0)
-#define VMWARE_HYPERVISOR_OUT  BIT(1)
+#define VMWARE_HYPERVISOR_PORT		0x5658
+#define VMWARE_HYPERVISOR_PORT_HB	(VMWARE_HYPERVISOR_PORT | \
+					 VMWARE_HYPERVISOR_HB)
+
+#define VMWARE_HYPERVISOR_MAGIC		0x564D5868U
+
+#define VMWARE_CMD_GETVERSION		10
+#define VMWARE_CMD_GETHZ		45
+#define VMWARE_CMD_GETVCPU_INFO		68
+#define VMWARE_CMD_STEALCLOCK		91
+
+#define CPUID_VMWARE_FEATURES_ECX_VMMCALL	BIT(0)
+#define CPUID_VMWARE_FEATURES_ECX_VMCALL	BIT(1)
+
+extern u8 vmware_hypercall_mode;
 
 /* The low bandwidth call. The low word of edx is presumed clear. */
 #define VMWARE_HYPERCALL						\
@@ -54,4 +66,43 @@
 		      "rep insb",					\
 		      "vmcall", X86_FEATURE_VMCALL,			\
 		      "vmmcall", X86_FEATURE_VMW_VMMCALL)
+
+#define VMWARE_PORT(cmd, eax, ebx, ecx, edx)				\
+	__asm__("inl (%%dx), %%eax" :					\
+		"=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) :		\
+		"a"(VMWARE_HYPERVISOR_MAGIC),				\
+		"c"(VMWARE_CMD_##cmd),					\
+		"d"(VMWARE_HYPERVISOR_PORT), "b"(UINT_MAX) :		\
+		"memory")
+
+#define VMWARE_VMCALL(cmd, eax, ebx, ecx, edx)				\
+	__asm__("vmcall" :						\
+		"=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) :		\
+		"a"(VMWARE_HYPERVISOR_MAGIC),				\
+		"c"(VMWARE_CMD_##cmd),					\
+		"d"(0), "b"(UINT_MAX) :					\
+		"memory")
+
+#define VMWARE_VMMCALL(cmd, eax, ebx, ecx, edx)				\
+	__asm__("vmmcall" :						\
+		"=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) :		\
+		"a"(VMWARE_HYPERVISOR_MAGIC),				\
+		"c"(VMWARE_CMD_##cmd),					\
+		"d"(0), "b"(UINT_MAX) :					\
+		"memory")
+
+#define VMWARE_CMD(cmd, eax, ebx, ecx, edx) do {		\
+	switch (vmware_hypercall_mode) {			\
+	case CPUID_VMWARE_FEATURES_ECX_VMCALL:			\
+		VMWARE_VMCALL(cmd, eax, ebx, ecx, edx);		\
+		break;						\
+	case CPUID_VMWARE_FEATURES_ECX_VMMCALL:			\
+		VMWARE_VMMCALL(cmd, eax, ebx, ecx, edx);	\
+		break;						\
+	default:						\
+		VMWARE_PORT(cmd, eax, ebx, ecx, edx);		\
+		break;						\
+	}							\
+	} while (0)
+
 #endif
diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c
index 11f83d07925e..4db8e1daa4a1 100644
--- a/arch/x86/kernel/cpu/vmware.c
+++ b/arch/x86/kernel/cpu/vmware.c
@@ -41,60 +41,14 @@
 
 #define CPUID_VMWARE_INFO_LEAF               0x40000000
 #define CPUID_VMWARE_FEATURES_LEAF           0x40000010
-#define CPUID_VMWARE_FEATURES_ECX_VMMCALL    BIT(0)
-#define CPUID_VMWARE_FEATURES_ECX_VMCALL     BIT(1)
 
-#define VMWARE_HYPERVISOR_MAGIC	0x564D5868
-
-#define VMWARE_CMD_GETVERSION    10
-#define VMWARE_CMD_GETHZ         45
-#define VMWARE_CMD_GETVCPU_INFO  68
-#define VMWARE_CMD_LEGACY_X2APIC  3
-#define VMWARE_CMD_VCPU_RESERVED 31
-#define VMWARE_CMD_STEALCLOCK    91
+#define VCPU_LEGACY_X2APIC	3
+#define VCPU_RESERVED		31
 
 #define STEALCLOCK_NOT_AVAILABLE (-1)
 #define STEALCLOCK_DISABLED        0
 #define STEALCLOCK_ENABLED         1
 
-#define VMWARE_PORT(cmd, eax, ebx, ecx, edx)				\
-	__asm__("inl (%%dx), %%eax" :					\
-		"=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) :		\
-		"a"(VMWARE_HYPERVISOR_MAGIC),				\
-		"c"(VMWARE_CMD_##cmd),					\
-		"d"(VMWARE_HYPERVISOR_PORT), "b"(UINT_MAX) :		\
-		"memory")
-
-#define VMWARE_VMCALL(cmd, eax, ebx, ecx, edx)				\
-	__asm__("vmcall" :						\
-		"=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) :		\
-		"a"(VMWARE_HYPERVISOR_MAGIC),				\
-		"c"(VMWARE_CMD_##cmd),					\
-		"d"(0), "b"(UINT_MAX) :					\
-		"memory")
-
-#define VMWARE_VMMCALL(cmd, eax, ebx, ecx, edx)                         \
-	__asm__("vmmcall" :						\
-		"=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) :		\
-		"a"(VMWARE_HYPERVISOR_MAGIC),				\
-		"c"(VMWARE_CMD_##cmd),					\
-		"d"(0), "b"(UINT_MAX) :					\
-		"memory")
-
-#define VMWARE_CMD(cmd, eax, ebx, ecx, edx) do {		\
-	switch (vmware_hypercall_mode) {			\
-	case CPUID_VMWARE_FEATURES_ECX_VMCALL:			\
-		VMWARE_VMCALL(cmd, eax, ebx, ecx, edx);		\
-		break;						\
-	case CPUID_VMWARE_FEATURES_ECX_VMMCALL:			\
-		VMWARE_VMMCALL(cmd, eax, ebx, ecx, edx);	\
-		break;						\
-	default:						\
-		VMWARE_PORT(cmd, eax, ebx, ecx, edx);		\
-		break;						\
-	}							\
-	} while (0)
-
 struct vmware_steal_time {
 	union {
 		uint64_t clock;	/* stolen time counter in units of vtsc */
@@ -108,7 +62,8 @@ struct vmware_steal_time {
 };
 
 static unsigned long vmware_tsc_khz __ro_after_init;
-static u8 vmware_hypercall_mode     __ro_after_init;
+u8 vmware_hypercall_mode __ro_after_init;
+EXPORT_SYMBOL_GPL(vmware_hypercall_mode);
 
 static inline int __vmware_platform(void)
 {
@@ -476,8 +431,8 @@ static bool __init vmware_legacy_x2apic_available(void)
 {
 	uint32_t eax, ebx, ecx, edx;
 	VMWARE_CMD(GETVCPU_INFO, eax, ebx, ecx, edx);
-	return !(eax & BIT(VMWARE_CMD_VCPU_RESERVED)) &&
-		(eax & BIT(VMWARE_CMD_LEGACY_X2APIC));
+	return !(eax & BIT(VCPU_RESERVED)) &&
+		(eax & BIT(VCPU_LEGACY_X2APIC));
 }
 
 #ifdef CONFIG_AMD_MEM_ENCRYPT
-- 
2.39.0