Index: head/stand/powerpc/ofw/cas.c
===================================================================
--- head/stand/powerpc/ofw/cas.c
+++ head/stand/powerpc/ofw/cas.c
@@ -191,10 +191,6 @@
 	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 @@
 		default:
 			return (0);
 	}
+
+	/* Skip CAS when running on PowerNV */
+	if (!ppc64_hv())
+		return (0);
 
 	ihandle = OF_open("/");
 	if (ihandle == -1) {