diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-01-10 15:06:34 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-01-10 16:31:36 +0300 |
| commit | c8bc44c5f96172fdaab66a268a53dccc6c7ffa87 (patch) | |
| tree | 7bf5c1ae407586ffa7ba1f96eb191ccc2b617899 /drivers/clocksource/hyperv_timer.c | |
| parent | 1acb10106df3062d221af9b3124de4d968ee34d2 (diff) | |
| download | linux-c8bc44c5f96172fdaab66a268a53dccc6c7ffa87.tar.xz | |
Revert "x86/hyperv: Fix hv tsc page based sched_clock for hibernation"
This reverts commit 6681113633dc738ec95fe33104843a1e25acef3b which is
commit bcc80dec91ee745b3d66f3e48f0ec2efdea97149 upstream.
The dependant patch before this one caused build errors in the 6.6.y
tree, so revert this for now so that we can fix them up properly.
Reported-by: Ignat Korchagin <ignat@cloudflare.com>
Link: https://lore.kernel.org/r/3DB3A6D3-0D3A-4682-B4FA-407B2D3263B2@cloudflare.com
Reported-by: Lars Wendler <wendler.lars@web.de>
Link: https://lore.kernel.org/r/20250110103328.0e3906a8@chagall.paradoxon.rec
Reported-by: Chris Clayton <chris2553@googlemail.com>
Link: https://lore.kernel.org/r/10c7be00-b1f8-4389-801b-fb2d0b22468d@googlemail.com
Cc: Dexuan Cui <decui@microsoft.com>
Cc: Naman Jain <namjain@linux.microsoft.com>
Cc: Michael Kelley <mhklinux@outlook.com>
Cc: Wei Liu <wei.liu@kernel.org>
Cc: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/clocksource/hyperv_timer.c')
| -rw-r--r-- | drivers/clocksource/hyperv_timer.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/clocksource/hyperv_timer.c b/drivers/clocksource/hyperv_timer.c index 5eec1457e139..8ff7cd4e20bb 100644 --- a/drivers/clocksource/hyperv_timer.c +++ b/drivers/clocksource/hyperv_timer.c @@ -27,8 +27,7 @@ #include <asm/mshyperv.h> static struct clock_event_device __percpu *hv_clock_event; -/* Note: offset can hold negative values after hibernation. */ -static u64 hv_sched_clock_offset __read_mostly; +static u64 hv_sched_clock_offset __ro_after_init; /* * If false, we're using the old mechanism for stimer0 interrupts @@ -457,17 +456,6 @@ static void resume_hv_clock_tsc(struct clocksource *arg) hv_set_register(HV_REGISTER_REFERENCE_TSC, tsc_msr.as_uint64); } -/* - * Called during resume from hibernation, from overridden - * x86_platform.restore_sched_clock_state routine. This is to adjust offsets - * used to calculate time for hv tsc page based sched_clock, to account for - * time spent before hibernation. - */ -void hv_adj_sched_clock_offset(u64 offset) -{ - hv_sched_clock_offset -= offset; -} - #ifdef HAVE_VDSO_CLOCKMODE_HVCLOCK static int hv_cs_enable(struct clocksource *cs) { |