From bd94c8ab29c3162bbb43973ee77ce245fe157fef Mon Sep 17 00:00:00 2001
From: Brandon Bergren <bdragon@FreeBSD.org>
Date: Sat, 27 Mar 2021 20:41:45 -0500
Subject: [PowerPC] Fix NUMA checking for powernv

At this point in startup, vm_ndomains has not been initialized. Switch
to checking kenv instead.

Fixes incorrect NUMA information being set on multi-domain systems like
Talos II.

Submitted by:	jhibbits
MFC after:	2 weeks
---
 sys/powerpc/powernv/platform_powernv.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys/powerpc/powernv/platform_powernv.c b/sys/powerpc/powernv/platform_powernv.c
index 434b642a66a8..d7acc544c2ed 100644
--- a/sys/powerpc/powernv/platform_powernv.c
+++ b/sys/powerpc/powernv/platform_powernv.c
@@ -532,7 +532,9 @@ powernv_node_numa_domain(platform_t platform, phandle_t node)
 #ifndef NUMA
 	return (0);
 #endif
-	if (vm_ndomains == 1)
+	i = 0;
+	TUNABLE_INT_FETCH("vm.numa.disabled", &i);
+	if (i)
 		return (0);
 
 	res = OF_getencprop(node, "ibm,associativity",
-- 
cgit v1.2.3