[src/netbsd-7]: src/sys/arch/sparc Pull up following revision(s) (requested b...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f7ad0cc4828f
branches:  netbsd-7
changeset: 799161:f7ad0cc4828f
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Mar 29 08:48:25 2015 +0000

description:
Pull up following revision(s) (requested by nakayama in ticket #649):
        sys/arch/sparc/sparc/openfirm.c: revision 1.20
        sys/arch/sparc/include/openfirm.h: revision 1.8
        sys/arch/sparc/stand/ofwboot/Locore.c: revision 1.14
Fix kernel loading failures from partitions started from over first
4GB of disks on sparc64.
Sync sparc64 kernel's OF_seek with ofwboot's one, but sparc version
is not changed.

diffstat:

 sys/arch/sparc/include/openfirm.h     |  4 +++-
 sys/arch/sparc/sparc/openfirm.c       |  8 ++++----
 sys/arch/sparc/stand/ofwboot/Locore.c |  6 +++---
 3 files changed, 10 insertions(+), 8 deletions(-)

diffs (67 lines):

diff -r df3c97ad24d1 -r f7ad0cc4828f sys/arch/sparc/include/openfirm.h
--- a/sys/arch/sparc/include/openfirm.h Sun Mar 29 07:46:21 2015 +0000
+++ b/sys/arch/sparc/include/openfirm.h Sun Mar 29 08:48:25 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: openfirm.h,v 1.7 2009/05/18 11:39:30 nakayama Exp $    */
+/*     $NetBSD: openfirm.h,v 1.7.38.1 2015/03/29 08:48:25 martin Exp $ */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -57,6 +57,8 @@
 typedef uint32_t cell_t;
 #define HDL2CELL(x)    (cell_t)(x)
 #define ADR2CELL(x)    (cell_t)(x)
+#define HDQ2CELL_HI(x) (cell_t)((x) >> 32)
+#define HDQ2CELL_LO(x) (cell_t)(x)
 #endif /* SUN4U */
 
 int    OF_test(const char *);
diff -r df3c97ad24d1 -r f7ad0cc4828f sys/arch/sparc/sparc/openfirm.c
--- a/sys/arch/sparc/sparc/openfirm.c   Sun Mar 29 07:46:21 2015 +0000
+++ b/sys/arch/sparc/sparc/openfirm.c   Sun Mar 29 08:48:25 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: openfirm.c,v 1.18 2011/07/18 21:00:28 martin Exp $     */
+/*     $NetBSD: openfirm.c,v 1.18.28.1 2015/03/29 08:48:25 martin Exp $        */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: openfirm.c,v 1.18 2011/07/18 21:00:28 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: openfirm.c,v 1.18.28.1 2015/03/29 08:48:25 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -546,8 +546,8 @@
        args.nargs = 3;
        args.nreturns = 1;
        args.handle = HDL2CELL(handle);
-       args.poshi = HDL2CELL(pos >> 32);
-       args.poslo = HDL2CELL(pos);
+       args.poshi = HDQ2CELL_HI(pos);
+       args.poslo = HDQ2CELL_LO(pos);
        if (openfirmware(&args) == -1)
                return -1;
        return args.status;
diff -r df3c97ad24d1 -r f7ad0cc4828f sys/arch/sparc/stand/ofwboot/Locore.c
--- a/sys/arch/sparc/stand/ofwboot/Locore.c     Sun Mar 29 07:46:21 2015 +0000
+++ b/sys/arch/sparc/stand/ofwboot/Locore.c     Sun Mar 29 08:48:25 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: Locore.c,v 1.13 2013/12/18 10:09:56 martin Exp $       */
+/*     $NetBSD: Locore.c,v 1.13.4.1 2015/03/29 08:48:26 martin Exp $   */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -302,8 +302,8 @@
        args.nargs = 3;
        args.nreturns = 1;
        args.handle = HDL2CELL(handle);
-       args.poshi = HDL2CELL(pos >> 32);
-       args.poslo = HDL2CELL(pos);
+       args.poshi = HDQ2CELL_HI(pos);
+       args.poslo = HDQ2CELL_LO(pos);
        if (openfirmware(&args) == -1) {
                return -1;
        }