]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
tools/power turbostat: correct output for MSR_NHM_SNB_PKG_CST_CFG_CTL dump
authorLen Brown <len.brown@intel.com>
Sun, 13 Mar 2016 07:21:22 +0000 (03:21 -0400)
committerTim Gardner <tim.gardner@canonical.com>
Mon, 29 Aug 2016 16:25:06 +0000 (10:25 -0600)
BugLink: http://bugs.launchpad.net/bugs/1591802
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 <len.brown@intel.com>
(cherry picked from commit 6c34f160df82ae07bfff5b4c51f50622e9c2759e)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Acked-by: Kamal Mostafa <kamal@canonical.com>
tools/power/x86/turbostat/turbostat.c

index b34241c3c92ec25453fe874335b28f6241e35b04..a551630a82b6a8b062d155d6aefccc583c1decee 100644 (file)
@@ -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;
 }