mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-14 22:44:27 +08:00
tools/power turbostat: Remember global max_die_id
[ Upstream commit cda2033886
]
This is necessary to gracefully handle sparse die_id's.
no functional change
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
3ee21e14c8
commit
76d7b869b3
@ -566,6 +566,7 @@ struct topo_params {
|
||||
int num_cpus;
|
||||
int num_cores;
|
||||
int max_cpu_num;
|
||||
int max_die_id;
|
||||
int max_node_num;
|
||||
int nodes_per_pkg;
|
||||
int cores_per_node;
|
||||
@ -5871,7 +5872,6 @@ void topology_probe()
|
||||
int i;
|
||||
int max_core_id = 0;
|
||||
int max_package_id = 0;
|
||||
int max_die_id = 0;
|
||||
int max_siblings = 0;
|
||||
|
||||
/* Initialize num_cpus, max_cpu_num */
|
||||
@ -5940,8 +5940,8 @@ void topology_probe()
|
||||
|
||||
/* get die information */
|
||||
cpus[i].die_id = get_die_id(i);
|
||||
if (cpus[i].die_id > max_die_id)
|
||||
max_die_id = cpus[i].die_id;
|
||||
if (cpus[i].die_id > topo.max_die_id)
|
||||
topo.max_die_id = cpus[i].die_id;
|
||||
|
||||
/* get numa node information */
|
||||
cpus[i].physical_node_id = get_physical_node_id(&cpus[i]);
|
||||
@ -5967,9 +5967,9 @@ void topology_probe()
|
||||
if (!summary_only && topo.cores_per_node > 1)
|
||||
BIC_PRESENT(BIC_Core);
|
||||
|
||||
topo.num_die = max_die_id + 1;
|
||||
topo.num_die = topo.max_die_id + 1;
|
||||
if (debug > 1)
|
||||
fprintf(outf, "max_die_id %d, sizing for %d die\n", max_die_id, topo.num_die);
|
||||
fprintf(outf, "max_die_id %d, sizing for %d die\n", topo.max_die_id, topo.num_die);
|
||||
if (!summary_only && topo.num_die > 1)
|
||||
BIC_PRESENT(BIC_Die);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user