LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Michael Kelley <mikelley@microsoft.com>
To: "gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"x86@kernel.org" <x86@kernel.org>,
"tglx@linutronix.de" <tglx@linutronix.de>,
"daniel.lezcano@linaro.org" <daniel.lezcano@linaro.org>,
"olaf@aepfle.de" <olaf@aepfle.de>,
"apw@canonical.com" <apw@canonical.com>,
vkuznets <vkuznets@redhat.com>,
"jasowang@redhat.com" <jasowang@redhat.com>,
"marcelo.cerri@canonical.com" <marcelo.cerri@canonical.com>,
Stephen Hemminger <sthemmin@microsoft.com>,
KY Srinivasan <kys@microsoft.com>
Cc: Michael Kelley <mikelley@microsoft.com>
Subject: [PATCH v2 char-misc 1/1] x86/hyperv: Fix PIT shutdown quirk
Date: Mon, 22 Oct 2018 16:34:13 +0000 [thread overview]
Message-ID: <1540226025-45092-1-git-send-email-mikelley@microsoft.com> (raw)
pit_shutdown() doesn't work on Hyper-V because of a quirk in the
PIT emulation. After shutdown the emulated PIT continues to interrupt
@18.2 HZ. This problem exists in all versions of Hyper-V and just
had not previously been noticed. So replace the normal PIT shutdown
function with an alternate version that works on Hyper-V.
The alternate shutdown function could go in the i8253.c module,
but it seems better to keep the hack with the Hyper-V code rather
than clutter up i8253.c with #ifdef CONFIG_HYPERV.
Signed-off-by: Michael Kelley <mikelley@microsoft.com>
---
Changes in v2:
* Fixed commit message and comment in the code to indicate
that the PIT continues to interrupt @18.2 HZ, not every
18.2 seconds. [Dexuan Cui]
---
arch/x86/hyperv/hv_init.c | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/arch/x86/hyperv/hv_init.c b/arch/x86/hyperv/hv_init.c
index 7abb09e..514fcbe 100644
--- a/arch/x86/hyperv/hv_init.c
+++ b/arch/x86/hyperv/hv_init.c
@@ -32,6 +32,9 @@
#include <linux/slab.h>
#include <linux/cpuhotplug.h>
+#include <linux/io.h>
+#include <linux/i8253.h>
+
#ifdef CONFIG_HYPERV_TSCPAGE
static struct ms_hyperv_tsc_page *tsc_pg;
@@ -97,6 +100,26 @@ static u64 read_hv_clock_msr(struct clocksource *arg)
u32 hv_max_vp_index;
+#if defined(CONFIG_CLKEVT_I8253)
+/*
+ * Hyper-V emulation of the PIT has a quirk such that the
+ * normal i8253 pit_shutdown() routine doesn't stop the PIT.
+ * It keeps interrupting @18.2 HZ. This alternate
+ * shutdown routine mirrors the normal one, but does not
+ * set the counter value to zero.
+ */
+static int hyperv_pit_shutdown(struct clock_event_device *evt)
+{
+ if (!clockevent_state_oneshot(evt) && !clockevent_state_periodic(evt))
+ return 0;
+
+ raw_spin_lock(&i8253_lock);
+ outb_p(0x30, PIT_MODE);
+ raw_spin_unlock(&i8253_lock);
+ return 0;
+}
+#endif
+
static int hv_cpu_init(unsigned int cpu)
{
u64 msr_vp_index;
@@ -325,6 +348,14 @@ void __init hyperv_init(void)
if (cpuhp < 0)
goto free_vp_assist_page;
+#if defined(CONFIG_CLKEVT_I8253)
+ /*
+ * Override the PIT shutdown routine due to a quirk in
+ * Hyper-V emulation of the PIT.
+ */
+ i8253_clockevent.set_state_shutdown = hyperv_pit_shutdown;
+#endif
+
/*
* Setup the hypercall page and enable hypercalls.
* 1. Register the guest ID
--
1.8.3.1
next reply other threads:[~2018-10-22 16:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-22 16:34 Michael Kelley [this message]
2018-10-30 8:35 ` Thomas Gleixner
2018-10-30 13:41 ` Michael Kelley
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=1540226025-45092-1-git-send-email-mikelley@microsoft.com \
--to=mikelley@microsoft.com \
--cc=apw@canonical.com \
--cc=daniel.lezcano@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=jasowang@redhat.com \
--cc=kys@microsoft.com \
--cc=linux-kernel@vger.kernel.org \
--cc=marcelo.cerri@canonical.com \
--cc=olaf@aepfle.de \
--cc=sthemmin@microsoft.com \
--cc=tglx@linutronix.de \
--cc=vkuznets@redhat.com \
--cc=x86@kernel.org \
--subject='Re: [PATCH v2 char-misc 1/1] x86/hyperv: Fix PIT shutdown quirk' \
/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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).