arm64: topology: refactor reset_cpu_topology to add support for removing topology (31b46035) · Commits · 戴 / test

Currently reset_cpu_topology clears all the CPU topology information and resets to default values. However we may need to just clear the information when we hotplug out the CPU. In preparation to add the support the same, let's refactor reset_cpu_topology to just reset the information and move clearing out the topology information to clear_cpu_topology. Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will.deacon@arm.com> Tested-by:

Ganapatrao Kulkarni <ganapatrao.kulkarni@cavium.com> Tested-by:

Hanjun Guo <hanjun.guo@linaro.org> Signed-off-by:

Sudeep Holla <sudeep.holla@arm.com> Signed-off-by:

Will Deacon <will.deacon@arm.com>

arch/arm64/kernel/topology.c

+14 −7

Original line number	Diff line number	Diff line
		@@ -293,6 +293,19 @@ topology_populated:
		update_siblings_masks(cpuid);
		}

		static void clear_cpu_topology(int cpu)
		{
		struct cpu_topology *cpu_topo = &cpu_topology[cpu];

		cpumask_clear(&cpu_topo->llc_siblings);
		cpumask_set_cpu(cpu, &cpu_topo->llc_siblings);

		cpumask_clear(&cpu_topo->core_sibling);
		cpumask_set_cpu(cpu, &cpu_topo->core_sibling);
		cpumask_clear(&cpu_topo->thread_sibling);
		cpumask_set_cpu(cpu, &cpu_topo->thread_sibling);
		}

		static void __init reset_cpu_topology(void)
		{
		unsigned int cpu;
		@@ -303,15 +316,9 @@ static void __init reset_cpu_topology(void)
		cpu_topo->thread_id = -1;
		cpu_topo->core_id = 0;
		cpu_topo->package_id = -1;

		cpu_topo->llc_id = -1;
		cpumask_clear(&cpu_topo->llc_siblings);
		cpumask_set_cpu(cpu, &cpu_topo->llc_siblings);

		cpumask_clear(&cpu_topo->core_sibling);
		cpumask_set_cpu(cpu, &cpu_topo->core_sibling);
		cpumask_clear(&cpu_topo->thread_sibling);
		cpumask_set_cpu(cpu, &cpu_topo->thread_sibling);
		clear_cpu_topology(cpu);
		}
		}

Admin message