| Message ID | 067ca4f6-3181-6c6d-32cf-7164fe2c715d@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | powerpc/vphn: Update CPU topology when VPHN enabled | expand |
On 09/01/2017 10:48 AM, Michael Bringmann wrote: > powerpc/vphn: On Power systems with shared configurations of CPUs > and memory, there are some issues with the association of additional > CPUs and memory to nodes when hot-adding resources. This patch > updates the initialization checks to independently recognize PRRN > or VPHN support. > > Signed-off-by: Michael Bringmann <mwb@linux.vnet.ibm.com> > --- > Changes in V13: > -- Split patch to improve review > --- > arch/powerpc/mm/numa.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c > index 312f6ee..c08d736 100644 > --- a/arch/powerpc/mm/numa.c > +++ b/arch/powerpc/mm/numa.c > @@ -1543,7 +1543,8 @@ int start_topology_update(void) > rc = of_reconfig_notifier_register(&dt_update_nb); > #endif > } > - } else if (firmware_has_feature(FW_FEATURE_VPHN) && > + } > + if (firmware_has_feature(FW_FEATURE_VPHN) && > lppaca_shared_proc(get_lppaca())) { > if (!vphn_enabled) { > vphn_enabled = 1; In patch 1/4, you removed the setting of prrn_enabled and vphn_enabled to 0. It seems like that update would be part of this patch. -Nathan > @@ -1568,7 +1569,8 @@ int stop_topology_update(void) > #ifdef CONFIG_SMP > rc = of_reconfig_notifier_unregister(&dt_update_nb); > #endif > - } else if (vphn_enabled) { > + } > + if (vphn_enabled) { > vphn_enabled = 0;> rc = del_timer_sync(&topology_timer); > } >
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index 312f6ee..c08d736 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c @@ -1543,7 +1543,8 @@ int start_topology_update(void) rc = of_reconfig_notifier_register(&dt_update_nb); #endif } - } else if (firmware_has_feature(FW_FEATURE_VPHN) && + } + if (firmware_has_feature(FW_FEATURE_VPHN) && lppaca_shared_proc(get_lppaca())) { if (!vphn_enabled) { vphn_enabled = 1; @@ -1568,7 +1569,8 @@ int stop_topology_update(void) #ifdef CONFIG_SMP rc = of_reconfig_notifier_unregister(&dt_update_nb); #endif - } else if (vphn_enabled) { + } + if (vphn_enabled) { vphn_enabled = 0; rc = del_timer_sync(&topology_timer); }
powerpc/vphn: On Power systems with shared configurations of CPUs and memory, there are some issues with the association of additional CPUs and memory to nodes when hot-adding resources. This patch updates the initialization checks to independently recognize PRRN or VPHN support. Signed-off-by: Michael Bringmann <mwb@linux.vnet.ibm.com> --- Changes in V13: -- Split patch to improve review --- arch/powerpc/mm/numa.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)