XOR/mint0x33
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

watchdog: Revert "iTCO_wdt: all versions count down twice"

Browse source 
This reverts commit 1fccb73011.
Reported as Bug 196509 - iTCO_wdt regression reboot before timeout expire

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
Wim Van Sebroeck 2017-09-09 17:41:24 +02:00
parent 0e271fd59f
commit fc61e83a29
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Documentation/watchdog/watchdog-parameters.txt
View file

@ -117,7 +117,7 @@ nowayout: Watchdog cannot be stopped once started
------------------------------------------------- -------------------------------------------------
iTCO_wdt: iTCO_wdt:
heartbeat: Watchdog heartbeat in seconds. heartbeat: Watchdog heartbeat in seconds.
(5<=heartbeat<=74 (TCO v1) or 1226 (TCO v2), default=30) (2<heartbeat<39 (TCO v1) or 613 (TCO v2), default=30)
nowayout: Watchdog cannot be stopped once started nowayout: Watchdog cannot be stopped once started
(default=kernel config parameter) (default=kernel config parameter)
------------------------------------------------- -------------------------------------------------

18
drivers/watchdog/iTCO_wdt.c
View file

@ -306,15 +306,16 @@ static int iTCO_wdt_ping(struct watchdog_device *wd_dev)
iTCO_vendor_pre_keepalive(p->smi_res, wd_dev->timeout); iTCO_vendor_pre_keepalive(p->smi_res, wd_dev->timeout);
/* Reload the timer by writing to the TCO Timer Counter register */
if (p->iTCO_version >= 2) {
outw(0x01, TCO_RLD(p));
} else if (p->iTCO_version == 1) {
/* Reset the timeout status bit so that the timer /* Reset the timeout status bit so that the timer
* needs to count down twice again before rebooting */ * needs to count down twice again before rebooting */
outw(0x0008, TCO1_STS(p)); /* write 1 to clear bit */ outw(0x0008, TCO1_STS(p)); /* write 1 to clear bit */
/* Reload the timer by writing to the TCO Timer Counter register */
if (p->iTCO_version >= 2)
outw(0x01, TCO_RLD(p));
else if (p->iTCO_version == 1)
outb(0x01, TCO_RLD(p)); outb(0x01, TCO_RLD(p));
}
spin_unlock(&p->io_lock); spin_unlock(&p->io_lock);
return 0; return 0;
@ -327,8 +328,11 @@ static int iTCO_wdt_set_timeout(struct watchdog_device *wd_dev, unsigned int t)
unsigned char val8; unsigned char val8;
unsigned int tmrval; unsigned int tmrval;
/* The timer counts down twice before rebooting */ tmrval = seconds_to_ticks(p, t);
tmrval = seconds_to_ticks(p, t) / 2;
/* For TCO v1 the timer counts down twice before rebooting */
if (p->iTCO_version == 1)
tmrval /= 2;
/* from the specs: */ /* from the specs: */
/* "Values of 0h-3h are ignored and should not be attempted" */ /* "Values of 0h-3h are ignored and should not be attempted" */
@ -381,8 +385,6 @@ static unsigned int iTCO_wdt_get_timeleft(struct watchdog_device *wd_dev)
spin_lock(&p->io_lock); spin_lock(&p->io_lock);
val16 = inw(TCO_RLD(p)); val16 = inw(TCO_RLD(p));
val16 &= 0x3ff; val16 &= 0x3ff;
if (!(inw(TCO1_STS(p)) & 0x0008))
val16 += (inw(TCOv2_TMR(p)) & 0x3ff);
spin_unlock(&p->io_lock); spin_unlock(&p->io_lock);
time_left = ticks_to_seconds(p, val16); time_left = ticks_to_seconds(p, val16);