From patchwork Wed Mar 23 02:26:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Len Brown X-Patchwork-Id: 654141 Received: from smtp1.linux-foundation.org (smtp1.linux-foundation.org [140.211.169.13]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2N2XbXn024674 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL) for ; Wed, 23 Mar 2011 02:33:58 GMT Received: from daredevil.linux-foundation.org (localhost [127.0.0.1]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id p2N2W9tV026453; Tue, 22 Mar 2011 19:32:10 -0700 Received: from vms173005pub.verizon.net (vms173005pub.verizon.net [206.46.173.5]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id p2N2ROLP026043 for ; Tue, 22 Mar 2011 19:27:25 -0700 Received: from localhost.localdomain ([unknown] [74.104.148.74]) by vms173005.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0LIH00IY2O52AQM2@vms173005.mailsrvcs.net> for linux-pm@lists.linux-foundation.org; Tue, 22 Mar 2011 21:27:10 -0500 (CDT) Received: from localhost.localdomain (x980 [127.0.0.1]) by localhost.localdomain (8.14.4/8.14.4) with ESMTP id p2N2R0BC010522; Tue, 22 Mar 2011 22:27:01 -0400 Received: from localhost (lenb@localhost) by localhost.localdomain (8.14.4/8.14.4/Submit) with ESMTP id p2N2Qx9B010519; Tue, 22 Mar 2011 22:26:59 -0400 X-Authentication-warning: localhost.localdomain: lenb owned process doing -bs Date: Tue, 22 Mar 2011 22:26:59 -0400 (EDT) From: Len Brown X-X-Sender: lenb@x980 To: stable@kernel.org In-reply-to: Message-id: References: User-Agent: Alpine 2.02 (LFD 1266 2009-07-14) MIME-version: 1.0 Received-SPF: pass (localhost is always allowed.) X-Spam-Status: No, hits=-4.288 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SUBJECT_BRACKETED X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.21 Cc: linux-pm@lists.linux-foundation.org Subject: [linux-pm] [PATCH 2/2 2.6.37.stable] intel_idle: disable Atom/Lincroft HW C-state auto-demotion X-BeenThere: linux-pm@lists.linux-foundation.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Linux power management List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-pm-bounces@lists.linux-foundation.org Errors-To: linux-pm-bounces@lists.linux-foundation.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 23 Mar 2011 02:33:58 +0000 (UTC) Index: linux-2.6.37.y/arch/x86/include/asm/msr-index.h =================================================================== --- linux-2.6.37.y.orig/arch/x86/include/asm/msr-index.h +++ linux-2.6.37.y/arch/x86/include/asm/msr-index.h @@ -39,6 +39,7 @@ #define MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2 #define NHM_C3_AUTO_DEMOTE (1UL << 25) #define NHM_C1_AUTO_DEMOTE (1UL << 26) +#define ATM_LNC_C6_AUTO_DEMOTE (1UL << 25) #define MSR_MTRRcap 0x000000fe #define MSR_IA32_BBL_CR_CTL 0x00000119 Index: linux-2.6.37.y/drivers/idle/intel_idle.c =================================================================== --- linux-2.6.37.y.orig/drivers/idle/intel_idle.c +++ linux-2.6.37.y/drivers/idle/intel_idle.c @@ -340,8 +340,12 @@ static int intel_idle_probe(void) break; case 0x1C: /* 28 - Atom Processor */ + cpuidle_state_table = atom_cstates; + break; + case 0x26: /* 38 - Lincroft Atom Processor */ cpuidle_state_table = atom_cstates; + auto_demotion_disable_flags = ATM_LNC_C6_AUTO_DEMOTE; break; case 0x2A: /* SNB */