From owner-svn-src-head@freebsd.org  Thu Apr 20 13:56:08 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2A6A7D489CE;
 Thu, 20 Apr 2017 13:56:08 +0000 (UTC)
 (envelope-from cognet@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 mx1.freebsd.org (Postfix) with ESMTPS id EEE5A68;
 Thu, 20 Apr 2017 13:56:07 +0000 (UTC)
 (envelope-from cognet@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3KDu7pr017075;
 Thu, 20 Apr 2017 13:56:07 GMT (envelope-from cognet@FreeBSD.org)
Received: (from cognet@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3KDu7VK017074;
 Thu, 20 Apr 2017 13:56:07 GMT (envelope-from cognet@FreeBSD.org)
Message-Id: <201704201356.v3KDu7VK017074@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cognet set sender to
 cognet@FreeBSD.org using -f
From: Olivier Houchard <cognet@FreeBSD.org>
Date: Thu, 20 Apr 2017 13:56:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r317191 - head/sys/dev/ofw
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Apr 2017 13:56:08 -0000

Author: cognet
Date: Thu Apr 20 13:56:06 2017
New Revision: 317191
URL: https://svnweb.freebsd.org/changeset/base/317191

Log:
  ePAPR states that any non-boot CPU will come in "disabled" state. So we should
  not consider a "disabled" cpu as a CPU we have to ignore, and we should use
  them if they provide a "enable-method".
  While I'm there, support "ok" as well as "okay", while ePAPR only accepts
  "okay", linux accepts "ok" too so we can expect it to be used.
  
  Reviewed by:	andrew (partially)

Modified:
  head/sys/dev/ofw/ofw_cpu.c

Modified: head/sys/dev/ofw/ofw_cpu.c
==============================================================================
--- head/sys/dev/ofw/ofw_cpu.c	Thu Apr 20 13:46:55 2017	(r317190)
+++ head/sys/dev/ofw/ofw_cpu.c	Thu Apr 20 13:56:06 2017	(r317191)
@@ -320,8 +320,10 @@ ofw_cpu_early_foreach(ofw_cpu_foreach_cb
 		if (only_runnable) {
 			status[0] = '\0';
 			OF_getprop(child, "status", status, sizeof(status));
-			if (status[0] != '\0' && strcmp(status, "okay") != 0)
-				continue;
+			if (status[0] != '\0' && strcmp(status, "okay") != 0 &&
+				strcmp(status, "ok") != 0 &&
+				!OF_hasprop(child, "enable-method"))
+					continue;
 		}
 
 		/*