| From 41c028e4225490888f00f1ecd93859440d4315de Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 25 Mar 2023 21:57:07 +0800 |
| Subject: tools/power/turbostat: Fix a knl bug |
| |
| From: Zhang Rui <rui.zhang@intel.com> |
| |
| [ Upstream commit 137f01b3529d292a68d22e9681e2f903c768f790 ] |
| |
| MSR_KNL_CORE_C6_RESIDENCY should be evaluated only if |
| 1. this is KNL platform |
| AND |
| 2. need to get C6 residency or need to calculate C1 residency |
| |
| Fix the broken logic introduced by commit 1e9042b9c8d4 ("tools/power |
| turbostat: Fix CPU%C1 display value"). |
| |
| Fixes: 1e9042b9c8d4 ("tools/power turbostat: Fix CPU%C1 display value") |
| Signed-off-by: Zhang Rui <rui.zhang@intel.com> |
| Reviewed-by: Len Brown <len.brown@intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| tools/power/x86/turbostat/turbostat.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c |
| index 8bf6b01b35608..d4235d1ab912c 100644 |
| --- a/tools/power/x86/turbostat/turbostat.c |
| +++ b/tools/power/x86/turbostat/turbostat.c |
| @@ -1881,7 +1881,7 @@ int get_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p) |
| if ((DO_BIC(BIC_CPU_c6) || soft_c1_residency_display(BIC_CPU_c6)) && !do_knl_cstates) { |
| if (get_msr(cpu, MSR_CORE_C6_RESIDENCY, &c->c6)) |
| return -7; |
| - } else if (do_knl_cstates || soft_c1_residency_display(BIC_CPU_c6)) { |
| + } else if (do_knl_cstates && soft_c1_residency_display(BIC_CPU_c6)) { |
| if (get_msr(cpu, MSR_KNL_CORE_C6_RESIDENCY, &c->c6)) |
| return -7; |
| } |
| -- |
| 2.42.0 |
| |
