tools/power turbostat: Add Power Limit4 support

Add Power Limit4 support.

Signed-off-by: Sumeet Pawnikar <sumeet.r.pawnikar@intel.com>
Acked-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
index a4a39c3e0f19674788c8ec8f5baf5a6406599d1d..b890840e0059d313dda1bb1021471dbd8351f87f 100644 (file)
--- a/arch/x86/include/asm/msr-index.h
+++ b/arch/x86/include/asm/msr-index.h
@@ -310,6 +310,7 @@
 
 /* Run Time Average Power Limiting (RAPL) Interface */
 
+#define MSR_VR_CURRENT_CONFIG  0x00000601
 #define MSR_RAPL_POWER_UNIT            0x00000606
 
 #define MSR_PKG_POWER_LIMIT            0x00000610

diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 1ba444d9b68a8d3486fed97493116220ba8a2fc3..993af623ae90ae8c756cb842b2457a9baf13824f 100644 (file)
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -4773,6 +4773,15 @@ int print_rapl(struct thread_data *t, struct core_data *c, struct pkg_data *p)
                        ((msr >> 32) & 0x7FFF) * rapl_power_units,
                        (1.0 + (((msr >> 54) & 0x3) / 4.0)) * (1 << ((msr >> 49) & 0x1F)) * rapl_time_units,
                        ((msr >> 48) & 1) ? "EN" : "DIS");
+
+               if (get_msr(cpu, MSR_VR_CURRENT_CONFIG, &msr))
+                       return -9;
+
+               fprintf(outf, "cpu%d: MSR_VR_CURRENT_CONFIG: 0x%08llx\n", cpu, msr);
+               fprintf(outf, "cpu%d: PKG Limit #4: %f Watts (%slocked)\n",
+                       cpu,
+                       ((msr >> 0) & 0x1FFF) * rapl_power_units,
+                       (msr >> 31) & 1 ? "" : "UN");
        }
 
        if (do_rapl & RAPL_DRAM_POWER_INFO) {