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

Commit cb75dacb authored by Vincent Guittot's avatar Vincent Guittot Committed by Russell King
Browse files

ARM: 7462/1: topology: factorize the update of sibling masks 

This factorization has also been proposed in another patch that has not been
merged yet:
http://lists.infradead.org/pipermail/linux-arm-kernel/2012-January/080873.html


So, this patch could be dropped depending of the state of the other one.

Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: default avatarVincent Guittot <vincent.guittot@linaro.org>
Reviewed-by: default avatarNamhyung Kim <namhyung@kernel.org>
Acked-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 130d9aab

arch/arm/kernel/topology.c

+27 −21
Original line number Diff line number Diff line
@@ -82,6 +82,32 @@ const struct cpumask *cpu_coregroup_mask(int cpu) 
	return &cpu_topology[cpu].core_sibling;

}



void update_siblings_masks(unsigned int cpuid)

{

	struct cputopo_arm *cpu_topo, *cpuid_topo = &cpu_topology[cpuid];

	int cpu;



	/* update core and thread sibling masks */

	for_each_possible_cpu(cpu) {

		cpu_topo = &cpu_topology[cpu];



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

			continue;



		cpumask_set_cpu(cpuid, &cpu_topo->core_sibling);

		if (cpu != cpuid)

			cpumask_set_cpu(cpu, &cpuid_topo->core_sibling);



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

			continue;



		cpumask_set_cpu(cpuid, &cpu_topo->thread_sibling);

		if (cpu != cpuid)

			cpumask_set_cpu(cpu, &cpuid_topo->thread_sibling);

	}

	smp_wmb();

}



/*

 * store_cpu_topology is called at boot when only one cpu is running

 * and with the mutex cpu_hotplug.lock locked, when several cpus have booted,
@@ -91,7 +117,6 @@ void store_cpu_topology(unsigned int cpuid) 
{

	struct cputopo_arm *cpuid_topo = &cpu_topology[cpuid];

	unsigned int mpidr;

	unsigned int cpu;



	/* If the cpu topology has been already set, just return */

	if (cpuid_topo->core_id != -1)
@@ -133,26 +158,7 @@ void store_cpu_topology(unsigned int cpuid) 
		cpuid_topo->socket_id = -1;

	}



	/* update core and thread sibling masks */

	for_each_possible_cpu(cpu) {

		struct cputopo_arm *cpu_topo = &cpu_topology[cpu];



		if (cpuid_topo->socket_id == cpu_topo->socket_id) {

			cpumask_set_cpu(cpuid, &cpu_topo->core_sibling);

			if (cpu != cpuid)

				cpumask_set_cpu(cpu,

					&cpuid_topo->core_sibling);



			if (cpuid_topo->core_id == cpu_topo->core_id) {

				cpumask_set_cpu(cpuid,

					&cpu_topo->thread_sibling);

				if (cpu != cpuid)

					cpumask_set_cpu(cpu,

						&cpuid_topo->thread_sibling);

			}

		}

	}

	smp_wmb();

	update_siblings_masks(cpuid);



	printk(KERN_INFO "CPU%u: thread %d, cpu %d, socket %d, mpidr %x\n",

		cpuid, cpu_topology[cpuid].thread_id,