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) { _______________________________________________ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
