d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move CAS check in powerpc64 ofw loader until after the PVR check.

Browse Source 
This unbreaks using the powerpc64 loader on a 32-bit processor.

Approved by: jhibbits (mentor)
Differential Revision: https://reviews.freebsd.org/D21297
This commit is contained in:
Brandon Bergren 2019-09-01 18:26:21 +00:00
parent 840aca2880
commit 9ae631858e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=351669
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
stand/powerpc/ofw/cas.c
View File

@ -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");