From: Feng Tang <feng.tang@intel.com>
To: Thomas Gleixner <tglx@linutronix.de>,
John Stultz <john.stultz@linaro.org>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@linux.intel.com>,
Jason Gunthorpe <jgunthorpe@obsidianresearch.com>,
x86@kernel.org, Len Brown <lenb@kernel.org>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
linux-kernel@vger.kernel.org
Cc: gong.chen@linux.intel.com, Feng Tang <feng.tang@intel.com>
Subject: [PATCH v3 3/5] x86: tsc: Add support for new S3_NONSTOP feature
Date: Wed, 6 Mar 2013 15:17:49 +0800 [thread overview]
Message-ID: <1362554271-22382-4-git-send-email-feng.tang@intel.com> (raw)
In-Reply-To: <1362554271-22382-1-git-send-email-feng.tang@intel.com>
Signed-off-by: Feng Tang <feng.tang@intel.com>
---
arch/x86/kernel/tsc.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index 4b9ea10..098b3cf 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -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 = {
@@ -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.
--
1.7.9.5
next prev parent reply other threads:[~2013-03-06 7:19 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-06 7:17 [PATCH v3 0/5] Add support for S3 non-stop TSC support Feng Tang
2013-03-06 7:17 ` [PATCH v3 1/5] x86: Add cpu capability flag X86_FEATURE_NONSTOP_TSC_S3 Feng Tang
2013-03-06 7:17 ` [PATCH v3 2/5] clocksource: Add new feature flag CLOCK_SOURCE_SUSPEND_NONSTOP Feng Tang
2013-03-06 7:17 ` Feng Tang [this message]
2013-03-06 7:17 ` [PATCH v3 4/5] clocksource: Enable clocksource_cyc2ns() to cover big cycles Feng Tang
2013-03-06 14:09 ` Thomas Gleixner
2013-03-06 14:37 ` Feng Tang
2013-03-06 16:10 ` Thomas Gleixner
2013-03-06 16:26 ` Feng Tang
2013-03-06 21:05 ` H. Peter Anvin
2013-03-06 21:15 ` Thomas Gleixner
2013-03-06 21:20 ` H. Peter Anvin
2013-03-06 21:29 ` Thomas Gleixner
2013-03-06 7:17 ` [PATCH v3 5/5] timekeeping: utilize the suspend-nonstop clocksource to count suspended time Feng Tang
2013-03-06 14:15 ` Thomas Gleixner
2013-03-06 14:29 ` Feng Tang
2013-03-06 21:33 ` Thomas Gleixner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1362554271-22382-4-git-send-email-feng.tang@intel.com \
--to=feng.tang@intel.com \
--cc=gong.chen@linux.intel.com \
--cc=hpa@linux.intel.com \
--cc=jgunthorpe@obsidianresearch.com \
--cc=john.stultz@linaro.org \
--cc=lenb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=rafael.j.wysocki@intel.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.