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

Commit 750f7706 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull watchdog updates from Wim Van Sebroeck:
 - Removal of the Documentation/watchdog/00-INDEX file
 - Fix boot status reporting for imx2_wdt
 - clean-up sp805_wdt, pnx4008_wdt and mpcore_wdt
 - convert printk in watchdog drivers to pr_ functions
 - change nowayout module parameter to bool for every watchdog device
 - conversion of jz4740_wdt, pnx4008_wdt, max63xx_wdt, softdog,
   ep93xx_wdt, coh901327 and txx9wdt to new watchdog API
 - Add support for the WDIOC_GETTIMELEFT ioctl call to the new watchdog
   API
 - Change the new watchdog API so that the driver updates the timeout
   value
 - two fixes for the xen_wdt driver

Fix up conflicts in ep93xx driver due to the same patches being merged
through separate branches.

* git://www.linux-watchdog.org/linux-watchdog: (33 commits)
  watchdog: txx9wdt: fix timeout
  watchdog: Convert txx9wdt driver to watchdog framework
  watchdog: coh901327_wdt.c: fix timeout
  watchdog: coh901327: convert to use watchdog core
  watchdog: Add support for WDIOC_GETTIMELEFT IOCTL in watchdog core
  watchdog: ep93xx_wdt: timeout is an unsigned int value.
  watchdog: ep93xx_wdt: Fix timeout after conversion to watchdog core
  watchdog: Convert ep93xx driver to watchdog core
  watchdog: sp805: Use devm routines
  watchdog: sp805: replace readl/writel with lighter _relaxed variants
  watchdog: sp805: Fix documentation style comment
  watchdog: mpcore_wdt: Allow platform_get_irq() to fail
  watchdog: mpcore_wdt: Use devm routines
  watchdog: mpcore_wdt: Rename dev to pdev for pointing to struct platform_device
  watchdog: xen: don't clear is_active when xen_wdt_stop() failed
  watchdog: xen: don't unconditionally enable the watchdog during resume
  watchdog: fix compiler error for missing parenthesis
  watchdog: ep93xx_wdt.c: fix platform probe
  watchdog: ep93xx: Convert the watchdog driver into a platform device.
  watchdog: fix set_timeout operations
  ...
parents 89e5d6f0 b92c803e

Documentation/watchdog/00-INDEX

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
00-INDEX

	- this file.

convert_drivers_to_kernel_api.txt

	- how-to for converting old watchdog drivers to the new kernel API.

hpwdt.txt

	- information on the HP iLO2 NMI watchdog

pcwd-watchdog.txt

	- documentation for Berkshire Products PC Watchdog ISA cards.

src/

	- directory holding watchdog related example programs.

watchdog-api.txt

	- description of the Linux Watchdog driver API.

watchdog-kernel-api.txt

	- description of the Linux WatchDog Timer Driver Core kernel API.

watchdog-parameters.txt

	- information on driver parameters (for drivers other than

	  the ones that have driver-specific files here)

wdt.txt

	- description of the Watchdog Timer Interfaces for Linux.

Documentation/watchdog/convert_drivers_to_kernel_api.txt

+4 −0
Original line number Diff line number Diff line
@@ -59,6 +59,10 @@ Here is a overview of the functions and probably needed actions: 
	WDIOC_GETTIMEOUT:

		No preparations needed



	WDIOC_GETTIMELEFT:

		It needs get_timeleft() callback to be defined. Otherwise it

		will return EOPNOTSUPP



  Other IOCTLs can be served using the ioctl-callback. Note that this is mainly

  intended for porting old drivers; new drivers should not invent private IOCTLs.

  Private IOCTLs are processed first. When the callback returns with

Documentation/watchdog/watchdog-kernel-api.txt

+7 −4
Original line number Diff line number Diff line 
The Linux WatchDog Timer Driver Core kernel API.

===============================================

Last reviewed: 29-Nov-2011

Last reviewed: 16-Mar-2012



Wim Van Sebroeck <wim@iguana.be>
@@ -77,6 +77,7 @@ struct watchdog_ops { 
	int (*ping)(struct watchdog_device *);

	unsigned int (*status)(struct watchdog_device *);

	int (*set_timeout)(struct watchdog_device *, unsigned int);

	unsigned int (*get_timeleft)(struct watchdog_device *);

	long (*ioctl)(struct watchdog_device *, unsigned int, unsigned long);

};
@@ -117,11 +118,13 @@ they are supported. These optional routines/operations are: 
  status of the device is reported with watchdog WDIOF_* status flags/bits.

* set_timeout: this routine checks and changes the timeout of the watchdog

  timer device. It returns 0 on success, -EINVAL for "parameter out of range"

  and -EIO for "could not write value to the watchdog". On success the timeout

  value of the watchdog_device will be changed to the value that was just used

  to re-program the watchdog timer device.

  and -EIO for "could not write value to the watchdog". On success this

  routine should set the timeout value of the watchdog_device to the

  achieved timeout value (which may be different from the requested one

  because the watchdog does not necessarily has a 1 second resolution).

  (Note: the WDIOF_SETTIMEOUT needs to be set in the options field of the

  watchdog's info structure).

* get_timeleft: this routines returns the time that's left before a reset.

* ioctl: if this routine is present then it will be called first before we do

  our own internal ioctl call handling. This routine should return -ENOIOCTLCMD

  if a command is not supported. The parameters that are passed to the ioctl

drivers/char/ipmi/ipmi_watchdog.c

+2 −2
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ 
#endif



static DEFINE_MUTEX(ipmi_watchdog_mutex);

static int nowayout = WATCHDOG_NOWAYOUT;

static bool nowayout = WATCHDOG_NOWAYOUT;



static ipmi_user_t watchdog_user;

static int watchdog_ifnum;
@@ -320,7 +320,7 @@ module_param(start_now, int, 0444); 
MODULE_PARM_DESC(start_now, "Set to 1 to start the watchdog as"

		 "soon as the driver is loaded.");



module_param(nowayout, int, 0644);

module_param(nowayout, bool, 0644);

MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "

		 "(default=CONFIG_WATCHDOG_NOWAYOUT)");

drivers/hwmon/fschmd.c

+2 −2
Original line number Diff line number Diff line
@@ -53,8 +53,8 @@ 
static const unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END };



/* Insmod parameters */

static int nowayout = WATCHDOG_NOWAYOUT;

module_param(nowayout, int, 0);

static bool nowayout = WATCHDOG_NOWAYOUT;

module_param(nowayout, bool, 0);

MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="

	__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");