From patchwork Wed Mar 1 05:27:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Len Brown X-Patchwork-Id: 9597731 X-Patchwork-Delegate: rjw@sisk.pl Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1100E604DC for ; Wed, 1 Mar 2017 07:28:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 02B801FF28 for ; Wed, 1 Mar 2017 07:28:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E961428174; Wed, 1 Mar 2017 07:28:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 83AD91FF28 for ; Wed, 1 Mar 2017 07:28:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750725AbdCAH2Y (ORCPT ); Wed, 1 Mar 2017 02:28:24 -0500 Received: from mail-qk0-f196.google.com ([209.85.220.196]:33181 "EHLO mail-qk0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751499AbdCAH2V (ORCPT ); Wed, 1 Mar 2017 02:28:21 -0500 Received: by mail-qk0-f196.google.com with SMTP id n186so8617652qkb.0 for ; Tue, 28 Feb 2017 23:28:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references:reply-to:organization; bh=iagrm+3P47KwwBE2hi+hsMOFCwR+t0lC1y3E0/6qdDs=; b=Lm9KRFN3cBhDMTEjYgJhvLLBdvoJgS9flyHrOi89alw6WVGYo2CRLSeUoO+5b24uLD 6r1eFyycxAymub/nLBPvLfhXDrYCAYh9qt2EWrARZq+o23NySDtp3fhmH0kob2eu8ryU 0wE/lU9DudwW6au6UVnJUcAhErQd1ysoXfZ7svNFCDllu26EXowS/uHLyCKwaW3mXB1p zTAsy2OLKRg9KpAM9CEOheKT9z8fKcgo3YAQbWZrcdUoqekrzlJRwHrGcxYXwY8bmQSA uN2tCf3e7ZbFfHT0CHSM0MNgE0iG6/sWkCVW7LsZ7u0c4+X5vrr/nnd94QLUBVcNmix1 oVsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:in-reply-to:references:reply-to:organization; bh=iagrm+3P47KwwBE2hi+hsMOFCwR+t0lC1y3E0/6qdDs=; b=rerADKAOHEc4lGSyJFm2avFqew6fsIreaIXBSTCFMCv9XURpDV9ZVa/A5CUwS+V0xB SiokV6kb0sRIRm7TroTWc9FcfdiRBWlKQSsYcvpp6nhsqICb6TNS6jgSrYLyvXIE0nX+ sQNbBKvSKyBrdzRMonK8utsgcYl4N4Hvr8AYwqL3AyoiCaw8ZZA1/49HNWl9e6PFy4Iq yA430FPAMhzHa/X47F+0VR5LEuHKwIGLp6705NJwI35R+nOFJCHkkfx3Al5tYdScWhhu ESl//6lxMayZiCeYaObdFEzqXwlJO/P1w3J1TP0Dj42j73NdNcp8jlwOF1D0zI8SWd3d wL6w== X-Gm-Message-State: AMke39kZL+W7yQ2UTj4ErzaXrI5D88L97vWKLR4AgkbIMQ7HVTGgK00bP53qMoQmhFWvHg== X-Received: by 10.55.110.6 with SMTP id j6mr7882626qkc.92.1488346107506; Tue, 28 Feb 2017 21:28:27 -0800 (PST) Received: from z87.localdomain (pool-96-230-116-151.bstnma.fios.verizon.net. [96.230.116.151]) by smtp.gmail.com with ESMTPSA id c141sm2530517qkb.10.2017.02.28.21.28.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Feb 2017 21:28:27 -0800 (PST) From: Len Brown To: linux-pm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Len Brown Subject: [PATCH 08/44] intel_idle: use new name for MSR_PKG_CST_CONFIG_CONTROL Date: Wed, 1 Mar 2017 00:27:12 -0500 Message-Id: <6cfb2374f83bc70b8acb0ddb989988ba3f140b61.1488345270.git.len.brown@intel.com> X-Mailer: git-send-email 2.11.0.161.g6610af872 In-Reply-To: <20170301052748.27810-1-lenb@kernel.org> References: <20170301052748.27810-1-lenb@kernel.org> In-Reply-To: <678a3bd1b3de6d2ebf604e7d708bc8150bb667e9.1488345270.git.len.brown@intel.com> References: <678a3bd1b3de6d2ebf604e7d708bc8150bb667e9.1488345270.git.len.brown@intel.com> Reply-To: Len Brown Organization: Intel Open Source Technology Center Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Len Brown previously known as MSR_NHM_SNB_PKG_CST_CFG_CTL Signed-off-by: Len Brown --- drivers/idle/intel_idle.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c index 7d8ea3d5fda6..930537da76d4 100644 --- a/drivers/idle/intel_idle.c +++ b/drivers/idle/intel_idle.c @@ -961,9 +961,9 @@ static void auto_demotion_disable(void) { unsigned long long msr_bits; - rdmsrl(MSR_NHM_SNB_PKG_CST_CFG_CTL, msr_bits); + rdmsrl(MSR_PKG_CST_CONFIG_CONTROL, msr_bits); msr_bits &= ~(icpu->auto_demotion_disable_flags); - wrmsrl(MSR_NHM_SNB_PKG_CST_CFG_CTL, msr_bits); + wrmsrl(MSR_PKG_CST_CONFIG_CONTROL, msr_bits); } static void c1e_promotion_disable(void) { @@ -1273,7 +1273,7 @@ static void sklh_idle_state_table_update(void) if ((mwait_substates & (0xF << 28)) == 0) return; - rdmsrl(MSR_NHM_SNB_PKG_CST_CFG_CTL, msr); + rdmsrl(MSR_PKG_CST_CONFIG_CONTROL, msr); /* PC10 is not enabled in PKG C-state limit */ if ((msr & 0xF) != 8)