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

tools/power/turbostat: Fix turbostat for AMD Zen CPUs

Browse Source 
It was reported that on Zen+ system turbostat started exiting,
which was tracked down to the MSR_PKG_ENERGY_STAT read failing because
offset_to_idx wasn't returning a non-negative index.

This patch combined the modification from Bingsong Si and
Bas Nieuwenhuizen and addd the MSR to the index system as alternative for
MSR_PKG_ENERGY_STATUS.

Fixes: 9972d5d84d ("tools/power turbostat: Enable accumulate RAPL display")
Reported-by: youling257 <youling257@gmail.com>
Tested-by: youling257 <youling257@gmail.com>
Tested-by: Kurt Garloff <kurt@garloff.de>
Tested-by: Bingsong Si <owen.si@ucloud.cn>
Tested-by: Artem S. Tashkinov <aros@gmx.com>
Co-developed-by: Bingsong Si <owen.si@ucloud.cn>
Co-developed-by: Terry Bowman <terry.bowman@amd.com>
Signed-off-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: Chen Yu <yu.c.chen@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Bas Nieuwenhuizen 2021-04-28 17:09:03 +08:00 committed by Len Brown
parent ba58ecde5e
commit 301b1d3a91
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -302,7 +302,10 @@ int idx_to_offset(int idx)
switch (idx) { switch (idx) {
case IDX_PKG_ENERGY: case IDX_PKG_ENERGY:
offset = MSR_PKG_ENERGY_STATUS; if (do_rapl & RAPL_AMD_F17H)
offset = MSR_PKG_ENERGY_STAT;
else
offset = MSR_PKG_ENERGY_STATUS;
break; break;
case IDX_DRAM_ENERGY: case IDX_DRAM_ENERGY:
offset = MSR_DRAM_ENERGY_STATUS; offset = MSR_DRAM_ENERGY_STATUS;
@ -331,6 +334,7 @@ int offset_to_idx(int offset)
switch (offset) { switch (offset) {
case MSR_PKG_ENERGY_STATUS: case MSR_PKG_ENERGY_STATUS:
case MSR_PKG_ENERGY_STAT:
idx = IDX_PKG_ENERGY; idx = IDX_PKG_ENERGY;
break; break;
case MSR_DRAM_ENERGY_STATUS: case MSR_DRAM_ENERGY_STATUS:
@ -358,7 +362,7 @@ int idx_valid(int idx)
{ {
switch (idx) { switch (idx) {
case IDX_PKG_ENERGY: case IDX_PKG_ENERGY:
return do_rapl & RAPL_PKG; return do_rapl & (RAPL_PKG | RAPL_AMD_F17H);
case IDX_DRAM_ENERGY: case IDX_DRAM_ENERGY:
return do_rapl & RAPL_DRAM; return do_rapl & RAPL_DRAM;
case IDX_PP0_ENERGY: case IDX_PP0_ENERGY: