diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/mvme88k/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/mvme88k/conf/M187 | 3 | ||||
| -rw-r--r-- | sys/arch/mvme88k/conf/M188 | 3 | ||||
| -rw-r--r-- | sys/arch/mvme88k/conf/M197 | 3 | ||||
| -rw-r--r-- | sys/arch/mvme88k/conf/RAMDISK | 4 | ||||
| -rw-r--r-- | sys/arch/mvme88k/conf/files.mvme88k | 8 | ||||
| -rw-r--r-- | sys/arch/mvme88k/dev/clock.c | 580 | ||||
| -rw-r--r-- | sys/arch/mvme88k/include/mvme1x7.h | 6 | ||||
| -rw-r--r-- | sys/arch/mvme88k/mvme88k/clock.c | 121 | ||||
| -rw-r--r-- | sys/arch/mvme88k/mvme88k/clockvar.h | 73 | ||||
| -rw-r--r-- | sys/arch/mvme88k/mvme88k/m187_machdep.c | 11 | ||||
| -rw-r--r-- | sys/arch/mvme88k/mvme88k/m188_machdep.c | 341 | ||||
| -rw-r--r-- | sys/arch/mvme88k/mvme88k/m197_machdep.c | 11 | ||||
| -rw-r--r-- | sys/arch/mvme88k/mvme88k/m1x7_machdep.c | 207 | ||||
| -rw-r--r-- | sys/arch/mvme88k/mvme88k/machdep.c | 14 |
15 files changed, 769 insertions, 620 deletions
diff --git a/sys/arch/mvme88k/conf/GENERIC b/sys/arch/mvme88k/conf/GENERIC index ab1e26f6be2..b2452e23d28 100644 --- a/sys/arch/mvme88k/conf/GENERIC +++ b/sys/arch/mvme88k/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.49 2005/09/06 19:21:57 miod Exp $ +# $OpenBSD: GENERIC,v 1.50 2006/04/19 22:09:38 miod Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -40,7 +40,6 @@ pcctwo0 at mainbus0 addr 0xfff00000 # MVME187 bussw0 at mainbus0 addr 0xfff00000 # MVME197 sram0 at mainbus0 addr 0xffe00000 # MVME187 pcctwo0 at bussw0 offset 0x00000 # MVME197 -clock0 at pcctwo0 ipl 5 nvram0 at pcctwo0 offset 0xc0000 vme0 at pcctwo0 offset 0x40000 ie0 at pcctwo0 offset 0x46000 ipl 1 @@ -53,7 +52,6 @@ memc1 at pcctwo0 offset 0x43100 # MVME188 devices syscon0 at mainbus0 addr 0xfff00000 # MVME188 -clock0 at syscon0 ipl 5 nvram0 at syscon0 offset 0x80000 dart0 at syscon0 offset 0x82000 ipl 3 vme0 at syscon0 offset 0x85000 diff --git a/sys/arch/mvme88k/conf/M187 b/sys/arch/mvme88k/conf/M187 index bd250ddd6f6..15c9d8fc68f 100644 --- a/sys/arch/mvme88k/conf/M187 +++ b/sys/arch/mvme88k/conf/M187 @@ -1,4 +1,4 @@ -# $OpenBSD: M187,v 1.32 2004/09/16 09:14:03 mickey Exp $ +# $OpenBSD: M187,v 1.33 2006/04/19 22:09:38 miod Exp $ machine mvme88k m88k @@ -25,7 +25,6 @@ pcctwo0 at mainbus0 addr 0xfff00000 sram0 at mainbus0 addr 0xffe00000 # ------------------------------ pcctwo devices ------------------------- -clock0 at pcctwo0 ipl 5 vme0 at pcctwo0 offset 0x40000 nvram0 at pcctwo0 offset 0xc0000 ie0 at pcctwo0 offset 0x46000 ipl 1 diff --git a/sys/arch/mvme88k/conf/M188 b/sys/arch/mvme88k/conf/M188 index 9d0c6841a4a..bda91947aac 100644 --- a/sys/arch/mvme88k/conf/M188 +++ b/sys/arch/mvme88k/conf/M188 @@ -1,4 +1,4 @@ -# $OpenBSD: M188,v 1.25 2005/09/06 19:21:57 miod Exp $ +# $OpenBSD: M188,v 1.26 2006/04/19 22:09:38 miod Exp $ machine mvme88k m88k @@ -25,7 +25,6 @@ bugtty0 at mainbus0 syscon0 at mainbus0 addr 0xfff00000 # ------------------------------ syscon0 devices ------------------------ -clock0 at syscon0 ipl 5 nvram0 at syscon0 offset 0x80000 dart0 at syscon0 offset 0x82000 ipl 3 vme0 at syscon0 offset 0x85000 diff --git a/sys/arch/mvme88k/conf/M197 b/sys/arch/mvme88k/conf/M197 index b243b518887..7e7c68dc1e3 100644 --- a/sys/arch/mvme88k/conf/M197 +++ b/sys/arch/mvme88k/conf/M197 @@ -1,4 +1,4 @@ -# $OpenBSD: M197,v 1.28 2005/09/06 19:21:57 miod Exp $ +# $OpenBSD: M197,v 1.29 2006/04/19 22:09:38 miod Exp $ machine mvme88k m88k @@ -24,7 +24,6 @@ bussw0 at mainbus0 addr 0xfff00000 pcctwo0 at bussw0 offset 0x00000 # ------------------------------ pcctwo devices ------------------------- -clock0 at pcctwo0 ipl 5 vme0 at pcctwo0 offset 0x40000 nvram0 at pcctwo0 offset 0xc0000 ie0 at pcctwo0 offset 0x46000 ipl 1 diff --git a/sys/arch/mvme88k/conf/RAMDISK b/sys/arch/mvme88k/conf/RAMDISK index bb7ef15e9c3..fb5557777fb 100644 --- a/sys/arch/mvme88k/conf/RAMDISK +++ b/sys/arch/mvme88k/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.27 2005/09/06 19:21:57 miod Exp $ +# $OpenBSD: RAMDISK,v 1.28 2006/04/19 22:09:38 miod Exp $ machine mvme88k m88k @@ -43,7 +43,6 @@ syscon0 at mainbus0 addr 0xfff00000 pcctwo0 at bussw0 offset 0x00000 -clock0 at pcctwo0 ipl 5 vme0 at pcctwo0 offset 0x40000 nvram0 at pcctwo0 offset 0xc0000 ie0 at pcctwo0 offset 0x46000 ipl 1 @@ -51,7 +50,6 @@ osiop0 at pcctwo0 offset 0x47000 ipl 2 cl0 at pcctwo0 offset 0x45000 ipl 3 #cl1 at pcctwo0 offset 0x45200 ipl 3 # M8120 only -clock0 at syscon0 ipl 5 nvram0 at syscon0 offset 0x80000 dart0 at syscon0 offset 0x82000 ipl 3 vme0 at syscon0 offset 0x85000 diff --git a/sys/arch/mvme88k/conf/files.mvme88k b/sys/arch/mvme88k/conf/files.mvme88k index 3e5f5aff3ed..f035f1b69db 100644 --- a/sys/arch/mvme88k/conf/files.mvme88k +++ b/sys/arch/mvme88k/conf/files.mvme88k @@ -1,4 +1,4 @@ -# $OpenBSD: files.mvme88k,v 1.39 2005/12/12 20:36:30 miod Exp $ +# $OpenBSD: files.mvme88k,v 1.40 2006/04/19 22:09:38 miod Exp $ # maxpartitions 16 @@ -17,10 +17,6 @@ device syscon {[offset = -1], [ipl = 0]} attach syscon at mainbus file arch/mvme88k/dev/syscon.c syscon needs-count -device clock -attach clock at pcctwo, syscon -file arch/mvme88k/dev/clock.c clock - device memc attach memc at pcctwo file arch/mvme88k/dev/memc.c memc @@ -72,6 +68,7 @@ file dev/cninit.c file arch/mvme88k/mvme88k/autoconf.c file arch/mvme88k/mvme88k/bus_dma.c +file arch/mvme88k/mvme88k/clock.c file arch/mvme88k/mvme88k/conf.c file arch/mvme88k/mvme88k/db_machdep.c ddb file arch/mvme88k/mvme88k/disksubr.c @@ -80,6 +77,7 @@ file arch/mvme88k/mvme88k/machdep.c file arch/mvme88k/mvme88k/m187_machdep.c mvme187 file arch/mvme88k/mvme88k/m188_machdep.c mvme188 file arch/mvme88k/mvme88k/m197_machdep.c mvme197 +file arch/mvme88k/mvme88k/m1x7_machdep.c mvme187 | mvme197 file arch/mvme88k/mvme88k/m88110.c m88110 file arch/mvme88k/mvme88k/m8820x.c m88100 file arch/mvme88k/mvme88k/m88410.c m88110 diff --git a/sys/arch/mvme88k/dev/clock.c b/sys/arch/mvme88k/dev/clock.c deleted file mode 100644 index 9656ee2b20b..00000000000 --- a/sys/arch/mvme88k/dev/clock.c +++ /dev/null @@ -1,580 +0,0 @@ -/* $OpenBSD: clock.c,v 1.45 2006/04/15 22:31:46 miod Exp $ */ -/* - * Copyright (c) 1999 Steve Murphree, Jr. - * Copyright (c) 1995 Theo de Raadt - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS - * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * Copyright (c) 1995 Nivas Madhur - * Copyright (c) 1994 Gordon W. Ross - * Copyright (c) 1993 Adam Glass - * - * This software was developed by the Computer Systems Engineering group - * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and - * contributed to Berkeley. - * - * All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Lawrence Berkeley Laboratory. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)clock.c 8.1 (Berkeley) 6/11/93 - */ - -/* - * Interval and statistic clocks driver. - */ - -#include <sys/param.h> -#include <sys/simplelock.h> -#include <sys/kernel.h> -#include <sys/device.h> -#include <sys/systm.h> - -#include <machine/asm.h> -#include <machine/psl.h> -#include <machine/autoconf.h> -#include <machine/bugio.h> -#include <machine/cpu.h> - -#include "pcctwo.h" -#if NPCCTWO > 0 -#include <machine/mvme1x7.h> -#include <mvme88k/dev/pcctwovar.h> -#include <mvme88k/dev/pcctworeg.h> -#endif - -#include "syscon.h" -#if NSYSCON > 0 -#include <machine/mvme188.h> -#include <mvme88k/dev/sysconreg.h> -#endif - -#include <mvme88k/dev/vme.h> - -#include "bugtty.h" -#if NBUGTTY > 0 -#include <mvme88k/dev/bugttyfunc.h> -#endif - -int clockmatch(struct device *, void *, void *); -void clockattach(struct device *, struct device *, void *); - -void sbc_init_clocks(void); -void m188_init_clocks(void); -void m188_cio_init(unsigned); -u_int read_cio(int); -void write_cio(int, u_int); - -struct clocksoftc { - struct device sc_dev; - struct intrhand sc_profih; - struct intrhand sc_statih; -}; - -struct cfattach clock_ca = { - sizeof(struct clocksoftc), clockmatch, clockattach -}; - -struct cfdriver clock_cd = { - NULL, "clock", DV_DULL -}; - -int sbc_clockintr(void *); -int sbc_statintr(void *); -int m188_clockintr(void *); -int m188_statintr(void *); - -#if NPCCTWO > 0 -u_int8_t prof_reset; -u_int8_t stat_reset; -#endif - -#if NSYSCON > 0 -struct simplelock cio_lock; - -#define CIO_LOCK simple_lock(&cio_lock) -#define CIO_UNLOCK simple_unlock(&cio_lock) -#endif - -/* - * 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, - * we discard one case and compensate. That is, a variance of 4096 would - * give us offsets in [0..4095]. Instead, we take offsets in [1..4095]. - * This is symmetric about the point 2048, or statvar/2, and thus averages - * to that value (assuming uniform random numbers). - */ -int statvar = 8192; -int statmin; /* statclock interval - 1/2*variance */ - -/* - * Every machine must have a clock tick device of some sort; for this - * platform this file manages it, no matter what form it takes. - */ -int -clockmatch(struct device *parent, void *vcf, void *args) -{ - struct confargs *ca = args; - struct cfdata *cf = vcf; - - if (strcmp(cf->cf_driver->cd_name, "clock")) { - return (0); - } - - /* - * clock has to be at ipl 5 - * We return the ipl here so that the parent can print - * a message if it is different from what ioconf.c says. - */ - ca->ca_ipl = IPL_CLOCK; - return (1); -} - -void -clockattach(struct device *parent, struct device *self, void *args) -{ - struct confargs *ca = args; - struct clocksoftc *sc = (struct clocksoftc *)self; - - switch (ca->ca_bustype) { -#if NPCCTWO > 0 - case BUS_PCCTWO: - sc->sc_profih.ih_fn = sbc_clockintr; - sc->sc_profih.ih_arg = 0; - sc->sc_profih.ih_wantframe = 1; - sc->sc_profih.ih_ipl = ca->ca_ipl; - prof_reset = ca->ca_ipl | PCC2_IRQ_IEN | PCC2_IRQ_ICLR; - pcctwointr_establish(PCC2V_TIMER1, &sc->sc_profih, "clock"); - sc->sc_statih.ih_fn = sbc_statintr; - sc->sc_statih.ih_arg = 0; - sc->sc_statih.ih_wantframe = 1; - sc->sc_statih.ih_ipl = ca->ca_ipl; - stat_reset = ca->ca_ipl | PCC2_IRQ_IEN | PCC2_IRQ_ICLR; - pcctwointr_establish(PCC2V_TIMER2, &sc->sc_statih, "stat"); - md_init_clocks = sbc_init_clocks; - break; -#endif /* NPCCTWO */ -#if NSYSCON > 0 - case BUS_SYSCON: - sc->sc_profih.ih_fn = m188_clockintr; - sc->sc_profih.ih_arg = 0; - sc->sc_profih.ih_wantframe = 1; - sc->sc_profih.ih_ipl = ca->ca_ipl; - sysconintr_establish(SYSCV_TIMER2, &sc->sc_profih, "clock"); - sc->sc_statih.ih_fn = m188_statintr; - sc->sc_statih.ih_arg = 0; - sc->sc_statih.ih_wantframe = 1; - sc->sc_statih.ih_ipl = ca->ca_ipl; - sysconintr_establish(SYSCV_TIMER1, &sc->sc_statih, "stat"); - md_init_clocks = m188_init_clocks; - break; -#endif /* NSYSCON */ - } - - printf("\n"); -} - -#if NPCCTWO > 0 - -void -sbc_init_clocks(void) -{ - int statint, minint; - -#ifdef DIAGNOSTIC - if (1000000 % hz) { - printf("cannot get %d Hz clock; using 100 Hz\n", hz); - hz = 100; - } -#endif - tick = 1000000 / hz; - - /* profclock */ - *(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T1CTL) = 0; - *(volatile u_int32_t *)(OBIO_START + PCC2_BASE + PCCTWO_T1CMP) = - pcc2_timer_us2lim(tick); - *(volatile u_int32_t *)(OBIO_START + PCC2_BASE + PCCTWO_T1COUNT) = 0; - *(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T1CTL) = - PCC2_TCTL_CEN | PCC2_TCTL_COC | PCC2_TCTL_COVF; - *(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T1ICR) = - prof_reset; - - if (stathz == 0) - stathz = hz; -#ifdef DIAGNOSTIC - if (1000000 % stathz) { - printf("cannot get %d Hz statclock; using 100 Hz\n", stathz); - stathz = 100; - } -#endif - profhz = stathz; /* always */ - - statint = 1000000 / stathz; - minint = statint / 2 + 100; - while (statvar > minint) - statvar >>= 1; - - /* statclock */ - *(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2CTL) = 0; - *(volatile u_int32_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2CMP) = - pcc2_timer_us2lim(statint); - *(volatile u_int32_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2COUNT) = 0; - *(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2CTL) = - PCC2_TCTL_CEN | PCC2_TCTL_COC | PCC2_TCTL_COVF; - *(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2ICR) = - stat_reset; - - statmin = statint - (statvar >> 1); -} - -/* - * clockintr: ack intr and call hardclock - */ -int -sbc_clockintr(void *eframe) -{ - *(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T1ICR) = - prof_reset; - - hardclock(eframe); -#if NBUGTTY > 0 - bugtty_chkinput(); -#endif /* NBUGTTY */ - - return (1); -} - -int -sbc_statintr(void *eframe) -{ - u_long newint, r, var; - - *(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2ICR) = - stat_reset; - - statclock((struct clockframe *)eframe); - - /* - * Compute new randomized interval. The intervals are uniformly - * distributed on [statint - statvar / 2, statint + statvar / 2], - * and therefore have mean statint, giving a stathz frequency clock. - */ - var = statvar; - do { - r = random() & (var - 1); - } while (r == 0); - newint = statmin + r; - - *(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2CTL) = 0; - *(volatile u_int32_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2CMP) = - pcc2_timer_us2lim(newint); - *(volatile u_int32_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2COUNT) = 0; - *(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2ICR) = - stat_reset; - *(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2CTL) = - PCC2_TCTL_CEN | PCC2_TCTL_COC; - return (1); -} - -#endif /* NPCCTWO */ - -#if NSYSCON > 0 - -/* - * Notes on the MVME188 clock usage: - * - * We have two sources for timers: - * - two counter/timers in the DUART (MC68681/MC68692) - * - three counter/timers in the Zilog Z8536 - * - * However: - * - Z8536 CT#3 is reserved as a watchdog device; and its input is - * user-controllable with jumpers on the SYSCON board, so we can't - * really use it. - * - When using the Z8536 in timer mode, it _seems_ like it resets at - * 0xffff instead of the initial count value... - * - Despite having per-counter programmable interrupt vectors, the - * SYSCON logic forces fixed vectors for the DUART and the Z8536 timer - * interrupts. - * - The DUART timers keep counting down from 0xffff even after - * interrupting, and need to be manually stopped, then restarted, to - * resume counting down the initial count value. - * - * Also, while the Z8536 has a very reliable 4MHz clock source, the - * 3.6864MHz clock source of the DUART timers does not seem to be correct. - * - * As a result, clock is run on a Z8536 counter, kept in counter mode and - * retriggered every interrupt, while statclock is run on a DUART counter, - * but in practice runs at an average 96Hz instead of the expected 100Hz. - * - * It should be possible to run statclock on the Z8536 counter #2, but - * this would make interrupt handling more tricky, in the case both - * counters interrupt at the same time... - */ - -#define DART_ISR 0xfff82017 /* interrupt status */ -#define DART_IVR 0xfff82033 /* interrupt vector */ -#define DART_STARTC 0xfff8203b /* start counter cmd */ -#define DART_STOPC 0xfff8203f /* stop counter cmd */ -#define DART_ACR 0xfff82013 /* auxiliary control */ -#define DART_CTUR 0xfff8201b /* counter/timer MSB */ -#define DART_CTLR 0xfff8201f /* counter/timer LSB */ -#define DART_OPCR 0xfff82037 /* output port config*/ - -void -m188_init_clocks(void) -{ - volatile u_int8_t imr; - int statint, minint; - -#ifdef DIAGNOSTIC - if (1000000 % hz) { - printf("cannot get %d Hz clock; using 100 Hz\n", hz); - hz = 100; - } -#endif - tick = 1000000 / hz; - - simple_lock_init(&cio_lock); - m188_cio_init(tick); - - if (stathz == 0) - stathz = hz; -#ifdef DIAGNOSTIC - if (1000000 % stathz) { - printf("cannot get %d Hz statclock; using 100 Hz\n", stathz); - stathz = 100; - } -#endif - profhz = stathz; /* always */ - - /* - * The DUART runs at 3.6864 MHz, CT#1 will run in PCLK/16 mode. - */ - statint = (3686400 / 16) / stathz; - minint = statint / 2 + 100; - while (statvar > minint) - statvar >>= 1; - statmin = statint - (statvar >> 1); - - /* clear the counter/timer output OP3 while we program the DART */ - *(volatile u_int8_t *)DART_OPCR = 0x00; - /* set interrupt vec */ - *(volatile u_int8_t *)DART_IVR = SYSCON_VECT + SYSCV_TIMER1; - /* do the stop counter/timer command */ - imr = *(volatile u_int8_t *)DART_STOPC; - /* set counter/timer to counter mode, PCLK/16 */ - *(volatile u_int8_t *)DART_ACR = 0x30; - *(volatile u_int8_t *)DART_CTUR = (statint >> 8); - *(volatile u_int8_t *)DART_CTLR = (statint & 0xff); - /* set the counter/timer output OP3 */ - *(volatile u_int8_t *)DART_OPCR = 0x04; - /* give the start counter/timer command */ - imr = *(volatile u_int8_t *)DART_STARTC; -} - -int -m188_clockintr(void *eframe) -{ - CIO_LOCK; - write_cio(CIO_CSR1, CIO_GCB | CIO_CIP); /* Ack the interrupt */ - - hardclock(eframe); -#if NBUGTTY > 0 - bugtty_chkinput(); -#endif /* NBUGTTY */ - - /* restart counter */ - write_cio(CIO_CSR1, CIO_GCB | CIO_TCB | CIO_IE); - CIO_UNLOCK; - - return (1); -} - -int -m188_statintr(void *eframe) -{ - volatile u_int8_t tmp; - u_long newint, r, var; - - /* stop counter and acknowledge interrupt */ - tmp = *(volatile u_int8_t *)DART_STOPC; - tmp = *(volatile u_int8_t *)DART_ISR; - - statclock((struct clockframe *)eframe); - - /* - * Compute new randomized interval. The intervals are uniformly - * distributed on [statint - statvar / 2, statint + statvar / 2], - * and therefore have mean statint, giving a stathz frequency clock. - */ - var = statvar; - do { - r = random() & (var - 1); - } while (r == 0); - newint = statmin + r; - - /* setup new value and restart counter */ - *(volatile u_int8_t *)DART_CTUR = (newint >> 8); - *(volatile u_int8_t *)DART_CTLR = (newint & 0xff); - tmp = *(volatile u_int8_t *)DART_STARTC; - - return (1); -} - -/* Write CIO register */ -void -write_cio(int reg, u_int val) -{ - int s; - volatile int i; - volatile u_int32_t * cio_ctrl = (volatile u_int32_t *)CIO_CTRL; - - s = splclock(); - CIO_LOCK; - - i = *cio_ctrl; /* goto state 1 */ - *cio_ctrl = 0; /* take CIO out of RESET */ - i = *cio_ctrl; /* reset CIO state machine */ - - *cio_ctrl = (reg & 0xff); /* select register */ - *cio_ctrl = (val & 0xff); /* write the value */ - - CIO_UNLOCK; - splx(s); -} - -/* Read CIO register */ -u_int -read_cio(int reg) -{ - int c, s; - volatile int i; - volatile u_int32_t * cio_ctrl = (volatile u_int32_t *)CIO_CTRL; - - s = splclock(); - CIO_LOCK; - - /* select register */ - *cio_ctrl = (reg & 0xff); - /* delay for a short time to allow 8536 to settle */ - for (i = 0; i < 100; i++) - ; - /* read the value */ - c = *cio_ctrl; - CIO_UNLOCK; - splx(s); - return (c & 0xff); -} - -/* - * Initialize the CTC (8536) - * Only the counter/timers are used - the IO ports are un-comitted. - */ -void -m188_cio_init(unsigned period) -{ - volatile int i; - - CIO_LOCK; - - /* Start by forcing chip into known state */ - read_cio(CIO_MICR); - write_cio(CIO_MICR, CIO_MICR_RESET); /* Reset the CTC */ - for (i = 0; i < 1000; i++) /* Loop to delay */ - ; - - /* Clear reset and start init seq. */ - write_cio(CIO_MICR, 0x00); - - /* Wait for chip to come ready */ - while ((read_cio(CIO_MICR) & CIO_MICR_RJA) == 0) - ; - - /* Initialize the 8536 for real */ - write_cio(CIO_MICR, - CIO_MICR_MIE /* | CIO_MICR_NV */ | CIO_MICR_RJA | CIO_MICR_DLC); - write_cio(CIO_CTMS1, CIO_CTMS_CSC); /* Continuous count */ - write_cio(CIO_PDCB, 0xff); /* set port B to input */ - - period <<= 1; /* CT#1 runs at PCLK/2, hence 2MHz */ - write_cio(CIO_CT1MSB, period >> 8); - write_cio(CIO_CT1LSB, period); - /* enable counter #1 */ - write_cio(CIO_MCCR, CIO_MCCR_CT1E | CIO_MCCR_PBE); - write_cio(CIO_CSR1, CIO_GCB | CIO_TCB | CIO_IE); - - CIO_UNLOCK; -} -#endif /* NSYSCON */ - -void -delay(int us) -{ - if (brdtyp == BRD_188) { - extern void m188_delay(int); - - m188_delay(us); - } else { - /* - * On MVME187 and MVME197, use the VMEchip for the - * delay clock. - */ - *(volatile u_int32_t *)(VME2_BASE + VME2_T1CMP) = 0xffffffff; - *(volatile u_int32_t *)(VME2_BASE + VME2_T1COUNT) = 0; - *(volatile u_int32_t *)(VME2_BASE + VME2_TCTL) |= - VME2_TCTL1_CEN; - - while ((*(volatile u_int32_t *)(VME2_BASE + VME2_T1COUNT)) < - (u_int32_t)us) - ; - *(volatile u_int32_t *)(VME2_BASE + VME2_TCTL) &= - ~VME2_TCTL1_CEN; - } -} diff --git a/sys/arch/mvme88k/include/mvme1x7.h b/sys/arch/mvme88k/include/mvme1x7.h index 1000df89252..a2eef22b52f 100644 --- a/sys/arch/mvme88k/include/mvme1x7.h +++ b/sys/arch/mvme88k/include/mvme1x7.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mvme1x7.h,v 1.11 2004/08/02 08:35:00 miod Exp $ */ +/* $OpenBSD: mvme1x7.h,v 1.12 2006/04/19 22:09:40 miod Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * Copyright (c) 1999 Steve Murphree, Jr. @@ -70,4 +70,8 @@ #define TOD_CAL_MON 0xFFFC1FFE /* months */ #define TOD_CAL_YEAR 0xFFFC1FFF /* years */ +#if defined(_KERNEL) && !defined(_LOCORE) +void m1x7_init_clocks(void); +#endif + #endif /* __MACHINE_MVME1X7_H__ */ diff --git a/sys/arch/mvme88k/mvme88k/clock.c b/sys/arch/mvme88k/mvme88k/clock.c new file mode 100644 index 00000000000..2137648cace --- /dev/null +++ b/sys/arch/mvme88k/mvme88k/clock.c @@ -0,0 +1,121 @@ +/* $OpenBSD: clock.c,v 1.3 2006/04/19 22:09:40 miod Exp $ */ +/* + * Copyright (c) 1999 Steve Murphree, Jr. + * Copyright (c) 1995 Theo de Raadt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS + * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * Copyright (c) 1992, 1993 + * The Regents of the University of California. All rights reserved. + * Copyright (c) 1995 Nivas Madhur + * Copyright (c) 1994 Gordon W. Ross + * Copyright (c) 1993 Adam Glass + * + * This software was developed by the Computer Systems Engineering group + * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and + * contributed to Berkeley. + * + * All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Lawrence Berkeley Laboratory. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * @(#)clock.c 8.1 (Berkeley) 6/11/93 + */ + +/* + * Interval and statistic clocks driver. + */ + +#include <sys/param.h> +#include <sys/kernel.h> +#include <sys/device.h> +#include <sys/systm.h> + +#include <machine/autoconf.h> +#include <machine/bus.h> + +#include <mvme88k/mvme88k/clockvar.h> +#include <mvme88k/dev/vme.h> + +struct intrhand clock_ih; +struct intrhand statclock_ih; + +/* + * 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, + * we discard one case and compensate. That is, a variance of 4096 would + * give us offsets in [0..4095]. Instead, we take offsets in [1..4095]. + * This is symmetric about the point 2048, or statvar/2, and thus averages + * to that value (assuming uniform random numbers). + */ +int statvar = 8192; +int statmin; /* statclock interval - 1/2*variance */ + +void +delay(int us) +{ + if (brdtyp == BRD_188) { + extern void m188_delay(int); + + m188_delay(us); + } else { + /* + * On MVME187 and MVME197, use the VMEchip for the + * delay clock. + */ + *(volatile u_int32_t *)(VME2_BASE + VME2_T1CMP) = 0xffffffff; + *(volatile u_int32_t *)(VME2_BASE + VME2_T1COUNT) = 0; + *(volatile u_int32_t *)(VME2_BASE + VME2_TCTL) |= + VME2_TCTL1_CEN; + + while ((*(volatile u_int32_t *)(VME2_BASE + VME2_T1COUNT)) < + (u_int32_t)us) + ; + *(volatile u_int32_t *)(VME2_BASE + VME2_TCTL) &= + ~VME2_TCTL1_CEN; + } +} diff --git a/sys/arch/mvme88k/mvme88k/clockvar.h b/sys/arch/mvme88k/mvme88k/clockvar.h new file mode 100644 index 00000000000..161a26fa790 --- /dev/null +++ b/sys/arch/mvme88k/mvme88k/clockvar.h @@ -0,0 +1,73 @@ +/* $OpenBSD: clockvar.h,v 1.1 2006/04/19 22:09:40 miod Exp $ */ +/* + * Copyright (c) 1999 Steve Murphree, Jr. + * Copyright (c) 1995 Theo de Raadt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS + * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * Copyright (c) 1992, 1993 + * The Regents of the University of California. All rights reserved. + * Copyright (c) 1995 Nivas Madhur + * Copyright (c) 1994 Gordon W. Ross + * Copyright (c) 1993 Adam Glass + * + * This software was developed by the Computer Systems Engineering group + * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and + * contributed to Berkeley. + * + * All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Lawrence Berkeley Laboratory. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * @(#)clock.c 8.1 (Berkeley) 6/11/93 + */ + +extern struct intrhand clock_ih; +extern struct intrhand statclock_ih; + +extern int statvar; +extern int statmin; diff --git a/sys/arch/mvme88k/mvme88k/m187_machdep.c b/sys/arch/mvme88k/mvme88k/m187_machdep.c index 30543e12b38..379c0baef20 100644 --- a/sys/arch/mvme88k/mvme88k/m187_machdep.c +++ b/sys/arch/mvme88k/mvme88k/m187_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m187_machdep.c,v 1.8 2006/04/13 21:16:17 miod Exp $ */ +/* $OpenBSD: m187_machdep.c,v 1.9 2006/04/19 22:09:40 miod Exp $ */ /* * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -245,8 +245,9 @@ m187_bootstrap() extern struct cmmu_p cmmu8820x; cmmu = &cmmu8820x; - md_interrupt_func_ptr = &m187_ext_int; - md_getipl = &m187_getipl; - md_setipl = &m187_setipl; - md_raiseipl = &m187_raiseipl; + md_interrupt_func_ptr = m187_ext_int; + md_getipl = m187_getipl; + md_setipl = m187_setipl; + md_raiseipl = m187_raiseipl; + md_init_clocks = m1x7_init_clocks; } diff --git a/sys/arch/mvme88k/mvme88k/m188_machdep.c b/sys/arch/mvme88k/mvme88k/m188_machdep.c index 736668cb7cc..fcbe157badb 100644 --- a/sys/arch/mvme88k/mvme88k/m188_machdep.c +++ b/sys/arch/mvme88k/mvme88k/m188_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m188_machdep.c,v 1.17 2006/04/19 19:54:21 miod Exp $ */ +/* $OpenBSD: m188_machdep.c,v 1.18 2006/04/19 22:09:40 miod Exp $ */ /* * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -31,6 +31,72 @@ * */ /* + * Copyright (c) 1999 Steve Murphree, Jr. + * Copyright (c) 1995 Theo de Raadt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS + * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * Copyright (c) 1992, 1993 + * The Regents of the University of California. All rights reserved. + * Copyright (c) 1995 Nivas Madhur + * Copyright (c) 1994 Gordon W. Ross + * Copyright (c) 1993 Adam Glass + * + * This software was developed by the Computer Systems Engineering group + * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and + * contributed to Berkeley. + * + * All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Lawrence Berkeley Laboratory. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * @(#)clock.c 8.1 (Berkeley) 6/11/93 + */ +/* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University * Copyright (c) 1991 OMRON Corporation @@ -63,12 +129,15 @@ #include <mvme88k/dev/sysconreg.h> +#include <mvme88k/mvme88k/clockvar.h> + void m188_reset(void); u_int safe_level(u_int mask, u_int curlevel); void m188_bootstrap(void); void m188_ext_int(u_int, struct trapframe *); u_int m188_getipl(void); +void m188_init_clocks(void); vaddr_t m188_memsize(void); u_int m188_raiseipl(u_int); u_int m188_setipl(u_int); @@ -158,10 +227,11 @@ m188_bootstrap() extern struct cmmu_p cmmu8820x; cmmu = &cmmu8820x; - md_interrupt_func_ptr = &m188_ext_int; - md_getipl = &m188_getipl; - md_setipl = &m188_setipl; - md_raiseipl = &m188_raiseipl; + md_interrupt_func_ptr = m188_ext_int; + md_getipl = m188_getipl; + md_setipl = m188_setipl; + md_raiseipl = m188_raiseipl; + md_init_clocks = m188_init_clocks; /* clear and disable all interrupts */ *(volatile u_int32_t *)MVME188_IENALL = 0; @@ -492,3 +562,264 @@ out: */ m188_setipl(eframe->tf_mask); } + +/* + * Clock routines + */ + +void m188_cio_init(unsigned); +u_int read_cio(int); +void write_cio(int, u_int); + +int m188_clockintr(void *); +int m188_statintr(void *); + +struct simplelock m188_cio_lock; + +#define CIO_LOCK simple_lock(&m188_cio_lock) +#define CIO_UNLOCK simple_unlock(&m188_cio_lock) + +/* + * Notes on the MVME188 clock usage: + * + * We have two sources for timers: + * - two counter/timers in the DUART (MC68681/MC68692) + * - three counter/timers in the Zilog Z8536 + * + * However: + * - Z8536 CT#3 is reserved as a watchdog device; and its input is + * user-controllable with jumpers on the SYSCON board, so we can't + * really use it. + * - When using the Z8536 in timer mode, it _seems_ like it resets at + * 0xffff instead of the initial count value... + * - Despite having per-counter programmable interrupt vectors, the + * SYSCON logic forces fixed vectors for the DUART and the Z8536 timer + * interrupts. + * - The DUART timers keep counting down from 0xffff even after + * interrupting, and need to be manually stopped, then restarted, to + * resume counting down the initial count value. + * + * Also, while the Z8536 has a very reliable 4MHz clock source, the + * 3.6864MHz clock source of the DUART timers does not seem to be correct. + * + * As a result, clock is run on a Z8536 counter, kept in counter mode and + * retriggered every interrupt, while statclock is run on a DUART counter, + * but in practice runs at an average 96Hz instead of the expected 100Hz. + * + * It should be possible to run statclock on the Z8536 counter #2, but + * this would make interrupt handling more tricky, in the case both + * counters interrupt at the same time... + */ + +#define DART_ISR 0xfff82017 /* interrupt status */ +#define DART_IVR 0xfff82033 /* interrupt vector */ +#define DART_STARTC 0xfff8203b /* start counter cmd */ +#define DART_STOPC 0xfff8203f /* stop counter cmd */ +#define DART_ACR 0xfff82013 /* auxiliary control */ +#define DART_CTUR 0xfff8201b /* counter/timer MSB */ +#define DART_CTLR 0xfff8201f /* counter/timer LSB */ +#define DART_OPCR 0xfff82037 /* output port config*/ + +void +m188_init_clocks(void) +{ + volatile u_int8_t imr; + int statint, minint; + + simple_lock_init(&m188_cio_lock); + +#ifdef DIAGNOSTIC + if (1000000 % hz) { + printf("cannot get %d Hz clock; using 100 Hz\n", hz); + hz = 100; + } +#endif + tick = 1000000 / hz; + + m188_cio_init(tick); + + if (stathz == 0) + stathz = hz; +#ifdef DIAGNOSTIC + if (1000000 % stathz) { + printf("cannot get %d Hz statclock; using 100 Hz\n", stathz); + stathz = 100; + } +#endif + profhz = stathz; /* always */ + + /* + * The DUART runs at 3.6864 MHz, CT#1 will run in PCLK/16 mode. + */ + statint = (3686400 / 16) / stathz; + minint = statint / 2 + 100; + while (statvar > minint) + statvar >>= 1; + statmin = statint - (statvar >> 1); + + /* clear the counter/timer output OP3 while we program the DART */ + *(volatile u_int8_t *)DART_OPCR = 0x00; + /* set interrupt vec */ + *(volatile u_int8_t *)DART_IVR = SYSCON_VECT + SYSCV_TIMER1; + /* do the stop counter/timer command */ + imr = *(volatile u_int8_t *)DART_STOPC; + /* set counter/timer to counter mode, PCLK/16 */ + *(volatile u_int8_t *)DART_ACR = 0x30; + *(volatile u_int8_t *)DART_CTUR = (statint >> 8); + *(volatile u_int8_t *)DART_CTLR = (statint & 0xff); + /* set the counter/timer output OP3 */ + *(volatile u_int8_t *)DART_OPCR = 0x04; + /* give the start counter/timer command */ + imr = *(volatile u_int8_t *)DART_STARTC; + + clock_ih.ih_fn = m188_clockintr; + clock_ih.ih_arg = 0; + clock_ih.ih_wantframe = 1; + clock_ih.ih_ipl = IPL_CLOCK; + sysconintr_establish(SYSCV_TIMER2, &clock_ih, "clock"); + + statclock_ih.ih_fn = m188_statintr; + statclock_ih.ih_arg = 0; + statclock_ih.ih_wantframe = 1; + statclock_ih.ih_ipl = IPL_CLOCK; + sysconintr_establish(SYSCV_TIMER1, &statclock_ih, "stat"); +} + +#include "bugtty.h" +#if NBUGTTY > 0 +#include <mvme88k/dev/bugttyfunc.h> +#endif + +int +m188_clockintr(void *eframe) +{ + CIO_LOCK; + write_cio(CIO_CSR1, CIO_GCB | CIO_CIP); /* Ack the interrupt */ + + hardclock(eframe); +#if NBUGTTY > 0 + bugtty_chkinput(); +#endif /* NBUGTTY */ + + /* restart counter */ + write_cio(CIO_CSR1, CIO_GCB | CIO_TCB | CIO_IE); + CIO_UNLOCK; + + return (1); +} + +int +m188_statintr(void *eframe) +{ + volatile u_int8_t tmp; + u_long newint, r, var; + + /* stop counter and acknowledge interrupt */ + tmp = *(volatile u_int8_t *)DART_STOPC; + tmp = *(volatile u_int8_t *)DART_ISR; + + statclock((struct clockframe *)eframe); + + /* + * Compute new randomized interval. The intervals are uniformly + * distributed on [statint - statvar / 2, statint + statvar / 2], + * and therefore have mean statint, giving a stathz frequency clock. + */ + var = statvar; + do { + r = random() & (var - 1); + } while (r == 0); + newint = statmin + r; + + /* setup new value and restart counter */ + *(volatile u_int8_t *)DART_CTUR = (newint >> 8); + *(volatile u_int8_t *)DART_CTLR = (newint & 0xff); + tmp = *(volatile u_int8_t *)DART_STARTC; + + return (1); +} + +/* Write CIO register */ +void +write_cio(int reg, u_int val) +{ + int s; + volatile int i; + volatile u_int32_t * cio_ctrl = (volatile u_int32_t *)CIO_CTRL; + + s = splclock(); + CIO_LOCK; + + i = *cio_ctrl; /* goto state 1 */ + *cio_ctrl = 0; /* take CIO out of RESET */ + i = *cio_ctrl; /* reset CIO state machine */ + + *cio_ctrl = (reg & 0xff); /* select register */ + *cio_ctrl = (val & 0xff); /* write the value */ + + CIO_UNLOCK; + splx(s); +} + +/* Read CIO register */ +u_int +read_cio(int reg) +{ + int c, s; + volatile int i; + volatile u_int32_t * cio_ctrl = (volatile u_int32_t *)CIO_CTRL; + + s = splclock(); + CIO_LOCK; + + /* select register */ + *cio_ctrl = (reg & 0xff); + /* delay for a short time to allow 8536 to settle */ + for (i = 0; i < 100; i++) + ; + /* read the value */ + c = *cio_ctrl; + CIO_UNLOCK; + splx(s); + return (c & 0xff); +} + +/* + * Initialize the CTC (8536) + * Only the counter/timers are used - the IO ports are un-comitted. + */ +void +m188_cio_init(unsigned period) +{ + volatile int i; + + CIO_LOCK; + + /* Start by forcing chip into known state */ + read_cio(CIO_MICR); + write_cio(CIO_MICR, CIO_MICR_RESET); /* Reset the CTC */ + for (i = 0; i < 1000; i++) /* Loop to delay */ + ; + + /* Clear reset and start init seq. */ + write_cio(CIO_MICR, 0x00); + + /* Wait for chip to come ready */ + while ((read_cio(CIO_MICR) & CIO_MICR_RJA) == 0) + ; + + /* Initialize the 8536 for real */ + write_cio(CIO_MICR, + CIO_MICR_MIE /* | CIO_MICR_NV */ | CIO_MICR_RJA | CIO_MICR_DLC); + write_cio(CIO_CTMS1, CIO_CTMS_CSC); /* Continuous count */ + write_cio(CIO_PDCB, 0xff); /* set port B to input */ + + period <<= 1; /* CT#1 runs at PCLK/2, hence 2MHz */ + write_cio(CIO_CT1MSB, period >> 8); + write_cio(CIO_CT1LSB, period); + /* enable counter #1 */ + write_cio(CIO_MCCR, CIO_MCCR_CT1E | CIO_MCCR_PBE); + write_cio(CIO_CSR1, CIO_GCB | CIO_TCB | CIO_IE); + + CIO_UNLOCK; +} diff --git a/sys/arch/mvme88k/mvme88k/m197_machdep.c b/sys/arch/mvme88k/mvme88k/m197_machdep.c index 1cf9e2786d4..255f9b4fc2d 100644 --- a/sys/arch/mvme88k/mvme88k/m197_machdep.c +++ b/sys/arch/mvme88k/mvme88k/m197_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m197_machdep.c,v 1.8 2006/04/13 21:16:17 miod Exp $ */ +/* $OpenBSD: m197_machdep.c,v 1.9 2006/04/19 22:09:40 miod Exp $ */ /* * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -264,10 +264,11 @@ m197_bootstrap() extern void set_tcfp(void); cmmu = &cmmu88110; - md_interrupt_func_ptr = &m197_ext_int; - md_getipl = &m197_getipl; - md_setipl = &m197_setipl; - md_raiseipl = &m197_raiseipl; + md_interrupt_func_ptr = m197_ext_int; + md_getipl = m197_getipl; + md_setipl = m197_setipl; + md_raiseipl = m197_raiseipl; + md_init_clocks = m1x7_init_clocks; set_tcfp(); /* Set Time Critical Floating Point Mode */ } diff --git a/sys/arch/mvme88k/mvme88k/m1x7_machdep.c b/sys/arch/mvme88k/mvme88k/m1x7_machdep.c new file mode 100644 index 00000000000..f497f6fdcf1 --- /dev/null +++ b/sys/arch/mvme88k/mvme88k/m1x7_machdep.c @@ -0,0 +1,207 @@ +/* $OpenBSD: m1x7_machdep.c,v 1.1 2006/04/19 22:09:40 miod Exp $ */ +/* + * Copyright (c) 1999 Steve Murphree, Jr. + * Copyright (c) 1995 Theo de Raadt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS + * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * Copyright (c) 1992, 1993 + * The Regents of the University of California. All rights reserved. + * Copyright (c) 1995 Nivas Madhur + * Copyright (c) 1994 Gordon W. Ross + * Copyright (c) 1993 Adam Glass + * + * This software was developed by the Computer Systems Engineering group + * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and + * contributed to Berkeley. + * + * All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Lawrence Berkeley Laboratory. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * @(#)clock.c 8.1 (Berkeley) 6/11/93 + */ + +/* + * Interval and statistic clocks driver. + */ + +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/device.h> +#include <sys/kernel.h> + +#include <machine/bus.h> + +#include <machine/mvme1x7.h> +#include <mvme88k/dev/pcctwovar.h> +#include <mvme88k/dev/pcctworeg.h> + +#include <mvme88k/mvme88k/clockvar.h> + +int m1x7_clockintr(void *); +int m1x7_statintr(void *); + +#define PROF_RESET (IPL_CLOCK | PCC2_IRQ_IEN | PCC2_IRQ_ICLR) +#define STAT_RESET (IPL_CLOCK | PCC2_IRQ_IEN | PCC2_IRQ_ICLR) + +void +m1x7_init_clocks(void) +{ + int statint, minint; + +#ifdef DIAGNOSTIC + if (1000000 % hz) { + printf("cannot get %d Hz clock; using 100 Hz\n", hz); + hz = 100; + } +#endif + tick = 1000000 / hz; + + /* profclock */ + *(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T1CTL) = 0; + *(volatile u_int32_t *)(OBIO_START + PCC2_BASE + PCCTWO_T1CMP) = + pcc2_timer_us2lim(tick); + *(volatile u_int32_t *)(OBIO_START + PCC2_BASE + PCCTWO_T1COUNT) = 0; + *(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T1CTL) = + PCC2_TCTL_CEN | PCC2_TCTL_COC | PCC2_TCTL_COVF; + *(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T1ICR) = + PROF_RESET; + + if (stathz == 0) + stathz = hz; +#ifdef DIAGNOSTIC + if (1000000 % stathz) { + printf("cannot get %d Hz statclock; using 100 Hz\n", stathz); + stathz = 100; + } +#endif + profhz = stathz; /* always */ + + statint = 1000000 / stathz; + minint = statint / 2 + 100; + while (statvar > minint) + statvar >>= 1; + + /* statclock */ + *(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2CTL) = 0; + *(volatile u_int32_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2CMP) = + pcc2_timer_us2lim(statint); + *(volatile u_int32_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2COUNT) = 0; + *(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2CTL) = + PCC2_TCTL_CEN | PCC2_TCTL_COC | PCC2_TCTL_COVF; + *(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2ICR) = + STAT_RESET; + + statmin = statint - (statvar >> 1); + + clock_ih.ih_fn = m1x7_clockintr; + clock_ih.ih_arg = 0; + clock_ih.ih_wantframe = 1; + clock_ih.ih_ipl = IPL_CLOCK; + pcctwointr_establish(PCC2V_TIMER1, &clock_ih, "clock"); + + statclock_ih.ih_fn = m1x7_statintr; + statclock_ih.ih_arg = 0; + statclock_ih.ih_wantframe = 1; + statclock_ih.ih_ipl = IPL_CLOCK; + pcctwointr_establish(PCC2V_TIMER2, &statclock_ih, "stat"); +} + +#include "bugtty.h" +#if NBUGTTY > 0 +#include <mvme88k/dev/bugttyfunc.h> +#endif + +/* + * clockintr: ack intr and call hardclock + */ +int +m1x7_clockintr(void *eframe) +{ + *(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T1ICR) = + PROF_RESET; + + hardclock(eframe); +#if NBUGTTY > 0 + bugtty_chkinput(); +#endif /* NBUGTTY */ + + return (1); +} + +int +m1x7_statintr(void *eframe) +{ + u_long newint, r, var; + + *(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2ICR) = + STAT_RESET; + + statclock((struct clockframe *)eframe); + + /* + * Compute new randomized interval. The intervals are uniformly + * distributed on [statint - statvar / 2, statint + statvar / 2], + * and therefore have mean statint, giving a stathz frequency clock. + */ + var = statvar; + do { + r = random() & (var - 1); + } while (r == 0); + newint = statmin + r; + + *(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2CTL) = 0; + *(volatile u_int32_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2CMP) = + pcc2_timer_us2lim(newint); + *(volatile u_int32_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2COUNT) = 0; + *(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2ICR) = + STAT_RESET; + *(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2CTL) = + PCC2_TCTL_CEN | PCC2_TCTL_COC; + return (1); +} diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c index 05cbfbb57d1..728a6f690e5 100644 --- a/sys/arch/mvme88k/mvme88k/machdep.c +++ b/sys/arch/mvme88k/mvme88k/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.178 2006/04/15 15:43:36 miod Exp $ */ +/* $OpenBSD: machdep.c,v 1.179 2006/04/19 22:09:40 miod Exp $ */ /* * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -993,6 +993,12 @@ mvme_bootstrap() brdtyp = brdid.model; /* + * Use the BUG as console for now. After autoconf, we'll switch to + * real hardware. + */ + cn_tab = &bootcons; + + /* * Set up interrupt and fp exception handlers based on the machine. */ switch (brdtyp) { @@ -1016,12 +1022,6 @@ mvme_bootstrap() panic("Sorry, this kernel does not support MVME%x", brdtyp); } - /* - * Use the BUG as console for now. After autoconf, we'll switch to - * real hardware. - */ - cn_tab = &bootcons; - uvmexp.pagesize = PAGE_SIZE; uvm_setpagesize(); first_addr = round_page(first_addr); |