Index: sys/arm/allwinner/allwinner_machdep.c =================================================================== --- sys/arm/allwinner/allwinner_machdep.c +++ sys/arm/allwinner/allwinner_machdep.c @@ -50,7 +50,7 @@ #include -#include +#include #include #include "platform_if.h" @@ -117,7 +117,7 @@ void cpu_reset() { - a10wd_watchdog_reset(); + aw_wdog_watchdog_reset(); printf("Reset failed!\n"); while (1); } Index: sys/arm/allwinner/aw_wdog.h =================================================================== --- sys/arm/allwinner/aw_wdog.h +++ sys/arm/allwinner/aw_wdog.h @@ -29,7 +29,7 @@ #ifndef __A10_WDOG_H__ #define __A10_WDOG_H__ -void a10wd_watchdog_reset(void); +void aw_wdog_watchdog_reset(void); #endif /*__A10_WDOG_H__*/ Index: sys/arm/allwinner/aw_wdog.c =================================================================== --- sys/arm/allwinner/aw_wdog.c +++ sys/arm/allwinner/aw_wdog.c @@ -1,5 +1,6 @@ /*- * Copyright (c) 2013 Oleksandr Tymoshenko + * Copyright (c) 2016 Emmanuel Vadot * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -45,24 +46,29 @@ #include #include -#include +#include #define READ(_sc, _r) bus_read_4((_sc)->res, (_r)) #define WRITE(_sc, _r, _v) bus_write_4((_sc)->res, (_r), (_v)) -#define WDOG_CTRL 0x00 +#define A10_WDOG_CTRL 0x00 +#define A31_WDOG_CTRL 0x10 #define WDOG_CTRL_RESTART (1 << 0) -#define WDOG_MODE 0x04 -#define WDOG_MODE_INTVL_SHIFT 3 -#define WDOG_MODE_RST_EN (1 << 1) +#define A10_WDOG_MODE 0x04 +#define A31_WDOG_MODE 0x18 +#define A10_WDOG_MODE_INTVL_SHIFT 3 +#define A31_WDOG_MODE_INTVL_SHIFT 4 +#define A10_WDOG_MODE_RST_EN (1 << 1) #define WDOG_MODE_EN (1 << 0) +#define A31_WDOG_CONFIG 0x14 +#define A31_WDOG_CONFIG_RST_EN (1 << 0) -struct a10wd_interval { +struct aw_wdog_interval { uint64_t milliseconds; unsigned int value; }; -struct a10wd_interval wd_intervals[] = { +struct aw_wdog_interval wd_intervals[] = { { 500, 0 }, { 1000, 1 }, { 2000, 2 }, @@ -78,38 +84,51 @@ { 0, 0 } /* sentinel */ }; -static struct a10wd_softc *a10wd_sc = NULL; +static struct aw_wdog_softc *aw_wdog_sc = NULL; -struct a10wd_softc { +struct aw_wdog_softc { device_t dev; struct resource * res; struct mtx mtx; + int a10; + uint8_t wdog_ctrl; + uint8_t wdog_mode; + uint8_t wdog_mode_intvl_shift; + uint8_t wdog_mode_en; + uint8_t wdog_config; + uint8_t wdog_config_value; }; -static void a10wd_watchdog_fn(void *private, u_int cmd, int *error); +static void aw_wdog_watchdog_fn(void *private, u_int cmd, int *error); static int -a10wd_probe(device_t dev) +aw_wdog_probe(device_t dev) { + struct aw_wdog_softc *sc; + + sc = device_get_softc(dev); if (!ofw_bus_status_okay(dev)) return (ENXIO); - if (ofw_bus_is_compatible(dev, "allwinner,sun4i-a10-wdt")) { + sc->a10 = 1; device_set_desc(dev, "Allwinner A10 Watchdog"); return (BUS_PROBE_DEFAULT); } - + if (ofw_bus_is_compatible(dev, "allwinner,sun6i-a31-wdt")) { + device_set_desc(dev, "Allwinner A31 Watchdog"); + return (BUS_PROBE_DEFAULT); + } return (ENXIO); } static int -a10wd_attach(device_t dev) +aw_wdog_attach(device_t dev) { - struct a10wd_softc *sc; + struct aw_wdog_softc *sc; int rid; - if (a10wd_sc != NULL) + if (aw_wdog_sc != NULL) return (ENXIO); sc = device_get_softc(dev); @@ -122,17 +141,31 @@ return (ENXIO); } - a10wd_sc = sc; - mtx_init(&sc->mtx, "A10 Watchdog", "a10wd", MTX_DEF); - EVENTHANDLER_REGISTER(watchdog_list, a10wd_watchdog_fn, sc, 0); + aw_wdog_sc = sc; + mtx_init(&sc->mtx, "A10 Watchdog", "aw_wdog", MTX_DEF); + EVENTHANDLER_REGISTER(watchdog_list, aw_wdog_watchdog_fn, sc, 0); + + if (sc->a10) { + sc->wdog_ctrl = A10_WDOG_CTRL; + sc->wdog_mode = A10_WDOG_MODE; + sc->wdog_mode_intvl_shift = A10_WDOG_MODE_INTVL_SHIFT; + sc->wdog_mode_en = A10_WDOG_MODE_RST_EN | WDOG_MODE_EN; + } else { + sc->wdog_ctrl = A31_WDOG_CTRL; + sc->wdog_mode = A31_WDOG_MODE; + sc->wdog_mode_intvl_shift = A31_WDOG_MODE_INTVL_SHIFT; + sc->wdog_mode_en = WDOG_MODE_EN; + sc->wdog_config = A31_WDOG_CONFIG; + sc->wdog_config_value = A31_WDOG_CONFIG_RST_EN; + } return (0); } static void -a10wd_watchdog_fn(void *private, u_int cmd, int *error) +aw_wdog_watchdog_fn(void *private, u_int cmd, int *error) { - struct a10wd_softc *sc; + struct aw_wdog_softc *sc; uint64_t ms; int i; @@ -148,10 +181,12 @@ (ms > wd_intervals[i].milliseconds)) i++; if (wd_intervals[i].milliseconds) { - WRITE(sc, WDOG_MODE, - (wd_intervals[i].value << WDOG_MODE_INTVL_SHIFT) | - WDOG_MODE_EN | WDOG_MODE_RST_EN); - WRITE(sc, WDOG_CTRL, WDOG_CTRL_RESTART); + WRITE(sc, sc->wdog_mode, + (wd_intervals[i].value << sc->wdog_mode_intvl_shift) | + sc->wdog_mode_en); + WRITE(sc, sc->wdog_ctrl, WDOG_CTRL_RESTART); + if (sc->wdog_config) + WRITE(sc, sc->wdog_config, sc->wdog_config_value); *error = 0; } else { @@ -162,46 +197,48 @@ device_printf(sc->dev, "Can't arm, timeout is more than 16 sec\n"); mtx_unlock(&sc->mtx); - WRITE(sc, WDOG_MODE, 0); + WRITE(sc, sc->wdog_mode, 0); return; } } else - WRITE(sc, WDOG_MODE, 0); + WRITE(sc, sc->wdog_mode, 0); mtx_unlock(&sc->mtx); } void -a10wd_watchdog_reset() +aw_wdog_watchdog_reset() { - if (a10wd_sc == NULL) { + if (aw_wdog_sc == NULL) { printf("Reset: watchdog device has not been initialized\n"); return; } - WRITE(a10wd_sc, WDOG_MODE, - (wd_intervals[0].value << WDOG_MODE_INTVL_SHIFT) | - WDOG_MODE_EN | WDOG_MODE_RST_EN); - + WRITE(aw_wdog_sc, aw_wdog_sc->wdog_mode, + (wd_intervals[0].value << aw_wdog_sc->wdog_mode_intvl_shift) | + aw_wdog_sc->wdog_mode_en); + if (aw_wdog_sc->wdog_config) + WRITE(aw_wdog_sc, aw_wdog_sc->wdog_config, + aw_wdog_sc->wdog_config_value); while(1) ; } -static device_method_t a10wd_methods[] = { - DEVMETHOD(device_probe, a10wd_probe), - DEVMETHOD(device_attach, a10wd_attach), +static device_method_t aw_wdog_methods[] = { + DEVMETHOD(device_probe, aw_wdog_probe), + DEVMETHOD(device_attach, aw_wdog_attach), DEVMETHOD_END }; -static driver_t a10wd_driver = { - "a10wd", - a10wd_methods, - sizeof(struct a10wd_softc), +static driver_t aw_wdog_driver = { + "aw_wdog", + aw_wdog_methods, + sizeof(struct aw_wdog_softc), }; -static devclass_t a10wd_devclass; +static devclass_t aw_wdog_devclass; -DRIVER_MODULE(a10wd, simplebus, a10wd_driver, a10wd_devclass, 0, 0); +DRIVER_MODULE(aw_wdog, simplebus, aw_wdog_driver, aw_wdog_devclass, 0, 0); Index: sys/arm/allwinner/files.allwinner =================================================================== --- sys/arm/allwinner/files.allwinner +++ sys/arm/allwinner/files.allwinner @@ -10,7 +10,7 @@ arm/allwinner/a10_gpio.c optional gpio arm/allwinner/a10_mmc.c optional mmc arm/allwinner/a10_sramc.c standard -arm/allwinner/a10_wdog.c standard +arm/allwinner/aw_wdog.c standard arm/allwinner/a20/a20_cpu_cfg.c standard arm/allwinner/allwinner_machdep.c standard arm/allwinner/axp209.c optional axp209