Switch hp300 to timecounter with MC6840 interval timer, which is
used for hardclcok(9). Old code is still left for reference. XXX: possibly problematic if hardclock(9) is blocked more than 1/HZ, XXX: but old microtime(9) implementation also had the similar problem.
This commit is contained in:
tsutsui
parent
ba5b97f363
commit
79d97d7582
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: clock.c,v 1.37 2006/09/04 20:32:11 tsutsui Exp $ */
|
||||
/* $NetBSD: clock.c,v 1.38 2006/09/09 19:45:49 tsutsui Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1982, 1990, 1993
|
||||
|
|
@ -85,11 +85,14 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.37 2006/09/04 20:32:11 tsutsui Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.38 2006/09/09 19:45:49 tsutsui Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
#ifdef __HAVE_TIMECOUNTER
|
||||
#include <sys/timetc.h>
|
||||
#endif
|
||||
|
||||
#include <machine/psl.h>
|
||||
#include <machine/cpu.h>
|
||||
|
|
@ -102,9 +105,15 @@ __KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.37 2006/09/04 20:32:11 tsutsui Exp $");
|
|||
#endif
|
||||
|
||||
void statintr(struct clockframe *);
|
||||
#ifdef __HAVE_TIMECOUNTER
|
||||
static u_int mc6840_counter(struct timecounter *);
|
||||
#endif
|
||||
|
||||
static int clkstd[1];
|
||||
static int clkint; /* clock interval, as loaded */
|
||||
|
||||
int clkint; /* clock interval, as loaded */
|
||||
uint32_t clkcounter; /* for timecounter */
|
||||
|
||||
/*
|
||||
* Statistics clock interval and variance, in usec. Variance must be a
|
||||
* power of two. Since this gives us an even number, not an odd number,
|
||||
|
|
@ -221,6 +230,16 @@ cpu_initclocks(void)
|
|||
{
|
||||
volatile struct clkreg *clk;
|
||||
int intvl, statint, profint, minint;
|
||||
#ifdef __HAVE_TIMECOUNTER
|
||||
static struct timecounter tc = {
|
||||
mc6840_counter, /* get_timecount */
|
||||
NULL, /* no poll_pps */
|
||||
~0, /* counter mask */
|
||||
COUNTS_PER_SEC, /* frequency */
|
||||
"mc6840", /* name */
|
||||
100 /* quality */
|
||||
};
|
||||
#endif
|
||||
|
||||
clkstd[0] = IIOV(0x5F8000); /* XXX grot */
|
||||
clk = (volatile struct clkreg *)clkstd[0];
|
||||
|
|
@ -278,6 +297,10 @@ cpu_initclocks(void)
|
|||
clk->clk_cr1 = CLK_IENAB;
|
||||
clk->clk_cr2 = CLK_CR3;
|
||||
clk->clk_cr3 = CLK_IENAB;
|
||||
|
||||
#ifdef __HAVE_TIMECOUNTER
|
||||
tc_init(&tc);
|
||||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -329,6 +352,35 @@ statintr(struct clockframe *fp)
|
|||
statclock(fp);
|
||||
}
|
||||
|
||||
#ifdef __HAVE_TIMECOUNTER
|
||||
u_int
|
||||
mc6840_counter(struct timecounter *tc)
|
||||
{
|
||||
volatile struct clkreg *clk;
|
||||
uint32_t ccounter, count;
|
||||
static uint32_t lastcount;
|
||||
int s;
|
||||
|
||||
clk = (volatile struct clkreg *)clkstd[0];
|
||||
|
||||
s = splclock();
|
||||
ccounter = clkcounter;
|
||||
/* XXX reading counter clears interrupt flag?? */
|
||||
__asm volatile (" clrl %0; movpw %1@(5),%0"
|
||||
: "=d" (count) : "a" (clk));
|
||||
splx(s);
|
||||
|
||||
count = ccounter + (clkint - count);
|
||||
if ((int32_t)(count - lastcount) < 0) {
|
||||
/* XXX wrapped; maybe hardclock() is blocked more than 1/HZ */
|
||||
count = lastcount + 1;
|
||||
}
|
||||
lastcount = count;
|
||||
|
||||
return count;
|
||||
}
|
||||
#else
|
||||
|
||||
/*
|
||||
* Return the best possible estimate of the current time.
|
||||
*/
|
||||
|
|
@ -374,3 +426,4 @@ microtime(struct timeval *tvp)
|
|||
tvp->tv_usec = u;
|
||||
lasttime = *tvp;
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: locore.s,v 1.137 2006/07/20 13:21:38 tsutsui Exp $ */
|
||||
/* $NetBSD: locore.s,v 1.138 2006/09/09 19:45:49 tsutsui Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1980, 1990, 1993
|
||||
|
|
@ -1076,6 +1076,10 @@ Lclkagain:
|
|||
btst #0,%d0 | clear timer1 int immediately to
|
||||
jeq Lnotim1 | minimize chance of losing another
|
||||
movpw %a0@(CLKMSB1),%d1 | due to statintr processing delay
|
||||
/* #ifdef __HAVE_TIMECOUNTER */ | XXX can't include <machine/types.h>
|
||||
movl _C_LABEL(clkint),%d1 | clkcounter += clkint
|
||||
addl %d1,_C_LABEL(clkcounter)
|
||||
/* #endif */
|
||||
Lnotim1:
|
||||
btst #2,%d0 | timer3 interrupt?
|
||||
jeq Lnotim3 | no, skip statclock
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: types.h,v 1.16 2006/09/04 20:32:12 tsutsui Exp $ */
|
||||
/* $NetBSD: types.h,v 1.17 2006/09/09 19:45:49 tsutsui Exp $ */
|
||||
|
||||
#ifndef _HP300_TYPES_H_
|
||||
#define _HP300_TYPES_H_
|
||||
|
|
@ -8,6 +8,7 @@
|
|||
#define __HAVE_DEVICE_REGISTER
|
||||
#define __HAVE_GENERIC_SOFT_INTERRUPTS
|
||||
#define __HAVE_GENERIC_TODR
|
||||
#define __HAVE_TIMECOUNTER
|
||||
|
||||
#if defined(_KERNEL)
|
||||
#define __HAVE_RAS
|
||||
|
|
|
|||
Loading…
Reference in New Issue