Skip to content

Commit 3a088b0

Browse files
zhang-ruilenb
authored andcommitted
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: 83075bd ("tools/power turbostat: Add initial support for DMR") Signed-off-by: Zhang Rui <[email protected]> Signed-off-by: Len Brown <[email protected]>
1 parent dcd1c37 commit 3a088b0

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

tools/power/x86/turbostat/turbostat.c

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -989,20 +989,21 @@ static const struct platform_features spr_features = {
989989
};
990990

991991
static const struct platform_features dmr_features = {
992-
.has_msr_misc_feature_control = spr_features.has_msr_misc_feature_control,
993-
.has_msr_misc_pwr_mgmt = spr_features.has_msr_misc_pwr_mgmt,
994-
.has_nhm_msrs = spr_features.has_nhm_msrs,
995-
.has_config_tdp = spr_features.has_config_tdp,
996-
.bclk_freq = spr_features.bclk_freq,
997-
.supported_cstates = spr_features.supported_cstates,
998-
.cst_limit = spr_features.cst_limit,
999-
.has_msr_core_c1_res = spr_features.has_msr_core_c1_res,
1000-
.has_msr_module_c6_res_ms = 1, /* DMR has Dual Core Module and MC6 MSR */
1001-
.has_irtl_msrs = spr_features.has_irtl_msrs,
1002-
.has_cst_prewake_bit = spr_features.has_cst_prewake_bit,
1003-
.has_fixed_rapl_psys_unit = spr_features.has_fixed_rapl_psys_unit,
1004-
.trl_msrs = spr_features.trl_msrs,
1005-
.rapl_msrs = 0, /* DMR does not have RAPL MSRs */
992+
.has_msr_misc_feature_control = spr_features.has_msr_misc_feature_control,
993+
.has_msr_misc_pwr_mgmt = spr_features.has_msr_misc_pwr_mgmt,
994+
.has_nhm_msrs = spr_features.has_nhm_msrs,
995+
.bclk_freq = spr_features.bclk_freq,
996+
.supported_cstates = spr_features.supported_cstates,
997+
.cst_limit = spr_features.cst_limit,
998+
.has_msr_core_c1_res = spr_features.has_msr_core_c1_res,
999+
.has_cst_prewake_bit = spr_features.has_cst_prewake_bit,
1000+
.has_fixed_rapl_psys_unit = spr_features.has_fixed_rapl_psys_unit,
1001+
.trl_msrs = spr_features.trl_msrs,
1002+
.has_msr_module_c6_res_ms = 1, /* DMR has Dual-Core-Module and MC6 MSR */
1003+
.rapl_msrs = 0, /* DMR does not have RAPL MSRs */
1004+
.plr_msrs = 0, /* DMR does not have PLR MSRs */
1005+
.has_irtl_msrs = 0, /* DMR does not have IRTL MSRs */
1006+
.has_config_tdp = 0, /* DMR does not have CTDP MSRs */
10061007
};
10071008

10081009
static const struct platform_features srf_features = {

0 commit comments

Comments
 (0)