Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3496e91 authored by Michael Bringmann's avatar Michael Bringmann Committed by Michael Ellerman
Browse files

powerpc/vphn: Improve recognition of PRRN/VPHN 



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: default avatarMichael Bringmann <mwb@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 17f444c0

arch/powerpc/mm/numa.c

+4 −4
Original line number Diff line number Diff line
@@ -1531,15 +1531,14 @@ int start_topology_update(void) 
	if (firmware_has_feature(FW_FEATURE_PRRN)) {

		if (!prrn_enabled) {

			prrn_enabled = 1;

			vphn_enabled = 0;

#ifdef CONFIG_SMP

			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) {

			prrn_enabled = 0;

			vphn_enabled = 1;

			setup_cpu_associativity_change_counters();

			init_timer_deferrable(&topology_timer);
@@ -1562,7 +1561,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);

	}