tools/power turbostat: adjust columns for Jacobsville
PATCH 1/1 tools/power turbostat: adjust columns for Jacobsville
Jacobsville doesn't have Package C2 and C6. Also Core and DRAM RAPL are not available. Adjust output accordingly.
Signed-off-by Antti Laakso <[email protected]>
--- tools/power/x86/turbostat/turbostat.c | 33 ++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-)
tools/power/x86/turbostat/turbostat.c +30 -3
@@ -2173,6 +2173,7 @@ int has_turbo_ratio_group_limits(int family, int model)case INTEL_FAM6_ATOM_GOLDMONT :case INTEL_FAM6_SKYLAKE_X :case INTEL_FAM6_ATOM_GOLDMONT_D : +case INTEL_FAM6_ATOM_TREMONT_D :return 1 ; }return 0 ;
@@ -3279,6 +3280,7 @@ int probe_nhm_msrs(unsigned int family, unsigned int model)case INTEL_FAM6_ATOM_GOLDMONT_PLUS :case INTEL_FAM6_ATOM_GOLDMONT_D :/* DNV */ case INTEL_FAM6_ATOM_TREMONT :/* EHL */ +case INTEL_FAM6_ATOM_TREMONT_D :/* JVL */ pkg_cstate_limits = glm_pkg_cstate_limits;break ;default :
@@ -3361,6 +3363,17 @@ int is_ehl(unsigned int family, unsigned int model) }return 0 ; } +int is_jvl (unsigned int family,unsigned int model) +{ +if (!genuine_intel) +return 0 ; + +switch (model) { +case INTEL_FAM6_ATOM_TREMONT_D : +return 1 ; + } +return 0 ; +}int has_turbo_ratio_limit (unsigned int family,unsigned int model) {
@@ -3959,6 +3972,14 @@ void rapl_probe_intel(unsigned int family, unsigned int model)BIC_PRESENT (BIC_GFXWatt); }break ; +case INTEL_FAM6_ATOM_TREMONT_D :/* JVL */ + do_rapl =RAPL_PKG |RAPL_PKG_PERF_STATUS |RAPL_PKG_POWER_INFO ; +BIC_PRESENT (BIC_PKG__ ); +if (rapl_joules) +BIC_PRESENT (BIC_Pkg_J); +else +BIC_PRESENT (BIC_PkgWatt); +break ;case INTEL_FAM6_SKYLAKE_L :/* SKL */ case INTEL_FAM6_CANNONLAKE_L :/* CNL */ 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 ;
@@ -4361,6 +4382,7 @@ int has_snb_msrs(unsigned int family, unsigned int model)case INTEL_FAM6_ATOM_GOLDMONT_PLUS :case INTEL_FAM6_ATOM_GOLDMONT_D :/* DNV */ case INTEL_FAM6_ATOM_TREMONT :/* EHL */ +case INTEL_FAM6_ATOM_TREMONT_D :/* JVL */ return 1 ; }return 0 ;
@@ -4687,9 +4709,6 @@ unsigned int intel_model_duplicates(unsigned int model)case INTEL_FAM6_TIGERLAKE :return INTEL_FAM6_CANNONLAKE_L ; -case INTEL_FAM6_ATOM_TREMONT_D : -return INTEL_FAM6_ATOM_GOLDMONT_D ; -case INTEL_FAM6_ATOM_TREMONT_L :return INTEL_FAM6_ATOM_TREMONT ;
@@ -4916,6 +4935,14 @@ void process_cpuid()BIC_PRESENT (BIC_Mod_c6); use_c1_residency_msr =1 ; } +if (is_jvl (family, model)) { +BIC_NOT_PRESENT (BIC_CPU_c3); +BIC_NOT_PRESENT (BIC_CPU_c7); +BIC_NOT_PRESENT (BIC_Pkgpc2); +BIC_NOT_PRESENT (BIC_Pkgpc3); +BIC_NOT_PRESENT (BIC_Pkgpc6); +BIC_NOT_PRESENT (BIC_Pkgpc7); + }if (is_dnv (family, model)) {BIC_PRESENT (BIC_CPU_c1);BIC_NOT_PRESENT (BIC_CPU_c3);
Signature · 1 line
2.26.2
Applied.
thanks!
Len Brown, Intel Open Source Technology Center