tools/power turbostat: Fix DMR support

Together with the RAPL MSRs, there are more MSRs gone on DMR, including
PLR (Perf Limit Reasons), and IRTL (Package cstate Interrupt Response
Time Limit) MSRs. The configurable TDP info should also be retrieved
from TPMI based Intel Speed Select Technology feature.

Remove the access of these MSRs for DMR. Improve the DMR platform
feature table to make it more readable at the same time.

Fixes: 83075bd59de2 ("tools/power turbostat: Add initial support for DMR")
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 9ad3b1aa79ef17af906f94b1bd47ed66b6932796..e540bb0bb09373588ee9d050cfcf759b70bdab88 100644 (file)
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -989,20 +989,21 @@ static const struct platform_features spr_features = {
 };
 
 static const struct platform_features dmr_features = {
-       .has_msr_misc_feature_control = spr_features.has_msr_misc_feature_control,
-       .has_msr_misc_pwr_mgmt = spr_features.has_msr_misc_pwr_mgmt,
-       .has_nhm_msrs = spr_features.has_nhm_msrs,
-       .has_config_tdp = spr_features.has_config_tdp,
-       .bclk_freq = spr_features.bclk_freq,
-       .supported_cstates = spr_features.supported_cstates,
-       .cst_limit = spr_features.cst_limit,
-       .has_msr_core_c1_res = spr_features.has_msr_core_c1_res,
-       .has_msr_module_c6_res_ms = 1,  /* DMR has Dual Core Module and MC6 MSR */
-       .has_irtl_msrs = spr_features.has_irtl_msrs,
-       .has_cst_prewake_bit = spr_features.has_cst_prewake_bit,
-       .has_fixed_rapl_psys_unit = spr_features.has_fixed_rapl_psys_unit,
-       .trl_msrs = spr_features.trl_msrs,
-       .rapl_msrs = 0,         /* DMR does not have RAPL MSRs */
+       .has_msr_misc_feature_control   = spr_features.has_msr_misc_feature_control,
+       .has_msr_misc_pwr_mgmt          = spr_features.has_msr_misc_pwr_mgmt,
+       .has_nhm_msrs                   = spr_features.has_nhm_msrs,
+       .bclk_freq                      = spr_features.bclk_freq,
+       .supported_cstates              = spr_features.supported_cstates,
+       .cst_limit                      = spr_features.cst_limit,
+       .has_msr_core_c1_res            = spr_features.has_msr_core_c1_res,
+       .has_cst_prewake_bit            = spr_features.has_cst_prewake_bit,
+       .has_fixed_rapl_psys_unit       = spr_features.has_fixed_rapl_psys_unit,
+       .trl_msrs                       = spr_features.trl_msrs,
+       .has_msr_module_c6_res_ms       = 1,    /* DMR has Dual-Core-Module and MC6 MSR */
+       .rapl_msrs                      = 0,    /* DMR does not have RAPL MSRs */
+       .plr_msrs                       = 0,    /* DMR does not have PLR  MSRs */
+       .has_irtl_msrs                  = 0,    /* DMR does not have IRTL MSRs */
+       .has_config_tdp                 = 0,    /* DMR does not have CTDP MSRs */
 };
 
 static const struct platform_features srf_features = {