From owner-svn-src-head@freebsd.org  Sun Sep  1 18:26:22 2019
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 5FB7BE1126;
 Sun,  1 Sep 2019 18:26:22 +0000 (UTC)
 (envelope-from bdragon@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 46M1rG1rcbz4cqQ;
 Sun,  1 Sep 2019 18:26:22 +0000 (UTC)
 (envelope-from bdragon@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 2296559C1;
 Sun,  1 Sep 2019 18:26:22 +0000 (UTC)
 (envelope-from bdragon@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x81IQMY8076584;
 Sun, 1 Sep 2019 18:26:22 GMT (envelope-from bdragon@FreeBSD.org)
Received: (from bdragon@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x81IQMUY076583;
 Sun, 1 Sep 2019 18:26:22 GMT (envelope-from bdragon@FreeBSD.org)
Message-Id: <201909011826.x81IQMUY076583@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdragon set sender to
 bdragon@FreeBSD.org using -f
From: Brandon Bergren <bdragon@FreeBSD.org>
Date: Sun, 1 Sep 2019 18:26:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r351669 - head/stand/powerpc/ofw
X-SVN-Group: head
X-SVN-Commit-Author: bdragon
X-SVN-Commit-Paths: head/stand/powerpc/ofw
X-SVN-Commit-Revision: 351669
X-SVN-Commit-Repository: base
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.29
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: Sun, 01 Sep 2019 18:26:22 -0000

Author: bdragon
Date: Sun Sep  1 18:26:21 2019
New Revision: 351669
URL: https://svnweb.freebsd.org/changeset/base/351669

Log:
  Move CAS check in powerpc64 ofw loader until after the PVR check.
  
  This unbreaks using the powerpc64 loader on a 32-bit processor.
  
  Approved by: jhibbits (mentor)
  Differential Revision: https://reviews.freebsd.org/D21297

Modified:
  head/stand/powerpc/ofw/cas.c

Modified: head/stand/powerpc/ofw/cas.c
==============================================================================
--- head/stand/powerpc/ofw/cas.c	Sun Sep  1 18:25:45 2019	(r351668)
+++ head/stand/powerpc/ofw/cas.c	Sun Sep  1 18:26:21 2019	(r351669)
@@ -191,10 +191,6 @@ ppc64_cas(void)
 	ihandle_t ihandle;
 	cell_t err;
 
-	/* Skip CAS when running on PowerNV */
-	if (!ppc64_hv())
-		return (0);
-
 	/* Perform CAS only for POWER8 and later cores */
 	switch (mfpvr() & PVR_VER_MASK) {
 		case PVR_VER_P8:
@@ -205,6 +201,10 @@ ppc64_cas(void)
 		default:
 			return (0);
 	}
+
+	/* Skip CAS when running on PowerNV */
+	if (!ppc64_hv())
+		return (0);
 
 	ihandle = OF_open("/");
 	if (ihandle == -1) {