Commit 556c9678 authored by Sudeep Holla's avatar Sudeep Holla
Browse files

arch_topology: Set cluster identifier in each core/thread from /cpu-map 

Let us set the cluster identifier as parsed from the device tree
cluster nodes within /cpu-map.

We don't support nesting of clusters yet as there are no real hardware
to support clusters of clusters.

Link: https://lore.kernel.org/r/20220704101605.1318280-19-sudeep.holla@arm.com


Tested-by: default avatarIonela Voinescu <ionela.voinescu@arm.com>
Tested-by: default avatarConor Dooley <conor.dooley@microchip.com>
Reviewed-by: default avatarIonela Voinescu <ionela.voinescu@arm.com>
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
parent bfcc4397

drivers/base/arch_topology.c

+8 −5
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ static int __init get_cpu_for_node(struct device_node *node) 
}



static int __init parse_core(struct device_node *core, int package_id,

			     int core_id)

			     int cluster_id, int core_id)

{

	char name[20];

	bool leaf = true;
@@ -513,6 +513,7 @@ static int __init parse_core(struct device_node *core, int package_id, 
			cpu = get_cpu_for_node(t);

			if (cpu >= 0) {

				cpu_topology[cpu].package_id = package_id;

				cpu_topology[cpu].cluster_id = cluster_id;

				cpu_topology[cpu].core_id = core_id;

				cpu_topology[cpu].thread_id = i;

			} else if (cpu != -ENODEV) {
@@ -534,6 +535,7 @@ static int __init parse_core(struct device_node *core, int package_id, 
		}



		cpu_topology[cpu].package_id = package_id;

		cpu_topology[cpu].cluster_id = cluster_id;

		cpu_topology[cpu].core_id = core_id;

	} else if (leaf && cpu != -ENODEV) {

		pr_err("%pOF: Can't get CPU for leaf core\n", core);
@@ -543,7 +545,8 @@ static int __init parse_core(struct device_node *core, int package_id, 
	return 0;

}



static int __init parse_cluster(struct device_node *cluster, int depth)

static int __init

parse_cluster(struct device_node *cluster, int cluster_id, int depth)

{

	char name[20];

	bool leaf = true;
@@ -563,7 +566,7 @@ static int __init parse_cluster(struct device_node *cluster, int depth) 
		c = of_get_child_by_name(cluster, name);

		if (c) {

			leaf = false;

			ret = parse_cluster(c, depth + 1);

			ret = parse_cluster(c, i, depth + 1);

			of_node_put(c);

			if (ret != 0)

				return ret;
@@ -587,7 +590,7 @@ static int __init parse_cluster(struct device_node *cluster, int depth) 
			}



			if (leaf) {

				ret = parse_core(c, 0, core_id++);

				ret = parse_core(c, 0, cluster_id, core_id++);

			} else {

				pr_err("%pOF: Non-leaf cluster with core %s\n",

				       cluster, name);
@@ -627,7 +630,7 @@ static int __init parse_dt_topology(void) 
	if (!map)

		goto out;



	ret = parse_cluster(map, 0);

	ret = parse_cluster(map, -1, 0);

	if (ret != 0)

		goto out_map;