sieni
/
linux
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 070e92361e ("tools/power turbostat: Enhance HT enumeration")
commit ddf60e38ca ("tools/power turbostat: Simplify global core_id calculation")

Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown 2026-02-17 20:31:51 -06:00
parent 51496091dd
commit ef0e60083f
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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)