[PATCH] tools/power turbostat: Add Elkhart Lake support

From: Chen Yu
Date: Thu Jan 09 2020 - 04:18:18 EST


Elkhart Lake(TREMONT) succeed GOLDMONT, reuse the code.

Elkhart Lake does not support group turbo limit counter
register and might trigger failure in has_turbo_ratio_group_limits(),
so it is not applicable to reuse GOLDMONT cpuid in intel_model_duplicates().

Signed-off-by: Chen Yu <yu.c.chen@xxxxxxxxx>
---
tools/power/x86/turbostat/turbostat.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 5d0fddda842c..2d3d0a3d5e07 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -3265,6 +3265,7 @@ int probe_nhm_msrs(unsigned int family, unsigned int model)
case INTEL_FAM6_ATOM_GOLDMONT: /* BXT */
case INTEL_FAM6_ATOM_GOLDMONT_PLUS:
case INTEL_FAM6_ATOM_GOLDMONT_D: /* DNV */
+ case INTEL_FAM6_ATOM_TREMONT: /* ELK */
pkg_cstate_limits = glm_pkg_cstate_limits;
break;
default:
@@ -3888,6 +3889,7 @@ void rapl_probe_intel(unsigned int family, unsigned int model)
break;
case INTEL_FAM6_ATOM_GOLDMONT: /* BXT */
case INTEL_FAM6_ATOM_GOLDMONT_PLUS:
+ case INTEL_FAM6_ATOM_TREMONT: /* ELK */
do_rapl = RAPL_PKG | RAPL_PKG_POWER_INFO;
if (rapl_joules)
BIC_PRESENT(BIC_Pkg_J);
@@ -4295,6 +4297,7 @@ int has_snb_msrs(unsigned int family, unsigned int model)
case INTEL_FAM6_ATOM_GOLDMONT: /* BXT */
case INTEL_FAM6_ATOM_GOLDMONT_PLUS:
case INTEL_FAM6_ATOM_GOLDMONT_D: /* DNV */
+ case INTEL_FAM6_ATOM_TREMONT: /* ELK */
return 1;
}
return 0;
@@ -4324,6 +4327,7 @@ int has_c8910_msrs(unsigned int family, unsigned int model)
case INTEL_FAM6_CANNONLAKE_L: /* CNL */
case INTEL_FAM6_ATOM_GOLDMONT: /* BXT */
case INTEL_FAM6_ATOM_GOLDMONT_PLUS:
+ case INTEL_FAM6_ATOM_TREMONT: /* ELK */
return 1;
}
return 0;
--
2.17.1