From: Len Brown Date: Sun, 13 Mar 2016 07:21:22 +0000 (-0400) Subject: tools/power turbostat: correct output for MSR_NHM_SNB_PKG_CST_CFG_CTL dump X-Git-Tag: v4.1.12-92~24^2~29 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f3c76b97606601e214de3f8365879a05933ac17d;p=users%2Fjedix%2Flinux-maple.git tools/power turbostat: correct output for MSR_NHM_SNB_PKG_CST_CFG_CTL dump Orabug: 24811361 MSR_NHM_SNB_PKG_CST_CFG_CTL: 0x1e008008 (...pkg-cstate-limit=0: unlimited) should print as MSR_NHM_SNB_PKG_CST_CFG_CTL: 0x1e008008 (...pkg-cstate-limit=8: unlimited) Signed-off-by: Len Brown (cherry picked from commit 6c34f160df82ae07bfff5b4c51f50622e9c2759e) Signed-off-by: Brian Maly Signed-off-by: Dhaval Giani --- diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c index b34241c3c92ec..a551630a82b6a 100644 --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c @@ -1532,7 +1532,7 @@ dump_nhm_cst_cfg(void) (msr & NHM_C3_AUTO_DEMOTE) ? "demote-C3, " : "", (msr & NHM_C1_AUTO_DEMOTE) ? "demote-C1, " : "", (msr & (1 << 15)) ? "" : "UN", - (unsigned int)msr & 7, + (unsigned int)msr & 0xF, pkg_cstate_limit_strings[pkg_cstate_limit]); return; }