Skip to content

Commit

Permalink
x86: tsc: Add support for new S3_NONSTOP feature
Browse files Browse the repository at this point in the history
Add support for new S3_NONSTOP feature

Signed-off-by: Feng Tang <feng.tang@intel.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
  • Loading branch information
Feng Tang authored and John Stultz committed Mar 15, 2013
1 parent 5caf463 commit 82f9c08
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion arch/x86/kernel/tsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,8 @@ static cycle_t read_tsc(struct clocksource *cs)

static void resume_tsc(struct clocksource *cs)
{
clocksource_tsc.cycle_last = 0;
if (!boot_cpu_has(X86_FEATURE_NONSTOP_TSC_S3))
clocksource_tsc.cycle_last = 0;
}

static struct clocksource clocksource_tsc = {
Expand Down Expand Up @@ -939,6 +940,9 @@ static int __init init_tsc_clocksource(void)
clocksource_tsc.flags &= ~CLOCK_SOURCE_IS_CONTINUOUS;
}

if (boot_cpu_has(X86_FEATURE_NONSTOP_TSC_S3))
clocksource_tsc.flags |= CLOCK_SOURCE_SUSPEND_NONSTOP;

/*
* Trust the results of the earlier calibration on systems
* exporting a reliable TSC.
Expand Down

0 comments on commit 82f9c08

Please sign in to comment.