Fixes for 5.4

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.4/clocksource-drivers-hyper-v-untangle-stimers-and-tim.patch b/queue-5.4/clocksource-drivers-hyper-v-untangle-stimers-and-tim.patch
new file mode 100644 (file)
index 0000000..148bc80
--- /dev/null
+++ b/queue-5.4/clocksource-drivers-hyper-v-untangle-stimers-and-tim.patch
@@ -0,0 +1,60 @@
+From 8f51fe1e80aec2c012677c7924dfd19d0d0a0173 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Thu, 26 Mar 2020 19:11:59 -0700
+Subject: clocksource/drivers/hyper-v: Untangle stimers and timesync from
+ clocksources
+
+From: Yubo Xie <yuboxie@microsoft.com>
+
+[ Upstream commit 0af3e137c144377fbaf5025ba784ff5ba7ad40c9 ]
+
+hyperv_timer.c exports hyperv_cs, which is used by stimers and the
+timesync mechanism.  However, the clocksource dependency is not
+needed: these mechanisms only depend on the partition reference
+counter (which can be read via a MSR or via the TSC Reference Page).
+
+Introduce the (function) pointer hv_read_reference_counter, as an
+embodiment of the partition reference counter read, and export it
+in place of the hyperv_cs pointer.  The latter can be removed.
+
+This should clarify that there's no relationship between Hyper-V
+stimers & timesync and the Linux clocksource abstractions.  No
+functional or semantic change.
+
+Suggested-by: Michael Kelley <mikelley@microsoft.com>
+Signed-off-by: Andrea Parri <parri.andrea@gmail.com>
+Reviewed-by: Michael Kelley <mikelley@microsoft.com>
+Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
+Link: https://lore.kernel.org/r/20200109160650.16150-2-parri.andrea@gmail.com
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/clocksource/hyperv_timer.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/clocksource/hyperv_timer.c b/drivers/clocksource/hyperv_timer.c
+index 2317d4e3daaff..36933e2b3b0df 100644
+--- a/drivers/clocksource/hyperv_timer.c
++++ b/drivers/clocksource/hyperv_timer.c
+@@ -233,7 +233,8 @@ static u64 notrace read_hv_clock_tsc(struct clocksource *arg)
+ 
+ static u64 read_hv_sched_clock_tsc(void)
+ {
+-      return read_hv_clock_tsc(NULL) - hv_sched_clock_offset;
++      return (read_hv_clock_tsc(NULL) - hv_sched_clock_offset) *
++              (NSEC_PER_SEC / HV_CLOCK_HZ);
+ }
+ 
+ static struct clocksource hyperv_cs_tsc = {
+@@ -258,7 +259,8 @@ static u64 notrace read_hv_clock_msr(struct clocksource *arg)
+ 
+ static u64 read_hv_sched_clock_msr(void)
+ {
+-      return read_hv_clock_msr(NULL) - hv_sched_clock_offset;
++      return (read_hv_clock_msr(NULL) - hv_sched_clock_offset) *
++              (NSEC_PER_SEC / HV_CLOCK_HZ);
+ }
+ 
+ static struct clocksource hyperv_cs_msr = {
+-- 
+2.20.1
+

diff --git a/queue-5.4/series b/queue-5.4/series
index d4bb382a3024c35f36880aaa190d75aa01aae0af..049e339080426b458ed2efd95965d202baa73298 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -132,3 +132,4 @@ bpf-sockmap-remove-bucket-lock-from-sock_-hash-map-_free.patch
 arm-dts-sun8i-a83t-tbs-a711-fix-usb-otg-mode-detection.patch
 vti6-fix-memory-leak-of-skb-if-input-policy-check-fails.patch
 r8169-fix-phy-driver-check-on-platforms-w-o-module-softdeps.patch
+clocksource-drivers-hyper-v-untangle-stimers-and-tim.patch