From patchwork Wed Mar 1 05:27:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Len Brown X-Patchwork-Id: 9597781 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 938F6604DC for ; Wed, 1 Mar 2017 08:19:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 79ACE28452 for ; Wed, 1 Mar 2017 08:19:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6E76E284E9; Wed, 1 Mar 2017 08:19:42 +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=ham 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 E2DAE28452 for ; Wed, 1 Mar 2017 08:19:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751009AbdCAITl (ORCPT ); Wed, 1 Mar 2017 03:19:41 -0500 Received: from mail-qk0-f195.google.com ([209.85.220.195]:36231 "EHLO mail-qk0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750988AbdCAITk (ORCPT ); Wed, 1 Mar 2017 03:19:40 -0500 Received: by mail-qk0-f195.google.com with SMTP id u188so8850963qkc.3; Wed, 01 Mar 2017 00:18:02 -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=PqAumHshrpFGECkxYdLjV9eYVWM7a5STRWhyo/fEQ/I=; b=O0bVrGvacZHrTXmd4qbstiUb7FEU2q8g/Fp1LmHuVkibw+YFJoQ0JotuqdrNuiw3IJ J2fhMV3TY+rRfuQRoH1AApJ77uKOAHkz75s2M7PDVe0rNZA45AD9U87UvS1jgty7LT6O HIstRn+sX0xn21a6276nM9ifReA7AUjPbCYhce5iwfHUqrU1rtR0thFhDuXkdwXfuBW2 JjGLJv6TCLYSyWRioiLU/uYZfcvfpRImRw1Fdr0/hdfz+PIfc0HjVhgr/jgLpyz1mfmq e3Mr9QUv/mCdU/k48w7A2LgW/Z9bQ+ljrqEGSoTxtwM2lwAfhyOnIP+8Rm3I1ll3oxzS vuQw== 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=PqAumHshrpFGECkxYdLjV9eYVWM7a5STRWhyo/fEQ/I=; b=CSVC4KaEfbeLQn5sz8aqzzI+JazNKfw9ow/QQkRT+KlI0geSOMYcILBN8KoL9tH9Kv 7tdqUAegRRJOXia8y9irTwL0Z/aCesQ/47r3hrGi6DDUQQBJyAtxNMEcIxpJt6kBBql5 zj7WOo618ZnfTjwVrxZn9Z9NqSsB+SeHINrKTP/cQtPvbxtsEBREvOpj0PPCO+PPQDER amHMMQfATiq1ZTKYHNOdn9EmCFYaebOV9a/hs+xZ+3LX0Fqz9uDxKKiIO+K1EVAXCiTo aLSD9xBdZUuGkevhV6+PgEh6nJNf3EQztBxxmP9DDZxOi/RGZpeJq+BlTx8WUmdU6g7F P2mg== X-Gm-Message-State: AMke39nJdI/IVfXlQAS5Pj+qE+miRQGe1l1W0gDWOqIiIeH4l1F6YD5dmEsruiN+N1q9dw== X-Received: by 10.55.46.195 with SMTP id u186mr7316781qkh.188.1488346108244; Tue, 28 Feb 2017 21:28:28 -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.27 (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 09/44] tools/power turbostat: use new name for MSR_PKG_CST_CONFIG_CONTROL Date: Wed, 1 Mar 2017 00:27:13 -0500 Message-Id: <1df2e55abce64e2f3117fac3968a9ac382fbc9c3.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 called MSR_NHM_SNB_PKG_CST_CFG_CTL Signed-off-by: Len Brown --- tools/power/x86/turbostat/turbostat.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c index aedfaddbad30..d56f2b75dc58 100644 --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c @@ -1761,12 +1761,12 @@ dump_nhm_cst_cfg(void) { unsigned long long msr; - get_msr(base_cpu, MSR_NHM_SNB_PKG_CST_CFG_CTL, &msr); + get_msr(base_cpu, MSR_PKG_CST_CONFIG_CONTROL, &msr); #define SNB_C1_AUTO_UNDEMOTE (1UL << 27) #define SNB_C3_AUTO_UNDEMOTE (1UL << 28) - fprintf(outf, "cpu%d: MSR_NHM_SNB_PKG_CST_CFG_CTL: 0x%08llx", base_cpu, msr); + fprintf(outf, "cpu%d: MSR_PKG_CST_CONFIG_CONTROL: 0x%08llx", base_cpu, msr); fprintf(outf, " (%s%s%s%s%slocked: pkg-cstate-limit=%d: %s)\n", (msr & SNB_C3_AUTO_UNDEMOTE) ? "UNdemote-C3, " : "", @@ -2383,7 +2383,7 @@ void check_permissions() * MSR_SMI_COUNT 0x00000034 * * MSR_PLATFORM_INFO 0x000000ce - * MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2 + * MSR_PKG_CST_CONFIG_CONTROL 0x000000e2 * * MSR_MISC_PWR_MGMT 0x000001aa * @@ -2393,7 +2393,7 @@ void check_permissions() * MSR_CORE_C6_RESIDENCY 0x000003fd * * Side effect: - * sets global pkg_cstate_limit to decode MSR_NHM_SNB_PKG_CST_CFG_CTL + * sets global pkg_cstate_limit to decode MSR_PKG_CST_CONFIG_CONTROL */ int probe_nhm_msrs(unsigned int family, unsigned int model) { @@ -2462,7 +2462,7 @@ int probe_nhm_msrs(unsigned int family, unsigned int model) default: return 0; } - get_msr(base_cpu, MSR_NHM_SNB_PKG_CST_CFG_CTL, &msr); + get_msr(base_cpu, MSR_PKG_CST_CONFIG_CONTROL, &msr); pkg_cstate_limit = pkg_cstate_limits[msr & 0xF]; get_msr(base_cpu, MSR_PLATFORM_INFO, &msr);