diff options
| author | ian <ian@FreeBSD.org> | 2014-12-27 04:51:21 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2014-12-27 04:51:21 +0000 |
| commit | 02a7e72b74f75d8811be3a70490fb55f159db4c5 (patch) | |
| tree | bf7b9abbf0519b90b13dd4082de761362bc6befe /sys/arm/broadcom | |
| parent | 2226c9830e5d72a114f95fd5cd670b0e81e4fe70 (diff) | |
| download | FreeBSD-src-02a7e72b74f75d8811be3a70490fb55f159db4c5.zip FreeBSD-src-02a7e72b74f75d8811be3a70490fb55f159db4c5.tar.gz | |
MFC r275660: Fix the watchdog timeout calculation to prevent wrap.
Diffstat (limited to 'sys/arm/broadcom')
| -rw-r--r-- | sys/arm/broadcom/bcm2835/bcm2835_wdog.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_wdog.c b/sys/arm/broadcom/bcm2835/bcm2835_wdog.c index 53ec234..58cb2c3 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_wdog.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_wdog.c @@ -142,14 +142,13 @@ bcmwd_watchdog_fn(void *private, u_int cmd, int *error) if (cmd > 0) { sec = ((uint64_t)1 << (cmd & WD_INTERVAL)) / 1000000000; - ticks = (sec << 16) & BCM2835_WDOG_TIME_MASK; - if (ticks == 0) { + if (sec == 0 || sec > 15) { /* * Can't arm * disable watchdog as watchdog(9) requires */ device_printf(sc->dev, - "Can't arm, timeout is less than 1 second\n"); + "Can't arm, timeout must be between 1-15 seconds\n"); WRITE(sc, BCM2835_RSTC_REG, (BCM2835_PASWORD << BCM2835_PASSWORD_SHIFT) | BCM2835_RSTC_RESET); @@ -157,6 +156,7 @@ bcmwd_watchdog_fn(void *private, u_int cmd, int *error) return; } + ticks = (sec << 16) & BCM2835_WDOG_TIME_MASK; reg = (BCM2835_PASWORD << BCM2835_PASSWORD_SHIFT) | ticks; WRITE(sc, BCM2835_WDOG_REG, reg); |
