FAILED: patch "[PATCH] clocksource/drivers/hyper-v: Make sched clock return" failed to apply to 5.5-stable tree

The patch below does not apply to the 5.5-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 749da8ca978f19710aba496208c480ad42d37f79 Mon Sep 17 00:00:00 2001
From: Yubo Xie <[email protected]>
Date: Thu, 26 Mar 2020 19:11:59 -0700
Subject: [PATCH] clocksource/drivers/hyper-v: Make sched clock return
nanoseconds correctly

The sched clock read functions return the HV clock (100ns granularity) without converting it to nanoseconds.

Add the missing conversion.

index 9d808d595ca8..eb0ba7818eb0 100644
@@ -343,7 +343,8 @@ static u64 notrace read_hv_clock_tsc_cs(struct clocksource *arg)
 
 static u64 read_hv_sched_clock_tsc(void)
 {
-	return read_hv_clock_tsc() - hv_sched_clock_offset;
+	return (read_hv_clock_tsc() - hv_sched_clock_offset) *
+		(NSEC_PER_SEC / HV_CLOCK_HZ);
 }
 
 static void suspend_hv_clock_tsc(struct clocksource *arg)

@@ -398,7 +399,8 @@ static u64 notrace read_hv_clock_msr_cs(struct clocksource *arg)
 
 static u64 read_hv_sched_clock_msr(void)
 {
-	return read_hv_clock_msr() - hv_sched_clock_offset;
+	return (read_hv_clock_msr() - hv_sched_clock_offset) *
+		(NSEC_PER_SEC / HV_CLOCK_HZ);
 }
 
 static struct clocksource hyperv_cs_msr = {

We don't have 0af3e137c144 ("clocksource/drivers/hyper-v: Untangle stimers and timesync from clocksources") on 5.5 and older. I've adjusted this patch and queued it for 5.5 and 5.4.

Thanks,
Sasha