d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extend the AR71XX watchdog debugging and data.

Browse Source 
* Add some per-device sysctl entries which record the watchdog state -
  whether it is armed; whether the last reboot was due to the watchdog.
* Add a per-device sysctl debug flag to enable logging watchdog arming/
  disarming.

Reviewed by:	gonzo@
This commit is contained in:
Adrian Chadd 2010-06-19 12:12:39 +00:00
parent 49e10f5e38
commit 7bc1af9566
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=209338
1 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
sys/mips/atheros/ar71xx_wdog.c
View File

@ -38,12 +38,15 @@ __FBSDID("$FreeBSD$");
#include <sys/bus.h> #include <sys/bus.h>
#include <sys/kernel.h> #include <sys/kernel.h>
#include <sys/module.h> #include <sys/module.h>
#include <sys/sysctl.h>
#include <mips/atheros/ar71xxreg.h> #include <mips/atheros/ar71xxreg.h>
struct ar71xx_wdog_softc { struct ar71xx_wdog_softc {
device_t dev; device_t dev;
int armed; int armed;
int reboot_from_watchdog;
int debug;
}; };
static void static void
@ -53,9 +56,13 @@ ar71xx_wdog_watchdog_fn(void *private, u_int cmd, int *error)
uint64_t timer_val; uint64_t timer_val;
cmd &= WD_INTERVAL; cmd &= WD_INTERVAL;
if (sc->debug)
device_printf(sc->dev, "ar71xx_wdog_watchdog_fn: cmd: %x\n", cmd);
if (cmd > 0) { if (cmd > 0) {
timer_val = (uint64_t)(1ULL << cmd) * ar71xx_ahb_freq() / timer_val = (uint64_t)(1ULL << cmd) * ar71xx_ahb_freq() /
1000000000; 1000000000;
if (sc->debug)
device_printf(sc->dev, "ar71xx_wdog_watchdog_fn: programming timer: %jx\n", (uintmax_t) timer_val);
/* /*
* Load timer with large enough value to prevent spurious * Load timer with large enough value to prevent spurious
* reset * reset
@ -69,6 +76,8 @@ ar71xx_wdog_watchdog_fn(void *private, u_int cmd, int *error)
sc->armed = 1; sc->armed = 1;
*error = 0; *error = 0;
} else { } else {
if (sc->debug)
device_printf(sc->dev, "ar71xx_wdog_watchdog_fn: disarming\n");
if (sc->armed) { if (sc->armed) {
ATH_WRITE_REG(AR71XX_RST_WDOG_CONTROL, ATH_WRITE_REG(AR71XX_RST_WDOG_CONTROL,
RST_WDOG_ACTION_NOACTION); RST_WDOG_ACTION_NOACTION);
@ -85,19 +94,47 @@ ar71xx_wdog_probe(device_t dev)
return (0); return (0);
} }
static void
ar71xx_wdog_sysctl(device_t dev)
{
struct ar71xx_wdog_softc *sc = device_get_softc(dev);
struct sysctl_ctx_list *ctx = device_get_sysctl_ctx(sc->dev);
struct sysctl_oid *tree = device_get_sysctl_tree(sc->dev);
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
"debug", CTLFLAG_RW, &sc->debug, 0,
"enable watchdog debugging");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
"armed", CTLFLAG_RD, &sc->armed, 0,
"whether the watchdog is armed");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
"reboot_from_watchdog", CTLFLAG_RD, &sc->reboot_from_watchdog, 0,
"whether the system rebooted from the watchdog");
}
static int static int
ar71xx_wdog_attach(device_t dev) ar71xx_wdog_attach(device_t dev)
{ {
struct ar71xx_wdog_softc *sc = device_get_softc(dev); struct ar71xx_wdog_softc *sc = device_get_softc(dev);
if (ATH_READ_REG(AR71XX_RST_WDOG_CONTROL) & RST_WDOG_LAST) /* Initialise */
sc->reboot_from_watchdog = 0;
sc->armed = 0;
sc->debug = 0;
if (ATH_READ_REG(AR71XX_RST_WDOG_CONTROL) & RST_WDOG_LAST) {
device_printf (dev, device_printf (dev,
"Previous reset was due to watchdog timeout\n"); "Previous reset was due to watchdog timeout\n");
sc->reboot_from_watchdog = 1;
}
ATH_WRITE_REG(AR71XX_RST_WDOG_CONTROL, RST_WDOG_ACTION_NOACTION); ATH_WRITE_REG(AR71XX_RST_WDOG_CONTROL, RST_WDOG_ACTION_NOACTION);
sc->dev = dev; sc->dev = dev;
EVENTHANDLER_REGISTER(watchdog_list, ar71xx_wdog_watchdog_fn, sc, 0); EVENTHANDLER_REGISTER(watchdog_list, ar71xx_wdog_watchdog_fn, sc, 0);
ar71xx_wdog_sysctl(dev);
return (0); return (0);
} }