Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sun4v: add 32/64 bit workaround for the OF_read() call, similar to the one introduced in revision 1.21

This commit is contained in:
palle 2021-02-27 18:10:46 +00:00
parent 5398aad6aa
commit ab7c91030b
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
sys/arch/sparc/sparc/openfirm.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: openfirm.c,v 1.23 2017/03/26 12:38:24 martin Exp $ */ /* $NetBSD: openfirm.c,v 1.24 2021/02/27 18:10:46 palle Exp $ */
/* /*
* Copyright (C) 1995, 1996 Wolfgang Solfrank. * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -32,7 +32,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: openfirm.c,v 1.23 2017/03/26 12:38:24 martin Exp $"); __KERNEL_RCSID(0, "$NetBSD: openfirm.c,v 1.24 2021/02/27 18:10:46 palle Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -503,6 +503,15 @@ OF_read(int handle, void *addr, int len)
} args; } args;
int l, act = 0; int l, act = 0;
#ifdef SUN4V
#if __arch64__
void *oaddr = addr;
__cpu_simple_lock(&ofcall_lock);
if (len > OFBOUNCE_MAXSIZE)
panic("OF_read(len = %d) exceedes bounce buffer\n", len);
addr = ofbounce;
#endif
#endif
args.name = ADR2CELL("read"); args.name = ADR2CELL("read");
args.nargs = 3; args.nargs = 3;
args.nreturns = 1; args.nreturns = 1;
@ -511,18 +520,31 @@ OF_read(int handle, void *addr, int len)
for (; len > 0; len -= l) { for (; len > 0; len -= l) {
l = MIN(NBPG, len); l = MIN(NBPG, len);
args.len = l; args.len = l;
if (openfirmware(&args) == -1) if (openfirmware(&args) == -1) {
return -1; act = -1;
goto OF_read_exit;
}
if (args.actual > 0) { if (args.actual > 0) {
act += args.actual; act += args.actual;
} }
if (args.actual < l) { if (args.actual < l) {
if (act) if (act)
return act; goto OF_read_exit;
else else {
return args.actual; act = args.actual;
goto OF_read_exit;
}
} }
} }
OF_read_exit:
#ifdef SUN4V
#if __arch64__
if (act > 0) {
memcpy(oaddr, addr, act);
}
__cpu_simple_unlock(&ofcall_lock);
#endif
#endif
return act; return act;
} }