From owner-svn-src-all@freebsd.org  Tue Mar  3 03:22:01 2020
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id DBDB6263CBA;
 Tue,  3 Mar 2020 03:22:01 +0000 (UTC)
 (envelope-from jhibbits@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 48Wj3s3d6gz4ZG0;
 Tue,  3 Mar 2020 03:22:01 +0000 (UTC)
 (envelope-from jhibbits@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6EE6B26B45;
 Tue,  3 Mar 2020 03:22:01 +0000 (UTC)
 (envelope-from jhibbits@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0233M1mW013442;
 Tue, 3 Mar 2020 03:22:01 GMT (envelope-from jhibbits@FreeBSD.org)
Received: (from jhibbits@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0233M1uZ013441;
 Tue, 3 Mar 2020 03:22:01 GMT (envelope-from jhibbits@FreeBSD.org)
Message-Id: <202003030322.0233M1uZ013441@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to
 jhibbits@FreeBSD.org using -f
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Tue, 3 Mar 2020 03:22:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r358565 - head/sys/powerpc/powernv
X-SVN-Group: head
X-SVN-Commit-Author: jhibbits
X-SVN-Commit-Paths: head/sys/powerpc/powernv
X-SVN-Commit-Revision: 358565
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Mar 2020 03:22:02 -0000

Author: jhibbits
Date: Tue Mar  3 03:22:00 2020
New Revision: 358565
URL: https://svnweb.freebsd.org/changeset/base/358565

Log:
  powerpc/powernv: powernv_node_numa_domain() fix non-NUMA case
  
  If NUMA is not enabled in the kernel config, or is disabled at boot, this
  function should just return domain 0 regardless of what's in the device
  tree.
  
  Fixes a panic in iflib with NUMA disabled.
  
  Reported by:	luporl

Modified:
  head/sys/powerpc/powernv/platform_powernv.c

Modified: head/sys/powerpc/powernv/platform_powernv.c
==============================================================================
--- head/sys/powerpc/powernv/platform_powernv.c	Tue Mar  3 01:46:35 2020	(r358564)
+++ head/sys/powerpc/powernv/platform_powernv.c	Tue Mar  3 03:22:00 2020	(r358565)
@@ -517,6 +517,12 @@ powernv_node_numa_domain(platform_t platform, phandle_
 	cell_t associativity[5];
 	int i, res;
 
+#ifndef NUMA
+	return (0);
+#endif
+	if (vm_ndomains == 1)
+		return (0);
+
 	res = OF_getencprop(node, "ibm,associativity",
 		associativity, sizeof(associativity));