From patchwork Tue Nov 17 20:21:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Enrico Weigelt, metux IT consult" X-Patchwork-Id: 11913503 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 603F5C63777 for ; Tue, 17 Nov 2020 20:22:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 19264221F1 for ; Tue, 17 Nov 2020 20:22:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726647AbgKQUWH (ORCPT ); Tue, 17 Nov 2020 15:22:07 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:34937 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726636AbgKQUWH (ORCPT ); Tue, 17 Nov 2020 15:22:07 -0500 Received: from orion.localdomain ([95.118.38.12]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MxV4T-1kLnHF1wKX-00xrRX; Tue, 17 Nov 2020 21:21:36 +0100 From: "Enrico Weigelt, metux IT consult" To: linux-kernel@vger.kernel.org Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, x86@kernel.org, hpa@zytor.com, dmitry.torokhov@gmail.com, derek.kiernan@xilinx.com, dragan.cvetic@xilinx.com, richardcochran@gmail.com, linux-hyperv@vger.kernel.org, linux-input@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH 1/2] x86: make vmware support optional Date: Tue, 17 Nov 2020 21:21:33 +0100 Message-Id: <20201117202134.6312-1-info@metux.net> X-Mailer: git-send-email 2.11.0 X-Provags-ID: V03:K1:fj7bI7mxdFqhriaDicYuz7rizi0CREEvGlsNB/AQyB8FEbrW0oH B52rlTGY4CnMVb+RyM4Qc38z7ak4H7tmwcHOts9ktXZWiM5bAecB9zFr3hzGQp65FPRzK1I OL2SbPsDtWwQyYJbmQ8kRnCfgIxJSbty28soy9TljpmlROSSyhqNIaE3ws74KdgYuQigXd9 RCeOeaogZgrc886CMZOHA== X-UI-Out-Filterresults: notjunk:1;V03:K0:PW0Dl+stmBc=:ADu7HeDjtlv53rpmVSMYa0 VS5RyG8whEA+BocAFE+4MbVYTS3Ojfb9lI2FcoW5U2VioSQ1XHcnccHAzV+vlX+53viq5PgJA rkhAquzR+na/exO5tmR5WKRZVF7/l6o15k31/fIw4cZ+Y9mywZaCQ5V3Riv4DaQn7kqzM0IJU clKvmid/dRtUzz1c6Y7OE3PqlA/LDCzC2YrPpctLzmTDqGc7nxppMGRk5zF9CIV5Pma8xGiEe xXyrL1ozXgUERKIvHDhIG63K0dYmPDjvdbElbopPR9pMbq+TrVKQtXveKmz8MSk3dkquuIQi7 MPCZecu/LVDORd6irMrKq2vzGBJWn2s2WkoRI6Zpc76zA0Y9Zmo3CeYDmmy7Gy1O/3jmiSISa PY2qcS99pUqnw6qZR+0v5nwSGUseDDcIvUDcd9a564pgb4Ujbeqx029yYPYab Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org --- arch/x86/Kconfig | 7 +++++++ arch/x86/kernel/cpu/Makefile | 4 +++- arch/x86/kernel/cpu/hypervisor.c | 2 ++ drivers/input/mouse/Kconfig | 2 +- drivers/misc/Kconfig | 2 +- drivers/ptp/Kconfig | 2 +- 6 files changed, 15 insertions(+), 4 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index f6946b81f74a..c227c1fa0091 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -801,6 +801,13 @@ config X86_HV_CALLBACK_VECTOR source "arch/x86/xen/Kconfig" +config VMWARE_GUEST + bool "Vmware Guest support" + default y + help + This option enables several optimizations for running under the + VMware hypervisor. + config KVM_GUEST bool "KVM Guest support (including kvmclock)" depends on PARAVIRT diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index 93792b457b81..a615b0152bf0 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile @@ -51,7 +51,9 @@ obj-$(CONFIG_X86_CPU_RESCTRL) += resctrl/ obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o -obj-$(CONFIG_HYPERVISOR_GUEST) += vmware.o hypervisor.o mshyperv.o +obj-$(CONFIG_HYPERVISOR_GUEST) += hypervisor.o mshyperv.o +obj-$(CONFIG_VMWARE_GUEST) += vmware.o + obj-$(CONFIG_ACRN_GUEST) += acrn.o ifdef CONFIG_X86_FEATURE_NAMES diff --git a/arch/x86/kernel/cpu/hypervisor.c b/arch/x86/kernel/cpu/hypervisor.c index 553bfbfc3a1b..c0e770a224aa 100644 --- a/arch/x86/kernel/cpu/hypervisor.c +++ b/arch/x86/kernel/cpu/hypervisor.c @@ -34,7 +34,9 @@ static const __initconst struct hypervisor_x86 * const hypervisors[] = #ifdef CONFIG_XEN_PVHVM &x86_hyper_xen_hvm, #endif +#ifdef CONFIG_VMWARE_GUEST &x86_hyper_vmware, +#endif &x86_hyper_ms_hyperv, #ifdef CONFIG_KVM_GUEST &x86_hyper_kvm, diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig index d8b6a5dab190..29ced69d5c85 100644 --- a/drivers/input/mouse/Kconfig +++ b/drivers/input/mouse/Kconfig @@ -186,7 +186,7 @@ config MOUSE_PS2_FOCALTECH config MOUSE_PS2_VMMOUSE bool "Virtual mouse (vmmouse)" - depends on MOUSE_PS2 && X86 && HYPERVISOR_GUEST + depends on MOUSE_PS2 && X86 && VMWARE_GUEST help Say Y here if you are running under control of VMware hypervisor (ESXi, Workstation or Fusion). Also make sure that when you enable diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index fafa8b0d8099..d2bd8eff6eb6 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -363,7 +363,7 @@ config DS1682 config VMWARE_BALLOON tristate "VMware Balloon Driver" - depends on VMWARE_VMCI && X86 && HYPERVISOR_GUEST + depends on VMWARE_VMCI && X86 && VMWARE_GUEST select MEMORY_BALLOON help This is VMware physical memory management driver which acts diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig index 942f72d8151d..6bf30153270e 100644 --- a/drivers/ptp/Kconfig +++ b/drivers/ptp/Kconfig @@ -141,7 +141,7 @@ config PTP_1588_CLOCK_IDTCM config PTP_1588_CLOCK_VMW tristate "VMware virtual PTP clock" - depends on ACPI && HYPERVISOR_GUEST && X86 + depends on ACPI && VMWARE_GUEST && X86 depends on PTP_1588_CLOCK help This driver adds support for using VMware virtual precision