clocksource/drivers: Suspend/resume Hyper-V clocksource for hibernation
Subsystems (4)
Dexuan Cui
maintainerPATCH v6 1/1 clocksource/drivers: Suspend/resume Hyper-V clocksource for hibernation
This is needed for hibernation, e.g. when we resume the old kernel, we need to disable the "current" kernel's TSC page and then resume the old kernel's.
---
This patch is part of the v5 patchset:
https://lkml.org/lkml/2019/9/5/1158
https://lkml.org/lkml/2019/9/5/1161
Actually v6 is the same as v1 (v2~v5 were posted with the other patches).
Please pick up this patch into the tip.git tree, probably onto the branch
timers/core.
drivers/clocksource/hyperv_timer.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
drivers/clocksource/hyperv_timer.c +25 -0
@@ -330,12 +330,37 @@ static u64 read_hv_sched_clock_tsc(void)return read_hv_clock_tsc (NULL ) - hv_sched_clock_offset; } +static void suspend_hv_clock_tsc (struct clocksource *arg) +{ +u64 tsc_msr; + +/* Disable the TSC page */ +hv_get_reference_tsc (tsc_msr); + tsc_msr &= ~BIT_ULL (0 ); +hv_set_reference_tsc (tsc_msr); +} + + +static void resume_hv_clock_tsc (struct clocksource *arg) +{ +phys_addr_t phys_addr =virt_to_phys (&tsc_pg); +u64 tsc_msr; + +/* Re-enable the TSC page */ +hv_get_reference_tsc (tsc_msr); + tsc_msr &=GENMASK_ULL (11 ,0 ); + tsc_msr |=BIT_ULL (0 ) | (u64 )phys_addr; +hv_set_reference_tsc (tsc_msr); +} +static struct clocksource hyperv_cs_tsc = { .name ="hyperv_clocksource_tsc_page" , .rating =400 , .read = read_hv_clock_tsc, .mask =CLOCKSOURCE_MASK (64 ), .flags =CLOCK_SOURCE_IS_CONTINUOUS , + .suspend= suspend_hv_clock_tsc, + .resume = resume_hv_clock_tsc, }; static u64 notrace read_hv_clock_msr(struct clocksource *arg)
Signature · 1 line
2.19.1
Daniel Lezcano
AppliedQuoted 7 lines · Dexuan Cui
This is needed for hibernation, e.g. when we resume the old kernel, we need to disable the "current" kernel's TSC page and then resume the old kernel's.
Signed-off-by Dexuan Cui <[email protected]>Reviewed-by Michael Kelley <[email protected]>---
Quoted 8 lines
This patch is part of the v5 patchset:
https://lkml.org/lkml/2019/9/5/1158
https://lkml.org/lkml/2019/9/5/1161Actually v6 is the same as v1 (v2~v5 were posted with the other patches).
Please pick up this patch into the tip.git tree, probably onto the branch
timers/core.
Applied, thanks!
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
[tip: timers/core] clocksource/drivers/hyper-v: Suspend/resume Hyper-V clocksource for hibernation
In reply to Dexuan CuiThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 1349401ff1aa425e7381ed26feb63e0d6b557fc6 Gitweb: https://git.kernel.org/tip/1349401ff1aa425e7381ed26feb63e0d6b557fc6 Author: Dexuan Cui <[email protected]> AuthorDate: Tue, 19 Nov 2019 23:12:26 -08:00 Committer: Daniel Lezcano <[email protected]> CommitterDate: Thu, 16 Jan 2020 19:06:57 +01:00
clocksource/drivers/hyper-v: Suspend/resume Hyper-V clocksource for hibernation
This is needed for hibernation, e.g. when we resume the old kernel, we need to disable the "current" kernel's TSC page and then resume the old kernel's.
--- drivers/clocksource/hyperv_timer.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
drivers/clocksource/hyperv_timer.c +25 -0
@@ -330,12 +330,37 @@ static u64 read_hv_sched_clock_tsc(void)return read_hv_clock_tsc (NULL ) - hv_sched_clock_offset; } +static void suspend_hv_clock_tsc (struct clocksource *arg) +{ +u64 tsc_msr; + +/* Disable the TSC page */ +hv_get_reference_tsc (tsc_msr); + tsc_msr &= ~BIT_ULL (0 ); +hv_set_reference_tsc (tsc_msr); +} + + +static void resume_hv_clock_tsc (struct clocksource *arg) +{ +phys_addr_t phys_addr =virt_to_phys (&tsc_pg); +u64 tsc_msr; + +/* Re-enable the TSC page */ +hv_get_reference_tsc (tsc_msr); + tsc_msr &=GENMASK_ULL (11 ,0 ); + tsc_msr |=BIT_ULL (0 ) | (u64 )phys_addr; +hv_set_reference_tsc (tsc_msr); +} +static struct clocksource hyperv_cs_tsc = { .name ="hyperv_clocksource_tsc_page" , .rating =400 , .read = read_hv_clock_tsc, .mask =CLOCKSOURCE_MASK (64 ), .flags =CLOCK_SOURCE_IS_CONTINUOUS , + .suspend= suspend_hv_clock_tsc, + .resume = resume_hv_clock_tsc, }; static u64 notrace read_hv_clock_msr(struct clocksource *arg)