Commit ef0e6008 authored by Len Brown's avatar Len Brown
Browse files

tools/power turbostat: Fix AMD RAPL regression 



turbostat.c:8688: rapl_perf_init: Assertion `next_domain < num_domains' failed.

Two recent cleanup patches that were not supposed to change anything
broke the core_id code needed for AMD RAPL initialization:

commit 070e9236 ("tools/power turbostat: Enhance HT enumeration")
commit ddf60e38 ("tools/power turbostat: Simplify global core_id calculation")

Reported-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 51496091

tools/power/x86/turbostat/turbostat.c

+1 −2
Original line number Diff line number Diff line
@@ -5164,7 +5164,7 @@ static inline int get_rapl_domain_id(int cpu) 
	if (!platform->has_per_core_rapl)

		return cpus[cpu].package_id;



	return GLOBAL_CORE_ID(cpu, cpus[cpu].package_id);

	return GLOBAL_CORE_ID(cpus[cpu].core_id, cpus[cpu].package_id);

}



/*
@@ -9633,7 +9633,6 @@ void topology_probe(bool startup) 
	}

	topo.max_core_id = max_core_id;	/* within a package */

	topo.max_package_id = max_package_id;

	topo.num_cores = (max_core_id + 1) * topo.num_packages;	/* per system */



	topo.cores_per_node = max_core_id + 1;

	if (debug > 1)