From patchwork Sat Dec 3 00:55:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herton Ronaldo Krzesinski X-Patchwork-Id: 129002 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 6328DB6F75 for ; Sat, 3 Dec 2011 11:55:38 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RWdsz-0007ys-5R; Sat, 03 Dec 2011 00:55:25 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RWdsx-0007yU-Jm for kernel-team@lists.ubuntu.com; Sat, 03 Dec 2011 00:55:23 +0000 Received: from 189.58.5.190.dynamic.adsl.gvt.net.br ([189.58.5.190] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1RWdsx-0003GB-5x for kernel-team@lists.ubuntu.com; Sat, 03 Dec 2011 00:55:23 +0000 From: "Herton R. Krzesinski" To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/5] (pre-stable) x86, intel, power: Correct the MSR_IA32_ENERGY_PERF_BIAS message Date: Fri, 2 Dec 2011 22:55:12 -0200 Message-Id: <1322873716-22760-2-git-send-email-herton.krzesinski@canonical.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1322873716-22760-1-git-send-email-herton.krzesinski@canonical.com> References: <1322873716-22760-1-git-send-email-herton.krzesinski@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com From: Len Brown 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 Link: http://lkml.kernel.org/r/alpine.LFD.2.02.1107151732480.18606@x980 Cc: Signed-off-by: H. Peter Anvin BugLink: http://bugs.launchpad.net/bugs/898139 (cherry-picked from commit 17edf2d79f1ea6dfdb4c444801d928953b9f98d6 upstream) Signed-off-by: Herton Ronaldo Krzesinski --- 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 8e82a52..8e97e06 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -459,11 +459,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); }