From: "tip-bot2 for Alexey Makhalov" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Alexey Makhalov <amakhalov@vmware.com>,
Thomas Gleixner <tglx@linutronix.de>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/vmware] x86/vmware: Avoid TSC recalibration when frequency is known
Date: Sun, 28 Mar 2021 19:14:54 -0000 [thread overview]
Message-ID: <161695889422.398.4252650912091762671.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20210105004752.131069-1-amakhalov@vmware.com>
The following commit has been merged into the x86/vmware branch of tip:
Commit-ID: 0b4a285e2c65c2c9449c6eccb87298e385213e7b
Gitweb: https://git.kernel.org/tip/0b4a285e2c65c2c9449c6eccb87298e385213e7b
Author: Alexey Makhalov <amakhalov@vmware.com>
AuthorDate: Mon, 04 Jan 2021 16:47:52 -08:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Sun, 28 Mar 2021 21:11:43 +02:00
x86/vmware: Avoid TSC recalibration when frequency is known
When the TSC frequency is known because it is retrieved from the
hypervisor, skip TSC refined calibration by setting X86_FEATURE_TSC_KNOWN_FREQ.
Signed-off-by: Alexey Makhalov <amakhalov@vmware.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20210105004752.131069-1-amakhalov@vmware.com
---
arch/x86/kernel/cpu/vmware.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c
index c6ede3b..8316411 100644
--- a/arch/x86/kernel/cpu/vmware.c
+++ b/arch/x86/kernel/cpu/vmware.c
@@ -378,6 +378,8 @@ static void __init vmware_set_capabilities(void)
{
setup_force_cpu_cap(X86_FEATURE_CONSTANT_TSC);
setup_force_cpu_cap(X86_FEATURE_TSC_RELIABLE);
+ if (vmware_tsc_khz)
+ setup_force_cpu_cap(X86_FEATURE_TSC_KNOWN_FREQ);
if (vmware_hypercall_mode == CPUID_VMWARE_FEATURES_ECX_VMCALL)
setup_force_cpu_cap(X86_FEATURE_VMCALL);
else if (vmware_hypercall_mode == CPUID_VMWARE_FEATURES_ECX_VMMCALL)
prev parent reply other threads:[~2021-03-28 19:16 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-05 0:47 [PATCH] x86/vmware: avoid TSC recalibration Alexey Makhalov
2021-01-05 0:47 ` Alexey Makhalov
2021-01-05 13:06 ` Vitaly Kuznetsov
2021-01-05 13:06 ` Vitaly Kuznetsov
2021-03-15 22:24 ` Alexey Makhalov
2021-03-15 22:24 ` Alexey Makhalov
2021-03-28 19:14 ` tip-bot2 for Alexey Makhalov [this message]
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=161695889422.398.4252650912091762671.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=amakhalov@vmware.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/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: link
Be 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.