3 files changed, 20 insertions, 10 deletions

diff --git a/arch/powerpc/include/asm/topology.h b/arch/powerpc/include/asm/topology.h
index 16b077801a5f..a4a718dbfec6 100644
--- a/arch/powerpc/include/asm/topology.h
+++ b/arch/powerpc/include/asm/topology.h
@@ -92,6 +92,7 @@ extern int stop_topology_update(void);
 extern int prrn_is_enabled(void);
 extern int find_and_online_cpu_nid(int cpu);
 extern int timed_topology_update(int nsecs);
+extern void __init shared_proc_topology_init(void);
 #else
 static inline int start_topology_update(void)
 {
@@ -113,6 +114,10 @@ static inline int timed_topology_update(int nsecs)
 {
         return 0;
 }
+
+#ifdef CONFIG_SMP
+static inline void shared_proc_topology_init(void) {}
+#endif
 #endif /* CONFIG_NUMA && CONFIG_PPC_SPLPAR */
 
 #include <asm-generic/topology.h>
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index b19d832ef386..61c1fadbc644 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -1160,6 +1160,11 @@ void __init smp_cpus_done(unsigned int max_cpus)
         if (smp_ops && 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();
 
         /*
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 0c7e05d89244..35ac5422903a 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -1078,7 +1078,6 @@ static int prrn_enabled;
 static void reset_topology_timer(void);
 static int topology_timer_secs = 1;
 static int topology_inited;
-static int topology_update_needed;
 
 /*
  * Change polling interval for associativity changes.
@@ -1306,11 +1305,8 @@ int numa_update_cpu_topology(bool cpus_locked)
         struct device *dev;
         int weight, new_nid, i = 0;
 
-        if (!prrn_enabled && !vphn_enabled) {
-                if (!topology_inited)
-                        topology_update_needed = 1;
+        if (!prrn_enabled && !vphn_enabled && topology_inited)
                 return 0;
-        }
 
         weight = cpumask_weight(&cpu_associativity_changes_mask);
         if (!weight)
@@ -1423,7 +1419,6 @@ int numa_update_cpu_topology(bool cpus_locked)
 
 out:
         kfree(updates);
-        topology_update_needed = 0;
         return changed;
 }
 
@@ -1551,6 +1546,15 @@ int prrn_is_enabled(void)
         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)
 {
         if (vphn_enabled || prrn_enabled)
@@ -1608,10 +1612,6 @@ static int topology_update_init(void)
                 return -ENOMEM;
 
         topology_inited = 1;
-        if (topology_update_needed)
-                bitmap_fill(cpumask_bits(&cpu_associativity_changes_mask),
-                                        nr_cpumask_bits);
-
         return 0;
 }
 device_initcall(topology_update_init);