[src/trunk]: src/sys/arch/sparc64/dev Handle US-IIe's STICK counter as 64-bit...

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

details:   https://anonhg.NetBSD.org/src/rev/4716fff3c1bc
branches:  trunk
changeset: 789563:4716fff3c1bc
user:      nakayama <nakayama%NetBSD.org@localhost>
date:      Thu Aug 22 09:57:30 2013 +0000

description:
Handle US-IIe's STICK counter as 64-bit explicitly to fix a hang at
boot after about 6.5 minutes on 32-bit kernel.

diffstat:

 sys/arch/sparc64/dev/psycho.c    |  12 ++++++------
 sys/arch/sparc64/dev/psychovar.h |   4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (57 lines):

diff -r c7e9bc0a80bd -r 4716fff3c1bc sys/arch/sparc64/dev/psycho.c
--- a/sys/arch/sparc64/dev/psycho.c     Thu Aug 22 08:24:30 2013 +0000
+++ b/sys/arch/sparc64/dev/psycho.c     Thu Aug 22 09:57:30 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: psycho.c,v 1.114 2013/08/20 19:19:23 macallan Exp $    */
+/*     $NetBSD: psycho.c,v 1.115 2013/08/22 09:57:30 nakayama Exp $    */
 
 /*
  * Copyright (c) 1999, 2000 Matthew R. Green
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: psycho.c,v 1.114 2013/08/20 19:19:23 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psycho.c,v 1.115 2013/08/22 09:57:30 nakayama Exp $");
 
 #include "opt_ddb.h"
 
@@ -1520,16 +1520,16 @@
 
 /* US-IIe STICK support */
 
-long
+uint64_t
 psycho_getstick(void)
 {
-       long foo;
+       uint64_t stick;
 
-       foo = bus_space_read_8(psycho0->sc_bustag, psycho0->sc_bh,
+       stick = bus_space_read_8(psycho0->sc_bustag, psycho0->sc_bh,
            STICK_CNT_LOW) |
            (bus_space_read_8(psycho0->sc_bustag, psycho0->sc_bh,
            STICK_CNT_HIGH) & 0x7fffffff) << 32;
-       return foo;
+       return stick;
 }
 
 void
diff -r c7e9bc0a80bd -r 4716fff3c1bc sys/arch/sparc64/dev/psychovar.h
--- a/sys/arch/sparc64/dev/psychovar.h  Thu Aug 22 08:24:30 2013 +0000
+++ b/sys/arch/sparc64/dev/psychovar.h  Thu Aug 22 09:57:30 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: psychovar.h,v 1.19 2013/08/20 19:19:23 macallan Exp $  */
+/*     $NetBSD: psychovar.h,v 1.20 2013/08/22 09:57:30 nakayama Exp $  */
 
 /*
  * Copyright (c) 1999, 2000 Matthew R. Green
@@ -138,7 +138,7 @@
 #define psycho_alloc_mem_tag(pp) psycho_alloc_bus_tag((pp), PCI_MEMORY_BUS_SPACE)
 #define psycho_alloc_io_tag(pp) psycho_alloc_bus_tag((pp), PCI_IO_BUS_SPACE)
 
-long psycho_getstick(void);
+uint64_t psycho_getstick(void);
 void psycho_setstick(long);
 void psycho_nextstick(long);