Commit 3ae6bafa authored by Len Brown's avatar Len Brown
Browse files

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



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: ef0e6008 ("tools/power turbostat: Fix AMD RAPL regression")
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 028ef9c9

tools/power/x86/turbostat/turbostat.c

+1 −1
Original line number Diff line number Diff line
@@ -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)