public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Len Brown <len.brown@intel.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
	table@kernel.org, tglx@linutronix.de, hpa@linux.intel.com,
	len.brown@intel.com
Subject: [tip:x86/cpu] x86, intel, power: Correct the MSR_IA32_ENERGY_PERF_BIAS message
Date: Sat, 16 Jul 2011 18:52:00 GMT	[thread overview]
Message-ID: <tip-17edf2d79f1ea6dfdb4c444801d928953b9f98d6@git.kernel.org> (raw)
In-Reply-To: <alpine.LFD.2.02.1107151732480.18606@x980>

Commit-ID:  17edf2d79f1ea6dfdb4c444801d928953b9f98d6
Gitweb:     http://git.kernel.org/tip/17edf2d79f1ea6dfdb4c444801d928953b9f98d6
Author:     Len Brown <len.brown@intel.com>
AuthorDate: Fri, 15 Jul 2011 17:37:15 -0400
Committer:  H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Fri, 15 Jul 2011 15:13:55 -0700

x86, intel, power: Correct the MSR_IA32_ENERGY_PERF_BIAS message

Fix the printk_once() so that it actually prints (didn't print before
due to a stray comma.)

[ hpa: changed to an incremental patch and adjusted the description
  accordingly. ]

Signed-off-by: Len Brown <len.brown@intel.com>
Link: http://lkml.kernel.org/r/alpine.LFD.2.02.1107151732480.18606@x980
Cc: <table@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
 arch/x86/kernel/cpu/intel.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index da0d779..ed6086e 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -465,11 +465,11 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)
 		u64 epb;
 
 		rdmsrl(MSR_IA32_ENERGY_PERF_BIAS, epb);
-		if ((epb & 0xF) == 0) {
-			printk_once(KERN_WARNING, "x86: updated energy_perf_bias"
-				" to 'normal' from 'performance'\n"
-				"You can view and update epb via utility,"
-				" such as x86_energy_perf_policy(8)\n");
+		if ((epb & 0xF) == ENERGY_PERF_BIAS_PERFORMANCE) {
+			printk_once(KERN_WARNING "ENERGY_PERF_BIAS:"
+				" Set to 'normal', was 'performance'\n"
+				"ENERGY_PERF_BIAS: View and update with"
+				" x86_energy_perf_policy(8)\n");
 			epb = (epb & ~0xF) | ENERGY_PERF_BIAS_NORMAL;
 			wrmsrl(MSR_IA32_ENERGY_PERF_BIAS, epb);
 		}

  reply	other threads:[~2011-07-16 18:52 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-30 22:21 [PATCH] x86 intel power: Initialize MSR_IA32_ENERGY_PERF_BIAS Len Brown
2011-04-14  9:08 ` Ingo Molnar
2011-04-15  6:25   ` Len Brown
2011-04-15 10:17     ` Ingo Molnar
2011-07-13 20:44       ` Len Brown
2011-07-13 20:49         ` Linus Torvalds
2011-07-13 21:38           ` H. Peter Anvin
2011-07-14  4:53             ` [PATCH v2] " Len Brown
2011-07-14 19:35               ` Rafael J. Wysocki
2011-07-14 21:12               ` [tip:x86/cpu] x86, intel, " tip-bot for Len Brown
2011-07-15  0:18                 ` [tip:x86/cpu] x86, msr: Fix typo in ENERGY_PERF_BIAS_POWERSAVE tip-bot for H. Peter Anvin
2011-07-15 21:37               ` [PATCH v3] x86 intel power: Initialize MSR_IA32_ENERGY_PERF_BIAS Len Brown
2011-07-16 18:52                 ` tip-bot for Len Brown [this message]
2011-08-18 17:23                   ` [tip:x86/cpu] x86, intel, power: Correct the MSR_IA32_ENERGY_PERF_BIAS message Christoph Fritz
2011-04-20 13:14     ` [PATCH] x86 intel power: Initialize MSR_IA32_ENERGY_PERF_BIAS Pavel Machek
2011-07-13 20:51       ` Len Brown

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=tip-17edf2d79f1ea6dfdb4c444801d928953b9f98d6@git.kernel.org \
    --to=len.brown@intel.com \
    --cc=hpa@linux.intel.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=table@kernel.org \
    --cc=tglx@linutronix.de \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox