Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Assign memory controller-dependent watchdog reset functions to

Browse Source 
platform.watchdog_reset.
This commit is contained in:
sekiya 2004-01-13 14:31:37 +00:00
parent 986c9703a5
commit 58a060c797
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/arch/sgimips/dev/crime.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: crime.c,v 1.15 2004/01/12 03:30:51 sekiya Exp $ */
/* $NetBSD: crime.c,v 1.16 2004/01/13 14:31:37 sekiya Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: crime.c,v 1.15 2004/01/12 03:30:51 sekiya Exp $");
__KERNEL_RCSID(0, "$NetBSD: crime.c,v 1.16 2004/01/13 14:31:37 sekiya Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -49,6 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: crime.c,v 1.15 2004/01/12 03:30:51 sekiya Exp $");
#include <machine/bus.h>
#include <machine/intr.h>
#include <machine/machtype.h>
#include <machine/sysconf.h>
#include <sgimips/dev/crimevar.h>
#include <sgimips/dev/crimereg.h>
@ -57,6 +58,7 @@ __KERNEL_RCSID(0, "$NetBSD: crime.c,v 1.15 2004/01/12 03:30:51 sekiya Exp $");
static int crime_match(struct device *, struct cfdata *, void *);
static void crime_attach(struct device *, struct device *, void *);
void crime_watchdog_tickle(void);
struct crime_softc *crime_sc; /* only one per machine, okay to be global */
@ -145,6 +147,8 @@ crime_attach(parent, self, aux)
bus_space_write_8(sc->iot, sc->ioh, CRIME_INTSTAT, 0);
bus_space_write_8(sc->iot, sc->ioh, CRIME_SOFTINT, 0);
bus_space_write_8(sc->iot, sc->ioh, CRIME_HARDINT, 0);
platform.watchdog_reset = crime_watchdog_tickle;
}
/*
@ -191,3 +195,13 @@ crime_intr_mask(unsigned int intr)
mask |= (1 << intr);
bus_space_write_8(crime_sc->iot, crime_sc->ioh, CRIME_INTMASK, mask);
}
void
crime_watchdog_tickle(void)
{
/* enable watchdog timer, clear it */
bus_space_write_8(crime_sc->iot, crime_sc->ioh,
CRIME_CONTROL, CRIME_CONTROL_DOG_ENABLE);
bus_space_write_8(crime_sc->iot, crime_sc->ioh, CRIME_WATCHDOG, 0);
}

5
sys/arch/sgimips/dev/imc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: imc.c,v 1.12 2004/01/13 13:05:17 sekiya Exp $ */
/* $NetBSD: imc.c,v 1.13 2004/01/13 14:31:37 sekiya Exp $ */
/*
* Copyright (c) 2001 Rafal K. Boni
@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: imc.c,v 1.12 2004/01/13 13:05:17 sekiya Exp $");
__KERNEL_RCSID(0, "$NetBSD: imc.c,v 1.13 2004/01/13 14:31:37 sekiya Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -110,6 +110,7 @@ imc_attach(parent, self, aux)
panic("imc_attach: could not allocate memory\n");
platform.bus_reset = imc_bus_reset;
platform.watchdog_reset = imc_watchdog_tickle;
sysid = bus_space_read_4(isc.iot, isc.ioh, IMC_SYSID);

3
sys/arch/sgimips/dev/pic.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pic.c,v 1.2 2004/01/13 13:05:17 sekiya Exp $ */
/* $NetBSD: pic.c,v 1.3 2004/01/13 14:31:37 sekiya Exp $ */
/*
* Copyright (c) 2002 Steve Rumble
@ -95,6 +95,7 @@ pic_attach(struct device * parent, struct device * self, void *aux)
panic("pic_attach: could not allocate memory\n");
platform.bus_reset = pic_bus_reset;
platform.watchdog_reset = pic_watchdog_tickle;
reg = bus_space_read_4(psc.iot, psc.ioh, PIC_SYSID);
reg = (reg >> PIC_SYSID_REVSHIFT) & PIC_SYSID_REVMASK;