Commit 247257b0 authored by Srikar Dronamraju's avatar Srikar Dronamraju Committed by Michael Ellerman

powerpc/numa: Remove late request for home node associativity

With commit ("powerpc/numa: Early request for home node associativity"),
commit 2ea62630 ("powerpc/topology: Get topology for shared
processors at boot") which was requesting home node associativity
becomes redundant.

Hence remove the late request for home node associativity.
Signed-off-by: default avatarSrikar Dronamraju <srikar@linux.vnet.ibm.com>
Reported-by: default avatarAbdul Haleem <abdhalee@linux.vnet.ibm.com>
Reviewed-by: default avatarNathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200129135301.24739-6-srikar@linux.vnet.ibm.com
parent dc909d8b
...@@ -98,7 +98,6 @@ extern int stop_topology_update(void); ...@@ -98,7 +98,6 @@ extern int stop_topology_update(void);
extern int prrn_is_enabled(void); extern int prrn_is_enabled(void);
extern int find_and_online_cpu_nid(int cpu); extern int find_and_online_cpu_nid(int cpu);
extern int timed_topology_update(int nsecs); extern int timed_topology_update(int nsecs);
extern void __init shared_proc_topology_init(void);
#else #else
static inline int start_topology_update(void) static inline int start_topology_update(void)
{ {
...@@ -121,9 +120,6 @@ static inline int timed_topology_update(int nsecs) ...@@ -121,9 +120,6 @@ static inline int timed_topology_update(int nsecs)
return 0; return 0;
} }
#ifdef CONFIG_SMP
static inline void shared_proc_topology_init(void) {}
#endif
#endif /* CONFIG_NUMA && CONFIG_PPC_SPLPAR */ #endif /* CONFIG_NUMA && CONFIG_PPC_SPLPAR */
#include <asm-generic/topology.h> #include <asm-generic/topology.h>
......
...@@ -1383,11 +1383,6 @@ void __init smp_cpus_done(unsigned int max_cpus) ...@@ -1383,11 +1383,6 @@ void __init smp_cpus_done(unsigned int max_cpus)
if (smp_ops && smp_ops->bringup_done) if (smp_ops && smp_ops->bringup_done)
smp_ops->bringup_done(); smp_ops->bringup_done();
/*
* On a shared LPAR, associativity needs to be requested.
* Hence, get numa topology before dumping cpu topology
*/
shared_proc_topology_init();
dump_numa_cpu_topology(); dump_numa_cpu_topology();
#ifdef CONFIG_SCHED_SMT #ifdef CONFIG_SCHED_SMT
......
...@@ -1632,15 +1632,6 @@ int prrn_is_enabled(void) ...@@ -1632,15 +1632,6 @@ int prrn_is_enabled(void)
return prrn_enabled; return prrn_enabled;
} }
void __init shared_proc_topology_init(void)
{
if (lppaca_shared_proc(get_lppaca())) {
bitmap_fill(cpumask_bits(&cpu_associativity_changes_mask),
nr_cpumask_bits);
numa_update_cpu_topology(false);
}
}
static int topology_read(struct seq_file *file, void *v) static int topology_read(struct seq_file *file, void *v)
{ {
if (vphn_enabled || prrn_enabled) if (vphn_enabled || prrn_enabled)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment