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

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: 9972d5d ("tools/power turbostat: Enable accumulate RAPL display") Reported-by: youling257 <[email protected]> Tested-by: youling257 <[email protected]> Tested-by: Kurt Garloff <[email protected]> Tested-by: Bingsong Si <[email protected]> Tested-by: Artem S. Tashkinov <[email protected]> Co-developed-by: Bingsong Si <[email protected]> Co-developed-by: Terry Bowman <[email protected]> Signed-off-by: Bas Nieuwenhuizen <[email protected]> Reviewed-by: Chen Yu <[email protected]> Signed-off-by: Len Brown <[email protected]>
mcd500 · May 4, 2021 · 301b1d3 · 301b1d3
1 parent ba58ecd
commit 301b1d3
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
@@ -302,7 +302,10 @@ int idx_to_offset(int idx)
 
 	switch (idx) {
 	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;
 	case IDX_DRAM_ENERGY:
 		offset = MSR_DRAM_ENERGY_STATUS;
@@ -331,6 +334,7 @@ int offset_to_idx(int offset)
 
 	switch (offset) {
 	case MSR_PKG_ENERGY_STATUS:
+	case MSR_PKG_ENERGY_STAT:
 		idx = IDX_PKG_ENERGY;
 		break;
 	case MSR_DRAM_ENERGY_STATUS:
@@ -358,7 +362,7 @@ int idx_valid(int idx)
 {
 	switch (idx) {
 	case IDX_PKG_ENERGY:
-		return do_rapl & RAPL_PKG;
+		return do_rapl & (RAPL_PKG | RAPL_AMD_F17H);
 	case IDX_DRAM_ENERGY:
 		return do_rapl & RAPL_DRAM;
 	case IDX_PP0_ENERGY: