From 9ae631858e354dfc503e60a87df1aa94de4479ce Mon Sep 17 00:00:00 2001
From: Brandon Bergren <bdragon@FreeBSD.org>
Date: Sun, 1 Sep 2019 18:26:21 +0000
Subject: [PATCH] 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
---
 stand/powerpc/ofw/cas.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/stand/powerpc/ofw/cas.c b/stand/powerpc/ofw/cas.c
index 580ee56536d..4b9b4b386eb 100644
--- a/stand/powerpc/ofw/cas.c
+++ b/stand/powerpc/ofw/cas.c
@@ -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:
@@ -206,6 +202,10 @@ ppc64_cas(void)
 			return (0);
 	}
 
+	/* Skip CAS when running on PowerNV */
+	if (!ppc64_hv())
+		return (0);
+
 	ihandle = OF_open("/");
 	if (ihandle == -1) {
 		printf("cas: failed to open / node\n");