Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec53c027 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://www.linux-watchdog.org/linux-watchdog 

Pull watchdog fixes from Wim Van Sebroeck:
 - orion_wdt compile-test dependencies
 - sama5d4_wdt: WDDIS handling and a race confition
 - pcwd_usb: fix NULL-deref at probe
 - cadence_wdt: fix timeout setting
 - wdt_pci: fix build error if SOFTWARE_REBOOT is defined
 - iTCO_wdt: all versions count down twice
 - zx2967: remove redundant dev_err call in zx2967_wdt_probe()
 - bcm281xx: Fix use of uninitialized spinlock

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: bcm281xx: Fix use of uninitialized spinlock.
  watchdog: zx2967: remove redundant dev_err call in zx2967_wdt_probe()
  iTCO_wdt: all versions count down twice
  watchdog: wdt_pci: fix build error if define SOFTWARE_REBOOT
  watchdog: cadence_wdt: fix timeout setting
  watchdog: pcwd_usb: fix NULL-deref at probe
  watchdog: sama5d4: fix race condition
  watchdog: sama5d4: fix WDDIS handling
  watchdog: orion: fix compile-test dependencies
parents cf80a6fb fedf266f

Documentation/watchdog/watchdog-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ nowayout: Watchdog cannot be stopped once started 
-------------------------------------------------

iTCO_wdt:

heartbeat: Watchdog heartbeat in seconds.

	(2<heartbeat<39 (TCO v1) or 613 (TCO v2), default=30)

	(5<=heartbeat<=74 (TCO v1) or 1226 (TCO v2), default=30)

nowayout: Watchdog cannot be stopped once started

	(default=kernel config parameter)

-------------------------------------------------

drivers/watchdog/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ config DAVINCI_WATCHDOG 


config ORION_WATCHDOG

	tristate "Orion watchdog"

	depends on ARCH_ORION5X || ARCH_DOVE || MACH_DOVE || ARCH_MVEBU || COMPILE_TEST

	depends on ARCH_ORION5X || ARCH_DOVE || MACH_DOVE || ARCH_MVEBU || (COMPILE_TEST && !ARCH_EBSA110)

	depends on ARM

	select WATCHDOG_CORE

	help

drivers/watchdog/bcm_kona_wdt.c

+2 −1
Original line number Diff line number Diff line
@@ -304,6 +304,8 @@ static int bcm_kona_wdt_probe(struct platform_device *pdev) 
	if (!wdt)

		return -ENOMEM;



	spin_lock_init(&wdt->lock);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	wdt->base = devm_ioremap_resource(dev, res);

	if (IS_ERR(wdt->base))
@@ -316,7 +318,6 @@ static int bcm_kona_wdt_probe(struct platform_device *pdev) 
		return ret;

	}



	spin_lock_init(&wdt->lock);

	platform_set_drvdata(pdev, wdt);

	watchdog_set_drvdata(&bcm_kona_wdt_wdd, wdt);

	bcm_kona_wdt_wdd.parent = &pdev->dev;

drivers/watchdog/cadence_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
/* Counter maximum value */

#define CDNS_WDT_COUNTER_MAX 0xFFF



static int wdt_timeout = CDNS_WDT_DEFAULT_TIMEOUT;

static int wdt_timeout;

static int nowayout = WATCHDOG_NOWAYOUT;



module_param(wdt_timeout, int, 0);

drivers/watchdog/iTCO_wdt.c

+10 −12
Original line number Diff line number Diff line
@@ -306,16 +306,15 @@ static int iTCO_wdt_ping(struct watchdog_device *wd_dev) 


	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

	 * needs to count down twice again before rebooting */

	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));

	}



	spin_unlock(&p->io_lock);

	return 0;
@@ -328,11 +327,8 @@ static int iTCO_wdt_set_timeout(struct watchdog_device *wd_dev, unsigned int t) 
	unsigned char val8;

	unsigned int tmrval;



	tmrval = seconds_to_ticks(p, t);



	/* For TCO v1 the timer counts down twice before rebooting */

	if (p->iTCO_version == 1)

		tmrval /= 2;

	/* The timer counts down twice before rebooting */

	tmrval = seconds_to_ticks(p, t) / 2;



	/* from the specs: */

	/* "Values of 0h-3h are ignored and should not be attempted" */
@@ -385,6 +381,8 @@ static unsigned int iTCO_wdt_get_timeleft(struct watchdog_device *wd_dev) 
		spin_lock(&p->io_lock);

		val16 = inw(TCO_RLD(p));

		val16 &= 0x3ff;

		if (!(inw(TCO1_STS(p)) & 0x0008))

			val16 += (inw(TCOv2_TMR(p)) & 0x3ff);

		spin_unlock(&p->io_lock);



		time_left = ticks_to_seconds(p, val16);