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

Add support for AR5312 on-chip watchdog.

Browse Source 
While we're here, fix mainbus so that mainbus doesn't complain about
unconfigured devices, and use the *atheros* mainbus instead of alchemy (doh!)
This commit is contained in:
gdamore 2006-06-08 06:15:59 +00:00
parent 5ff5dfea17
commit 391d67720b
4 changed files with 200 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/arch/evbmips/atheros/mainbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mainbus.c,v 1.2 2006/04/07 04:56:00 gdamore Exp $ */
/* $NetBSD: mainbus.c,v 1.3 2006/06/08 06:15:59 gdamore Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.2 2006/04/07 04:56:00 gdamore Exp $");
__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.3 2006/06/08 06:15:59 gdamore Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -63,6 +63,7 @@ struct mainbusdev {
struct mainbusdev mainbusdevs[] = {
{ "cpu", },
{ "wdog", },
{ "arbus", },
{ NULL, }
};
@ -92,7 +93,7 @@ mainbus_attach(parent, self, aux)
printf("\n");
for (md = mainbusdevs; md->md_name != NULL; md++) {
config_found_ia(self, "mainbus", NULL, mainbus_print);
config_found_ia(self, "mainbus", md, mainbus_print);
}
}
@ -100,5 +101,5 @@ static int
mainbus_print(void *aux, const char *pnp)
{
return (UNCONF);
return (QUIET);
}

185
sys/arch/evbmips/atheros/wdog.c Normal file
View File

@ -0,0 +1,185 @@
/* $NetBSD: wdog.c,v 1.1 2006/06/08 06:15:59 gdamore Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
* Copyright (c) 2006 Garrett D'Amore.
* All rights reserved.
*
* Portions of this code were written by Garrett D'Amore for the
* Champaign-Urbana Community Wireless Network Project.
*
* 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. All advertising materials mentioning features or use of this
* software must display the following acknowledgements:
* This product includes software developed by the Urbana-Champaign
* Independent Media Center.
* This product includes software developed by Garrett D'Amore.
* 4. Urbana-Champaign Independent Media Center's name and Garrett
* D'Amore's name may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE URBANA-CHAMPAIGN INDEPENDENT
* MEDIA CENTER AND GARRETT D'AMORE ``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 URBANA-CHAMPAIGN INDEPENDENT
* MEDIA CENTER OR GARRETT D'AMORE 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) 2002 Wasabi Systems, Inc.
* All rights reserved.
*
* Written by Jason R. Thorpe and Simon Burge for Wasabi Systems, Inc.
*
* 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. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed for the NetBSD Project by
* Wasabi Systems, Inc.
* 4. The name of Wasabi Systems, Inc. may not be used to endorse
* or promote products derived from this software without specific prior
* written permission.
*
* THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``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 WASABI SYSTEMS, INC
* 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.
*/
/*
* Watchdog timer support for the AR5312.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wdog.c,v 1.1 2006/06/08 06:15:59 gdamore Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/wdog.h>
#include <machine/cpu.h>
#include <mips/atheros/include/ar531xreg.h>
#include <mips/atheros/include/ar531xvar.h>
#include <dev/sysmon/sysmonvar.h>
#ifndef WDOG_DEFAULT_PERIOD
#define WDOG_DEFAULT_PERIOD 5
#endif
static int wdog_match(struct device *, struct cfdata *, void *);
static void wdog_attach(struct device *, struct device *, void *);
static int wdog_tickle(struct sysmon_wdog *);
static int wdog_setmode(struct sysmon_wdog *);
struct wdog_softc {
struct device sc_dev;
struct sysmon_wdog sc_smw;
int sc_wdog_period;
int sc_wdog_max;
uint32_t sc_wdog_reload;
uint32_t sc_mult;
};
CFATTACH_DECL(wdog, sizeof(struct wdog_softc),
wdog_match, wdog_attach, NULL, NULL);
static int
wdog_match(struct device *parent, struct cfdata *cf, void *aux)
{
return (1);
}
static void
wdog_attach(struct device *parent, struct device *self, void *aux)
{
struct wdog_softc *sc = (void *)self;
sc->sc_mult = curcpu()->ci_cpu_freq / 4;
sc->sc_wdog_period = WDOG_DEFAULT_PERIOD;
sc->sc_wdog_max = 0xffffffffU / sc->sc_mult;
sc->sc_wdog_reload = sc->sc_wdog_period * sc->sc_mult;
printf(": %d second period\n", sc->sc_wdog_period);
sc->sc_smw.smw_name = sc->sc_dev.dv_xname;
sc->sc_smw.smw_cookie = sc;
sc->sc_smw.smw_setmode = wdog_setmode;
sc->sc_smw.smw_tickle = wdog_tickle;
sc->sc_smw.smw_period = sc->sc_wdog_period;
if (sysmon_wdog_register(&sc->sc_smw) != 0)
printf("%s: unable to register with sysmon\n",
sc->sc_dev.dv_xname);
}
static int
wdog_tickle(struct sysmon_wdog *smw)
{
struct wdog_softc *sc = smw->smw_cookie;
PUTSYSREG(AR531X_SYSREG_WDOG_TIMER, sc->sc_wdog_reload);
return (0);
}
static int
wdog_setmode(struct sysmon_wdog *smw)
{
struct wdog_softc *sc = smw->smw_cookie;
if ((smw->smw_mode & WDOG_MODE_MASK) == WDOG_MODE_DISARMED) {
PUTSYSREG(AR531X_SYSREG_WDOG_CTL, AR531X_WDOG_CTL_IGNORE);
PUTSYSREG(AR531X_SYSREG_WDOG_TIMER, 0);
} else {
if (smw->smw_period == WDOG_PERIOD_DEFAULT)
smw->smw_period = sc->sc_wdog_period;
else if (smw->smw_period != sc->sc_wdog_period) {
/*
* we can't set watchdog periods in excess of
* the processor maximum.
*/
if (smw->smw_period > sc->sc_wdog_max) {
return EOPNOTSUPP;
}
sc->sc_wdog_period = smw->smw_period;
sc->sc_wdog_reload = sc->sc_wdog_period * sc->sc_mult;
}
PUTSYSREG(AR531X_SYSREG_WDOG_TIMER, sc->sc_wdog_reload);
PUTSYSREG(AR531X_SYSREG_WDOG_CTL, AR531X_WDOG_CTL_RESET);
}
return (0);
}

7
sys/arch/evbmips/conf/AP30
View File

@ -1,10 +1,10 @@
# $NetBSD: AP30,v 1.1 2006/06/06 05:17:22 gdamore Exp $
# $NetBSD: AP30,v 1.2 2006/06/08 06:15:59 gdamore Exp $
include "arch/evbmips/conf/std.atheros"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "AP30-$Revision: 1.1 $"
#ident "AP30-$Revision: 1.2 $"
maxusers 32
@ -136,6 +136,7 @@ config netbsd root on ? type ?
mainbus0 at root
cpu0 at mainbus?
wdog0 at mainbus?
arbus0 at mainbus?
com* at arbus? addr ?
@ -172,7 +173,7 @@ ukphy* at mii? phy ? # generic unknown PHYs
#pseudo-device ccd 4 # concatenated disk devices
#pseudo-device raid 4 # RAIDframe disk driver
#pseudo-device fss 4 # file system snapshot device
pseudo-device md 1 # memory disk device (ramdisk)
#pseudo-device md 1 # memory disk device (ramdisk)
#pseudo-device vnd # disk-like interface to files
# Network pseudo-devices

8
sys/arch/evbmips/conf/files.atheros
View File

@ -1,4 +1,4 @@
# $NetBSD: files.atheros,v 1.2 2006/03/28 03:43:57 gdamore Exp $
# $NetBSD: files.atheros,v 1.3 2006/06/08 06:15:59 gdamore Exp $
file arch/evbmips/atheros/mach_intr.c
@ -16,12 +16,16 @@ file arch/mips/mips/softintr.c
# System bus
device mainbus { }
attach mainbus at root
file arch/evbmips/alchemy/mainbus.c mainbus
file arch/evbmips/atheros/mainbus.c mainbus
device cpu
attach cpu at mainbus
file arch/evbmips/atheros/cpu.c cpu
device wdog: sysmon_wdog
attach wdog at mainbus
file arch/evbmips/atheros/wdog.c wdog
# Machine-independent WS console drivers
#include "dev/wsfont/files.wsfont"
#include "dev/wscons/files.wscons"