Patchwork Lucid SRU: UBUNTU: SAUCE: igb: Protect stats update

login
register
mail settings
Submitter Tim Gardner
Date Sept. 21, 2011, 2:26 p.m.
Message ID <4E79F41A.5000806@canonical.com>
Download mbox | patch
Permalink /patch/115790/
State New
Headers show

Comments

Tim Gardner - Sept. 21, 2011, 2:26 p.m.
On 09/21/2011 07:43 AM, Tim Gardner wrote:
> This patch is a partial backport of upstream
> 12dcd86b75d571772512676ab301279952efc0b0. Its purpose is twofold; 1)
> Protect simultaneous readers and writers, 2) refresh statistics when
> read from ethtool.
>
> rtg
>

It was pointed out to me on IRC that this change requires an additional 
patch.

rtg
Tim Gardner - Sept. 21, 2011, 2:36 p.m.
On 09/21/2011 08:26 AM, Tim Gardner wrote:
> On 09/21/2011 07:43 AM, Tim Gardner wrote:
>> This patch is a partial backport of upstream
>> 12dcd86b75d571772512676ab301279952efc0b0. Its purpose is twofold; 1)
>> Protect simultaneous readers and writers, 2) refresh statistics when
>> read from ethtool.
>>
>> rtg
>>
>
> It was pointed out to me on IRC that this change requires an additional
> patch.
>
> rtg
>

Doh! Of course I meant 'x86, intel, power: Initialize 
MSR_IA32_ENERGY_PERF_BIAS'. Anyways, patch applied and pushed with 
Stefan's ack.

rtg

Patch

From fccdf41f8b3748e3808a2e52fe35f78fd75cfcc9 Mon Sep 17 00:00:00 2001
From: Len Brown <len.brown@intel.com>
Date: Fri, 15 Jul 2011 17:37:15 -0400
Subject: [PATCH] x86, intel, power: Correct the MSR_IA32_ENERGY_PERF_BIAS message

BugLink: http://bugs.launchpad.net/bugs/829566

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>
(cherry picked from commit 17edf2d79f1ea6dfdb4c444801d928953b9f98d6)

Signed-off-by: Tim Gardner <tim.gardner@canonical.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 7c1ca07..24cba78 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -457,11 +457,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);
 		}
-- 
1.7.0.4