arm64: topology: move store_cpu_topology() to shared code

[platform/kernel/linux-rpi.git] / arch / arm64 / kernel / topology.c

diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c
index d844b53..877c68f 100644 (file)
--- a/arch/arm64/kernel/topology.c
+++ b/arch/arm64/kernel/topology.c
@@ -22,46 +22,6 @@
 #include <asm/cputype.h>
 #include <asm/topology.h>
 
-void store_cpu_topology(unsigned int cpuid)
-{
-       struct cpu_topology *cpuid_topo = &cpu_topology[cpuid];
-       u64 mpidr;
-
-       if (cpuid_topo->package_id != -1)
-               goto topology_populated;
-
-       mpidr = read_cpuid_mpidr();
-
-       /* Uniprocessor systems can rely on default topology values */
-       if (mpidr & MPIDR_UP_BITMASK)
-               return;
-
-       /*
-        * This would be the place to create cpu topology based on MPIDR.
-        *
-        * However, it cannot be trusted to depict the actual topology; some
-        * pieces of the architecture enforce an artificial cap on Aff0 values
-        * (e.g. GICv3's ICC_SGI1R_EL1 limits it to 15), leading to an
-        * artificial cycling of Aff1, Aff2 and Aff3 values. IOW, these end up
-        * having absolutely no relationship to the actual underlying system
-        * topology, and cannot be reasonably used as core / package ID.
-        *
-        * If the MT bit is set, Aff0 *could* be used to define a thread ID, but
-        * we still wouldn't be able to obtain a sane core ID. This means we
-        * need to entirely ignore MPIDR for any topology deduction.
-        */
-       cpuid_topo->thread_id  = -1;
-       cpuid_topo->core_id    = cpuid;
-       cpuid_topo->package_id = cpu_to_node(cpuid);
-
-       pr_debug("CPU%u: cluster %d core %d thread %d mpidr %#016llx\n",
-                cpuid, cpuid_topo->package_id, cpuid_topo->core_id,
-                cpuid_topo->thread_id, mpidr);
-
-topology_populated:
-       update_siblings_masks(cpuid);
-}
-
 #ifdef CONFIG_ACPI
 static bool __init acpi_cpu_is_threaded(int cpu)
 {