tools/power turbostat: Fix AMD RAPL regression on big systems

lenb · lenb · commit 3ae6bafa104d · 2026-04-21T17:35:40.000-04:00
turbostat.c:8688: rapl_perf_init: Assertion `next_domain < num_domains' failed. The initial fix for this regression was incomplete, as it did not handle multi-package systems with sparse core ids. Fixes: ef0e600 ("tools/power turbostat: Fix AMD RAPL regression") 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
@@ -5155,7 +5155,7 @@ static inline int get_rapl_num_domains(void)
 	if (!platform->has_per_core_rapl)
 		return topo.num_packages;
 
-	return topo.num_cores;
+	return GLOBAL_CORE_ID(topo.max_core_id, topo.num_packages) + 1;
 }
 
 static inline int get_rapl_domain_id(int cpu)

Original file line number	Diff line number	Diff line change
`@@ -5155,7 +5155,7 @@ static inline int get_rapl_num_domains(void)`
`5155`	`5155`	`if (!platform->has_per_core_rapl)`
`5156`	`5156`	`return topo.num_packages;`
`5157`	`5157`
`5158`		`- return topo.num_cores;`
	`5158`	`+ return GLOBAL_CORE_ID(topo.max_core_id, topo.num_packages) + 1;`
`5159`	`5159`	`}`
`5160`	`5160`
`5161`	`5161`	`static inline int get_rapl_domain_id(int cpu)`