Commit 81824921 authored by Len Brown's avatar Len Brown

tools/power turbostat: show missing Core and GFX power on SKL and KBL

While the current SDM is silent on the matter, the Core and GFX
RAPL power meters on SKL and KBL appear to work -- so show them.
Reported-by: default avatarYaroslav Isakov <yaroslav.isakov@gmail.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 22048c54
...@@ -3355,17 +3355,19 @@ void rapl_probe(unsigned int family, unsigned int model) ...@@ -3355,17 +3355,19 @@ void rapl_probe(unsigned int family, unsigned int model)
case INTEL_FAM6_SKYLAKE_DESKTOP: /* SKL */ case INTEL_FAM6_SKYLAKE_DESKTOP: /* SKL */
case INTEL_FAM6_KABYLAKE_MOBILE: /* KBL */ case INTEL_FAM6_KABYLAKE_MOBILE: /* KBL */
case INTEL_FAM6_KABYLAKE_DESKTOP: /* KBL */ case INTEL_FAM6_KABYLAKE_DESKTOP: /* KBL */
do_rapl = RAPL_PKG | RAPL_DRAM | RAPL_DRAM_PERF_STATUS | RAPL_PKG_PERF_STATUS | RAPL_PKG_POWER_INFO; do_rapl = RAPL_PKG | RAPL_CORES | RAPL_CORE_POLICY | RAPL_DRAM | RAPL_DRAM_PERF_STATUS | RAPL_PKG_PERF_STATUS | RAPL_GFX | RAPL_PKG_POWER_INFO;
BIC_PRESENT(BIC_PKG__); BIC_PRESENT(BIC_PKG__);
BIC_PRESENT(BIC_RAM__); BIC_PRESENT(BIC_RAM__);
if (rapl_joules) { if (rapl_joules) {
BIC_PRESENT(BIC_Pkg_J); BIC_PRESENT(BIC_Pkg_J);
BIC_PRESENT(BIC_Cor_J); BIC_PRESENT(BIC_Cor_J);
BIC_PRESENT(BIC_RAM_J); BIC_PRESENT(BIC_RAM_J);
BIC_PRESENT(BIC_GFX_J);
} else { } else {
BIC_PRESENT(BIC_PkgWatt); BIC_PRESENT(BIC_PkgWatt);
BIC_PRESENT(BIC_CorWatt); BIC_PRESENT(BIC_CorWatt);
BIC_PRESENT(BIC_RAMWatt); BIC_PRESENT(BIC_RAMWatt);
BIC_PRESENT(BIC_GFXWatt);
} }
break; break;
case INTEL_FAM6_HASWELL_X: /* HSX */ case INTEL_FAM6_HASWELL_X: /* HSX */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment