Module Name: src
Committed By: nakayama
Date: Sat Dec 7 11:17:25 UTC 2013
Modified Files:
src/sys/arch/sparc64/dev: psycho.c psychovar.h
src/sys/arch/sparc64/sparc64: clock.c
Log Message:
Timecounter's tc_get_timecount requires only 32-bit (u_int), so
omit unnecessary upper 32-bit read from STICK counter.
To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/sys/arch/sparc64/dev/psycho.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sparc64/dev/psychovar.h
cvs rdiff -u -r1.113 -r1.114 src/sys/arch/sparc64/sparc64/clock.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/dev/psycho.c
diff -u src/sys/arch/sparc64/dev/psycho.c:1.117 src/sys/arch/sparc64/dev/psycho.c:1.118
--- src/sys/arch/sparc64/dev/psycho.c:1.117 Fri Nov 8 15:44:26 2013
+++ src/sys/arch/sparc64/dev/psycho.c Sat Dec 7 11:17:24 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: psycho.c,v 1.117 2013/11/08 15:44:26 nakayama Exp $ */
+/* $NetBSD: psycho.c,v 1.118 2013/12/07 11:17:24 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.117 2013/11/08 15:44:26 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psycho.c,v 1.118 2013/12/07 11:17:24 nakayama Exp $");
#include "opt_ddb.h"
@@ -1574,6 +1574,14 @@ psycho_getstick(void)
return stick;
}
+uint32_t
+psycho_getstick32(void)
+{
+
+ return bus_space_read_8(psycho0->sc_bustag, psycho0->sc_bh,
+ STICK_CNT_LOW);
+}
+
void
psycho_setstick(long cnt)
{
Index: src/sys/arch/sparc64/dev/psychovar.h
diff -u src/sys/arch/sparc64/dev/psychovar.h:1.20 src/sys/arch/sparc64/dev/psychovar.h:1.21
--- src/sys/arch/sparc64/dev/psychovar.h:1.20 Thu Aug 22 09:57:30 2013
+++ src/sys/arch/sparc64/dev/psychovar.h Sat Dec 7 11:17:24 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: psychovar.h,v 1.20 2013/08/22 09:57:30 nakayama Exp $ */
+/* $NetBSD: psychovar.h,v 1.21 2013/12/07 11:17:24 nakayama Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@@ -139,6 +139,7 @@ bus_space_tag_t psycho_alloc_bus_tag(str
#define psycho_alloc_io_tag(pp) psycho_alloc_bus_tag((pp), PCI_IO_BUS_SPACE)
uint64_t psycho_getstick(void);
+uint32_t psycho_getstick32(void);
void psycho_setstick(long);
void psycho_nextstick(long);
Index: src/sys/arch/sparc64/sparc64/clock.c
diff -u src/sys/arch/sparc64/sparc64/clock.c:1.113 src/sys/arch/sparc64/sparc64/clock.c:1.114
--- src/sys/arch/sparc64/sparc64/clock.c:1.113 Thu Sep 12 12:45:53 2013
+++ src/sys/arch/sparc64/sparc64/clock.c Sat Dec 7 11:17:25 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.113 2013/09/12 12:45:53 martin Exp $ */
+/* $NetBSD: clock.c,v 1.114 2013/12/07 11:17:25 nakayama Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.113 2013/09/12 12:45:53 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.114 2013/12/07 11:17:25 nakayama Exp $");
#include "opt_multiprocessor.h"
@@ -216,7 +216,7 @@ stick_get_timecount(struct timecounter *
static u_int
stick2e_get_timecount(struct timecounter *tc)
{
- return psycho_getstick();
+ return psycho_getstick32();
}
#endif
