Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 868abc07 authored by Jeremy Linton's avatar Jeremy Linton Committed by Catalin Marinas
Browse files

arm64: topology: rename cluster_id 



The cluster concept isn't architecturally defined for arm64.
Lets match the name of the arm64 topology field to the kernel macro
that uses it.

Tested-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Tested-by: default avatarVijaya Kumar K <vkilari@codeaurora.org>
Tested-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Tested-by: default avatarTomasz Nowicki <Tomasz.Nowicki@cavium.com>
Acked-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Acked-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: default avatarMorten Rasmussen <morten.rasmussen@arm.com>
Signed-off-by: default avatarJeremy Linton <jeremy.linton@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 8571890e

arch/arm64/include/asm/topology.h

+2 −2
Original line number Diff line number Diff line
@@ -7,14 +7,14 @@ 
struct cpu_topology {

	int thread_id;

	int core_id;

	int cluster_id;

	int package_id;

	cpumask_t thread_sibling;

	cpumask_t core_sibling;

};



extern struct cpu_topology cpu_topology[NR_CPUS];



#define topology_physical_package_id(cpu)	(cpu_topology[cpu].cluster_id)

#define topology_physical_package_id(cpu)	(cpu_topology[cpu].package_id)

#define topology_core_id(cpu)		(cpu_topology[cpu].core_id)

#define topology_core_cpumask(cpu)	(&cpu_topology[cpu].core_sibling)

#define topology_sibling_cpumask(cpu)	(&cpu_topology[cpu].thread_sibling)

arch/arm64/kernel/topology.c

+13 −13
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static int __init get_cpu_for_node(struct device_node *node) 
	return cpu;

}



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

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

			     int core_id)

{

	char name[10];
@@ -63,7 +63,7 @@ static int __init parse_core(struct device_node *core, int cluster_id, 
			leaf = false;

			cpu = get_cpu_for_node(t);

			if (cpu >= 0) {

				cpu_topology[cpu].cluster_id = cluster_id;

				cpu_topology[cpu].package_id = package_id;

				cpu_topology[cpu].core_id = core_id;

				cpu_topology[cpu].thread_id = i;

			} else {
@@ -85,7 +85,7 @@ static int __init parse_core(struct device_node *core, int cluster_id, 
			return -EINVAL;

		}



		cpu_topology[cpu].cluster_id = cluster_id;

		cpu_topology[cpu].package_id = package_id;

		cpu_topology[cpu].core_id = core_id;

	} else if (leaf) {

		pr_err("%pOF: Can't get CPU for leaf core\n", core);
@@ -101,7 +101,7 @@ static int __init parse_cluster(struct device_node *cluster, int depth) 
	bool leaf = true;

	bool has_cores = false;

	struct device_node *c;

	static int cluster_id __initdata;

	static int package_id __initdata;

	int core_id = 0;

	int i, ret;
@@ -140,7 +140,7 @@ static int __init parse_cluster(struct device_node *cluster, int depth) 
			}



			if (leaf) {

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

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

			} else {

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

				       cluster, name);
@@ -158,7 +158,7 @@ static int __init parse_cluster(struct device_node *cluster, int depth) 
		pr_warn("%pOF: empty cluster\n", cluster);



	if (leaf)

		cluster_id++;

		package_id++;



	return 0;

}
@@ -194,7 +194,7 @@ static int __init parse_dt_topology(void) 
	 * only mark cores described in the DT as possible.

	 */

	for_each_possible_cpu(cpu)

		if (cpu_topology[cpu].cluster_id == -1)

		if (cpu_topology[cpu].package_id == -1)

			ret = -EINVAL;



out_map:
@@ -224,7 +224,7 @@ static void update_siblings_masks(unsigned int cpuid) 
	for_each_possible_cpu(cpu) {

		cpu_topo = &cpu_topology[cpu];



		if (cpuid_topo->cluster_id != cpu_topo->cluster_id)

		if (cpuid_topo->package_id != cpu_topo->package_id)

			continue;



		cpumask_set_cpu(cpuid, &cpu_topo->core_sibling);
@@ -245,7 +245,7 @@ void store_cpu_topology(unsigned int cpuid) 
	struct cpu_topology *cpuid_topo = &cpu_topology[cpuid];

	u64 mpidr;



	if (cpuid_topo->cluster_id != -1)

	if (cpuid_topo->package_id != -1)

		goto topology_populated;



	mpidr = read_cpuid_mpidr();
@@ -259,19 +259,19 @@ void store_cpu_topology(unsigned int cpuid) 
		/* Multiprocessor system : Multi-threads per core */

		cpuid_topo->thread_id  = MPIDR_AFFINITY_LEVEL(mpidr, 0);

		cpuid_topo->core_id    = MPIDR_AFFINITY_LEVEL(mpidr, 1);

		cpuid_topo->cluster_id = MPIDR_AFFINITY_LEVEL(mpidr, 2) |

		cpuid_topo->package_id = MPIDR_AFFINITY_LEVEL(mpidr, 2) |

					 MPIDR_AFFINITY_LEVEL(mpidr, 3) << 8;

	} else {

		/* Multiprocessor system : Single-thread per core */

		cpuid_topo->thread_id  = -1;

		cpuid_topo->core_id    = MPIDR_AFFINITY_LEVEL(mpidr, 0);

		cpuid_topo->cluster_id = MPIDR_AFFINITY_LEVEL(mpidr, 1) |

		cpuid_topo->package_id = MPIDR_AFFINITY_LEVEL(mpidr, 1) |

					 MPIDR_AFFINITY_LEVEL(mpidr, 2) << 8 |

					 MPIDR_AFFINITY_LEVEL(mpidr, 3) << 16;

	}



	pr_debug("CPU%u: cluster %d core %d thread %d mpidr %#016llx\n",

		 cpuid, cpuid_topo->cluster_id, cpuid_topo->core_id,

		 cpuid, cpuid_topo->package_id, cpuid_topo->core_id,

		 cpuid_topo->thread_id, mpidr);



topology_populated:
@@ -287,7 +287,7 @@ static void __init reset_cpu_topology(void) 


		cpu_topo->thread_id = -1;

		cpu_topo->core_id = 0;

		cpu_topo->cluster_id = -1;

		cpu_topo->package_id = -1;



		cpumask_clear(&cpu_topo->core_sibling);

		cpumask_set_cpu(cpu, &cpu_topo->core_sibling);