Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-29 07:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

tools/power/turbostat: Enable TCC Offset on more models

Browse Source 
All Models that duplicate INTEL_FAM6_CANNONLAKE_L support TCC Offset.
Enable this feature on all these models.

Delete obsolete model_orig.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Reviewed-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Zhang Rui 2023-03-24 16:30:55 +08:00
parent b61b7d8c4c
commit b98a6d7876
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tools/power/x86/turbostat/turbostat.c
View File

@ -211,9 +211,6 @@ int *fd_instr_count_percpu;
struct timeval interval_tv = { 5, 0 };
struct timespec interval_ts = { 5, 0 };
/* Save original CPU model */
unsigned int model_orig;
unsigned int num_iterations;
unsigned int header_iterations;
unsigned int debug;
@ -4046,14 +4043,7 @@ void check_tcc_offset(int model)
switch (model) {
case INTEL_FAM6_SKYLAKE_L:
case INTEL_FAM6_SKYLAKE:
case INTEL_FAM6_KABYLAKE_L:
case INTEL_FAM6_KABYLAKE:
case INTEL_FAM6_ICELAKE_L:
case INTEL_FAM6_ICELAKE:
case INTEL_FAM6_TIGERLAKE_L:
case INTEL_FAM6_TIGERLAKE:
case INTEL_FAM6_COMETLAKE:
case INTEL_FAM6_CANNONLAKE_L:
if (!get_msr(base_cpu, MSR_PLATFORM_INFO, &msr)) {
msr = (msr >> 30) & 1;
if (msr)
@ -5573,10 +5563,9 @@ void process_cpuid()
edx_flags & (1 << 22) ? "ACPI-TM" : "-",
edx_flags & (1 << 28) ? "HT" : "-", edx_flags & (1 << 29) ? "TM" : "-");
}
if (genuine_intel) {
model_orig = model;
if (genuine_intel)
model = intel_model_duplicates(model);
}
if (!(edx_flags & (1 << 5)))
errx(1, "CPUID: no MSR");
@ -5796,7 +5785,7 @@ void process_cpuid()
automatic_cstate_conversion_probe(family, model);
prewake_cstate_probe(family, model);
check_tcc_offset(model_orig);
check_tcc_offset(model);
if (!quiet)
dump_cstate_pstate_config_info(family, model);