Skip to contentSkip to conversation

watchdog - v3.16 merge window

GIT PULL Wim Van Sebroeck 2 participants 2 messages Jun 10, 2014 – Jun 11, 2014

Subsystems (9)
lore
Share & tools
lore
#0 lore raw

Hi Linus,

Please pull from 'master' branch of
git://www.linux-watchdog.org/linux-watchdog.git

It contains:
* Addition of the Intel MID watchdog
* Removal of W83697HF and W83697UG drivers (code was merged into w83627hf_wdt driver)
* Addition of Armada 375/380 SoC support
* Conversion of imx2_wdt to regmap API and to watchdog core API
* lots of other small improvements and fixes

This will update the following files:

 b/Documentation/devicetree/bindings/watchdog/marvel.txt  |    7 
 b/arch/powerpc/kernel/setup-common.c                     |   27 
 b/arch/x86/platform/intel-mid/device_libs/Makefile       |    1 
 b/arch/x86/platform/intel-mid/device_libs/platform_wdt.c |   72 ++
 b/drivers/watchdog/Kconfig                               |   49 -
 b/drivers/watchdog/Makefile                              |    3 
 b/drivers/watchdog/ath79_wdt.c                           |   16 
 b/drivers/watchdog/booke_wdt.c                           |   51 +
 b/drivers/watchdog/imx2_wdt.c                            |  320 ++++------
 b/drivers/watchdog/intel-mid_wdt.c                       |  184 ++++++
 b/drivers/watchdog/kempld_wdt.c                          |    2 
 b/drivers/watchdog/of_xilinx_wdt.c                       |    2 
 b/drivers/watchdog/orion_wdt.c                           |  213 ++++++
 b/drivers/watchdog/shwdt.c                               |    2 
 b/drivers/watchdog/sp805_wdt.c                           |    4 
 b/drivers/watchdog/sunxi_wdt.c                           |   22 
 b/drivers/watchdog/via_wdt.c                             |    2 
 b/drivers/watchdog/w83627hf_wdt.c                        |   15 
 b/include/linux/platform_data/intel-mid_wdt.h            |   22 
 drivers/watchdog/w83697hf_wdt.c                          |  460 ---------------
 drivers/watchdog/w83697ug_wdt.c                          |  397 ------------
 21 files changed, 710 insertions(+), 1161 deletions(-)

with these Changes:

commit 78a3bb9e408be6aadcd4a609d14a05038f2a132a

Author: David Cohen <[email protected]>
Date:   Tue Apr 15 15:20:32 2014 -0700

x86: intel-mid: add watchdog platform code for Merrifield

This patch adds platform code for Intel Merrifield.
Since the watchdog is not part of SFI table, we have no other option but to manually register watchdog's platform device (argh!).

commit 87a1ef8058d9ab26bc289ea4f27bc3c11ce9acb8

Author: David Cohen <[email protected]>
Date:   Tue Apr 15 13:06:05 2014 -0700

watchdog: add Intel MID watchdog driver support

Add initial Intel MID watchdog driver support.

This driver is an initial implementation of generic Intel MID watchdog driver. Currently it supports Intel Merrifield platform.

commit 938626d96a3ffb9eb54552bb0d3a4f2b30ffdeb0

Author: Viresh Kumar <[email protected]>
Date:   Thu May 15 10:01:59 2014 +0530

watchdog: sp805: Set watchdog_device->timeout from ->set_timeout()

Implementation of ->set_timeout() is supposed to set 'timeout' field of 'struct watchdog_device' passed to it. sp805 was rather setting this in a local variable. Fix it.

commit d2deebabaeedccf7cee943c1f7f6fdb44afd4e3d

Author: Tang Yuantian <[email protected]>
Date:   Thu May 8 10:04:26 2014 +0800

booke/watchdog: refine and clean up the codes

Basically, this patch does the following:
1. Move the codes of parsing boot parameters from setup-common.c to driver. In this way, code reader can know directly that there are boot parameters that can change the timeout.
2. Make boot parameter 'booke_wdt_period' effective. currently, when driver is loaded, default timeout is always being used in stead of booke_wdt_period.
3. Wrap up the watchdog timeout in device struct and clean up unnecessary codes.

commit ec2e32ca661e7f2fe6c23efe202013f6ab5bf021

Author: Arnd Bergmann <[email protected]>
Date:   Thu May 8 16:56:19 2014 +0200

watchdog: iop_wdt only builds for mach-iop13xx

All three iop variants we support in Linux (iop32x, iop33x and iop13xx) seem to have support for the watchdog hardware, but this driver fails to build for the first two of these because it uses the IOP13XX_WDTCR_IB_RESET macro that is only defined for iop13xx.

This clarifies the dependency in Kconfig to avoid randconfig build errors. It is unlikely that anyone will ever miss support for this driver on the ancient iop3xx platforms, so we don't need to bother trying to fix it properly.

commit 7285fae9345e030c6e215a9a4e5fe69b8db92bb5

Author: Guenter Roeck <[email protected]>
Date:   Sat Apr 5 11:27:37 2014 -0700

watchdog: Remove drivers for W83697HF and W83697UG

Since both chips are now supported by the w83627hf watchdog driver, the chip specific drivers are no longer needed and can be removed.

commit be281588d0bb21ccb07b1747939e0c919c2203fc

Author: Guenter Roeck <[email protected]>
Date:   Sat Apr 5 11:27:36 2014 -0700

watchdog: w83627hf_wdt: Add early_disable module parameter

Add early_disable module parameter to match functionality previously available in the w83697hf_wdt driver.

commit ebc5e336077aa2ea595f8ab5f989601e7e443332

Author: Ezequiel Garcia <[email protected]>
Date:   Sat Mar 15 15:18:04 2014 -0300

ARM: mvebu: Add A375/A380 watchdog binding documentation

This commit documents the new support for "marvell,armada-{375,380}-wdt" compatible strings and the extra 'reg' entry requirement.

commit b483642fc399c0c79a90aef25c956f37e29e6b27

Author: Ezequiel Garcia <[email protected]>
Date:   Sat Mar 15 15:18:01 2014 -0300

watchdog: orion: Add Armada 375/380 SoC support

This commit adds support for the Armada 375 and Armada 380 SoCs.

This SoC variant has a second RSTOUT register, in addition to the already existent, which is shared with the system-controller. To handle this RSTOUT, we introduce a new MMIO register 'rstout_mask' to be required on 'armada-{375,380}-watchdog' new compatible string.

commit 1b0ea574ac90c9c3da8e903f205848bd4724b1cf

Author: Ezequiel Garcia <[email protected]>
Date:   Sat Mar 15 15:18:00 2014 -0300

watchdog: orion: Introduce per-SoC enabled() function

In order to support other SoCs, it's needed to have a different enabled() implementation for each SoC. This commit adds no functionality, and it consists of preparation work.

commit ebf5cf7628f04b6988b9ad08d919728748ecbce0

Author: Ezequiel Garcia <[email protected]>
Date:   Sat Mar 15 15:17:59 2014 -0300

watchdog: orion: Introduce per-SoC stop() function

In order to support other SoCs, it's needed to have a different stop() implementation for each SoC. This commit adds no functionality, and it consists of preparation work.

commit eba985e20c70d99a278c04ff5c492d90d53a20dd

Author: Ezequiel Garcia <[email protected]>
Date:   Sat Mar 15 15:17:58 2014 -0300

watchdog: orion: Remove unneeded atomic access

The RSTOUT register on the Armada 370 SoC variant is a dedicated register (not shared across orthogonal subsystems) and so it's not needed to write it atomically.

commit 92d4fc1a1f56a12fa09c92d8c89873509a8012c9

Author: Ezequiel Garcia <[email protected]>
Date:   Sat Mar 15 15:17:57 2014 -0300

watchdog: orion: Introduce a SoC-specific RSTOUT mapping

Separate the RSTOUT register mapping for the different compatible strings supported by the driver. This allows to use devm_ioremap on SoC variants that share the RSTOUT register, and devm_ioremap_resource (which requests the MMIO region) on SoCs that have a dedicated RSTOUT register.

commit aaaac9ec79b7c4e21741df35d2247a1187836129

Author: Ezequiel Garcia <[email protected]>
Date:   Sat Mar 15 15:17:56 2014 -0300

watchdog: orion: Move the register ioremap'ing to its own function

Follow-up patches will extend the registers ioremap and request to handle SoC-specific quirks on the RSTOUT register. Therefore, in order to keep the code readable, this commit introduces a special function for this.

commit 9ebf1855dbe0a170e45a2000d6f8e16d88b5fd7c

Author: Jingoo Han <[email protected]>
Date:   Wed May 7 17:42:22 2014 +0900

watchdog: xilinx: Make of_device_id array const

Make of_device_id array const, because all OF functions handle it as const.

commit faad5de0b10484d3dc2ed2a803b2b82f6b1b81ee

Author: Anatolij Gustschin <[email protected]>
Date:   Fri Apr 11 08:57:14 2014 +0200

watchdog: imx2_wdt: convert to watchdog core api

Convert the imx2_wdt driver to the new watchdog core api.

commit a7977003293ed0c13e62d95fc8cd1d20e22b7282

Author: Xiubo Li <[email protected]>
Date:   Fri Apr 4 09:33:25 2014 +0800

watchdog: imx2_wdt: convert to use regmap API.

This watchdog driver will be working on IMX2+, Vybrid, LS1, LS2+ platforms, and will be in different endianness mode in those SoCs:

SoCs CPU endian mode WDT endian mode
------------------------------------------------
IMX2+ LE LE
Vybird LE LE
LS1 LE BE
LS2 LE LE

Other possible SoCs:
SoCs CPU endian mode WDT endian mode
------------------------------------------------
Soc1 BE BE
Soc2 BE LE

And also the watchdog's registers will be 32-bits for some versions, and though it is 16-bits in IMX2+, Vybird and LS+.

Using the regmap APIs, could be more easy to support different endianness and also more easy to support 32-bits version...

commit 30cb042a846353929042d93d13c9f8e1e5227aa7

Author: Xiubo Li <[email protected]>
Date:   Fri Apr 4 09:33:24 2014 +0800

watchdog: imx2_wdt: Sort the header files alphabetically

commit b4e62d9467cc5c69d7a23ebc50382c01b769e933

Author: Gabor Juhos <[email protected]>
Date:   Wed Apr 16 11:35:50 2014 +0200

watchdog: ath79_wdt: switch to clk_prepare/clk_disable

Replace clk_enable() and clk_disable() calls with clk_prepare_enable() and clk_disable_unprepare() to get ready for the migration to the common clock framework.

commit 23afeb613ec0e10aecfae7838a14d485db62ac52

Author: Gabor Juhos <[email protected]>
Date:   Wed Apr 16 11:34:41 2014 +0200

watchdog: ath79_wdt: avoid spurious restarts on AR934x

On some AR934x based systems, where the frequency of the AHB bus is relatively high, the built-in watchdog causes a spurious restart when it gets enabled.

The possible cause of these restarts is that the timeout value written into the TIMER register does not reaches the hardware in time.

Add an explicit delay into the ath79_wdt_enable function to avoid the spurious restarts.

commit ff4e0ae5feaffd69ecf115555c6437cf4f71f806

Author: Alexander Shiyan <[email protected]>
Date:   Sat Mar 29 14:29:00 2014 +0400

watchdog: shwdt: Remove unused platform_set_drvdata()

This patch removes platform_set_drvdata() which is not used in the driver.

commit a9e0436b303e94ba57d3bd4b1fcbeaa744b7ebeb

Author: gundberg <[email protected]>
Date:   Thu Apr 24 15:49:19 2014 +0200

watchdog: kempld-wdt: Use the correct value when configuring the prescaler with the watchdog

Use the prescaler index, rather than its value, to configure the watchdog. This will prevent a mismatch with the prescaler used to calculate the cycles.

commit 51ee34ab583a602e35817c020bcc5c437da4a1ee

Author: Emilio López <[email protected]>
Date:   Fri Apr 4 14:24:25 2014 -0300

watchdog: sunxi: Fix compilation with C=2

When compiling sunxi_defconfig while using C=2, the following error causes the compilation to fail:

drivers/watchdog/sunxi_wdt.c:60:15: error: constant 0b0001 is not a valid number

Fix it by using hex notation instead of the non-standard binary one

commit 3813ff8b38b265b6c25f3946d5850273deba03a3

Author: Julia Lawall <[email protected]>
Date:   Tue Apr 1 15:49:19 2014 +0200
    watchdog: via_wdt: replace del_timer by del_timer_sync
    
    Use del_timer_sync to ensure that the timer is stopped on all CPUs before
    the driver exits.
    
    This change was suggested by Thomas Gleixner.
    
    The semantic patch that makes this change is as follows:
    (http://coccinelle.lip6.fr/)
    
    // <smpl>
    @r@
    identifier i,t,ex;
    @@
    struct t i = { .remove = ex, };
    
    @@
    identifier r.ex;
    @@
    ex(...) {
      <...
    - del_timer
    + del_timer_sync
        (...)
      ...>
    }
    // </smpl>
    
    Signed-off-by: Julia Lawall <[email protected]>
    Signed-off-by: Wim Van Sebroeck <[email protected]>

commit 1e8c8a5b484f99d82bd961d10705896385cafc06

Author: Jean Delvare <[email protected]>
Date:   Wed Mar 26 16:00:01 2014 +0100

watchdog: Fix SBC8360 dependencies

According to its Kconfig help text, the sbc8360 watchdog driver is only used on the Axiomtek SBC8360 single-board computer. This piece of hardware is 32-bit x86 so the driver is useless beyond X86_32.

For completeness, I added the overal diff below.

Greetings,
Wim.

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

Documentation/devicetree/bindings/watchdog/marvel.txt +7 -0
index de11eb4..97223fd 100644
@@ -5,11 +5,18 @@ Required Properties:
 - Compatibility : "marvell,orion-wdt"
 		  "marvell,armada-370-wdt"
 		  "marvell,armada-xp-wdt"
+		  "marvell,armada-375-wdt"
+		  "marvell,armada-380-wdt"
 
 - reg		: Should contain two entries: first one with the
 		  timer control address, second one with the
 		  rstout enable address.
 
+For "marvell,armada-375-wdt" and "marvell,armada-380-wdt":
+
+- reg		: A third entry is mandatory and should contain the
+                  shared mask/unmask RSTOUT address.
+
 Optional properties:
 
 - interrupts	: Contains the IRQ for watchdog expiration
arch/powerpc/kernel/setup-common.c +0 -27
index 79b7612..fb87e4a 100644
@@ -718,33 +718,6 @@ static int powerpc_debugfs_init(void)
 arch_initcall(powerpc_debugfs_init);
 #endif
 
-#ifdef CONFIG_BOOKE_WDT
-extern u32 booke_wdt_enabled;
-extern u32 booke_wdt_period;
-
-/* Checks wdt=x and wdt_period=xx command-line option */
-notrace int __init early_parse_wdt(char *p)
-{
-	if (p && strncmp(p, "0", 1) != 0)
-		booke_wdt_enabled = 1;
-
-	return 0;
-}
-early_param("wdt", early_parse_wdt);
-
-int __init early_parse_wdt_period(char *p)
-{
-	unsigned long ret;
-	if (p) {
-		if (!kstrtol(p, 0, &ret))
-			booke_wdt_period = ret;
-	}
-
-	return 0;
-}
-early_param("wdt_period", early_parse_wdt_period);
-#endif	/* CONFIG_BOOKE_WDT */
-
 void ppc_printk_progress(char *s, unsigned short hex)
 {
 	pr_info("%s\n", s);
arch/x86/platform/intel-mid/device_libs/Makefile +1 -0
index 097e7a7..af9307f 100644
@@ -20,3 +20,4 @@ obj-$(subst m,y,$(CONFIG_DRM_MEDFIELD)) += platform_tc35876x.o
 obj-$(subst m,y,$(CONFIG_SERIAL_MRST_MAX3110)) += platform_max3111.o
 # MISC Devices
 obj-$(subst m,y,$(CONFIG_KEYBOARD_GPIO)) += platform_gpio_keys.o
+obj-$(subst m,y,$(CONFIG_INTEL_MID_WATCHDOG)) += platform_wdt.o
arch/x86/platform/intel-mid/device_libs/platform_wdt.c new file +72 -0

72 lines not on this page · raw message

drivers/watchdog/Kconfig +17 -32

79 lines not on this page · raw message

drivers/watchdog/Makefile +1 -2
index 1b5f3d5..7b8a91e 100644
@@ -107,13 +107,12 @@ obj-$(CONFIG_SMSC_SCH311X_WDT) += sch311x_wdt.o
 obj-$(CONFIG_SMSC37B787_WDT) += smsc37b787_wdt.o
 obj-$(CONFIG_VIA_WDT) += via_wdt.o
 obj-$(CONFIG_W83627HF_WDT) += w83627hf_wdt.o
-obj-$(CONFIG_W83697HF_WDT) += w83697hf_wdt.o
-obj-$(CONFIG_W83697UG_WDT) += w83697ug_wdt.o
 obj-$(CONFIG_W83877F_WDT) += w83877f_wdt.o
 obj-$(CONFIG_W83977F_WDT) += w83977f_wdt.o
 obj-$(CONFIG_MACHZ_WDT) += machzwd.o
 obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o
 obj-$(CONFIG_INTEL_SCU_WATCHDOG) += intel_scu_watchdog.o
+obj-$(CONFIG_INTEL_MID_WATCHDOG) += intel-mid_wdt.o
 
 # M32R Architecture
 
drivers/watchdog/ath79_wdt.c +13 -3
index 399c3fd..41ac466 100644
@@ -20,6 +20,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/bitops.h>
+#include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
 #include <linux/io.h>
@@ -90,6 +91,15 @@ static inline void ath79_wdt_keepalive(void)
 static inline void ath79_wdt_enable(void)
 {
 	ath79_wdt_keepalive();
+
+	/*
+	 * Updating the TIMER register requires a few microseconds
+	 * on the AR934x SoCs at least. Use a small delay to ensure
+	 * that the TIMER register is updated within the hardware
+	 * before enabling the watchdog.
+	 */
+	udelay(2);
+
 	ath79_wdt_wr(WDOG_REG_CTRL, WDOG_CTRL_ACTION_FCR);
 	/* flush write */
 	ath79_wdt_rr(WDOG_REG_CTRL);
@@ -255,7 +265,7 @@ static int ath79_wdt_probe(struct platform_device *pdev)
 	if (IS_ERR(wdt_clk))
 		return PTR_ERR(wdt_clk);
 
-	err = clk_enable(wdt_clk);
+	err = clk_prepare_enable(wdt_clk);
 	if (err)
 		return err;
 
@@ -286,14 +296,14 @@ static int ath79_wdt_probe(struct platform_device *pdev)
 	return 0;
 
 err_clk_disable:
-	clk_disable(wdt_clk);
+	clk_disable_unprepare(wdt_clk);
 	return err;
 }
 
 static int ath79_wdt_remove(struct platform_device *pdev)
 {
 	misc_deregister(&ath79_wdt_miscdev);
-	clk_disable(wdt_clk);
+	clk_disable_unprepare(wdt_clk);
 	return 0;
 }
 
drivers/watchdog/booke_wdt.c +33 -18

112 lines not on this page · raw message

drivers/watchdog/imx2_wdt.c +143 -177

417 lines not on this page · raw message

drivers/watchdog/intel-mid_wdt.c new file +184 -0

184 lines not on this page · raw message

drivers/watchdog/kempld_wdt.c +1 -1
index 20dc738..d9c1a16 100644
@@ -162,7 +162,7 @@ static int kempld_wdt_set_stage_timeout(struct kempld_wdt_data *wdt_data,
 	kempld_get_mutex(pld);
 	stage_cfg = kempld_read8(pld, KEMPLD_WDT_STAGE_CFG(stage->id));
 	stage_cfg &= ~STAGE_CFG_PRESCALER_MASK;
-	stage_cfg |= STAGE_CFG_SET_PRESCALER(prescaler);
+	stage_cfg |= STAGE_CFG_SET_PRESCALER(PRESCALER_21);
 	kempld_write8(pld, KEMPLD_WDT_STAGE_CFG(stage->id), stage_cfg);
 	kempld_write32(pld, KEMPLD_WDT_STAGE_TIMEOUT(stage->id),
 			stage_timeout);
drivers/watchdog/of_xilinx_wdt.c +1 -1
index 57ccae8..1e6e28d 100644
@@ -225,7 +225,7 @@ static int xwdt_remove(struct platform_device *pdev)
 }
 
 /* Match table for of_platform binding */
-static struct of_device_id xwdt_of_match[] = {
+static const struct of_device_id xwdt_of_match[] = {
 	{ .compatible = "xlnx,xps-timebase-wdt-1.00.a", },
 	{ .compatible = "xlnx,xps-timebase-wdt-1.01.a", },
 	{},
drivers/watchdog/orion_wdt.c +190 -23

315 lines not on this page · raw message

drivers/watchdog/shwdt.c +0 -2
index d04d02b..061756e 100644
@@ -282,8 +282,6 @@ static int sh_wdt_probe(struct platform_device *pdev)
 	wdt->timer.data		= (unsigned long)wdt;
 	wdt->timer.expires	= next_ping_period(clock_division_ratio);
 
-	platform_set_drvdata(pdev, wdt);
-
 	dev_info(&pdev->dev, "initialized.\n");
 
 	pm_runtime_enable(&pdev->dev);
drivers/watchdog/sp805_wdt.c +1 -3
index 47629d2..c1b03f4 100644
@@ -59,7 +59,6 @@
  * @adev: amba device structure of wdt
  * @status: current status of wdt
  * @load_val: load value to be set for current timeout
- * @timeout: current programmed timeout
  */
 struct sp805_wdt {
 	struct watchdog_device		wdd;
@@ -68,7 +67,6 @@ struct sp805_wdt {
 	struct clk			*clk;
 	struct amba_device		*adev;
 	unsigned int			load_val;
-	unsigned int			timeout;
 };
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
@@ -98,7 +96,7 @@ static int wdt_setload(struct watchdog_device *wdd, unsigned int timeout)
 	spin_lock(&wdt->lock);
 	wdt->load_val = load;
 	/* roundup timeout to closest positive integer value */
-	wdt->timeout = div_u64((load + 1) * 2 + (rate / 2), rate);
+	wdd->timeout = div_u64((load + 1) * 2 + (rate / 2), rate);
 	spin_unlock(&wdt->lock);
 
 	return 0;
drivers/watchdog/sunxi_wdt.c +11 -11
index cd00a78..693b9d2 100644
@@ -57,17 +57,17 @@ struct sunxi_wdt_dev {
  */
 
 static const int wdt_timeout_map[] = {
-	[1] = 0b0001,  /* 1s  */
-	[2] = 0b0010,  /* 2s  */
-	[3] = 0b0011,  /* 3s  */
-	[4] = 0b0100,  /* 4s  */
-	[5] = 0b0101,  /* 5s  */
-	[6] = 0b0110,  /* 6s  */
-	[8] = 0b0111,  /* 8s  */
-	[10] = 0b1000, /* 10s */
-	[12] = 0b1001, /* 12s */
-	[14] = 0b1010, /* 14s */
-	[16] = 0b1011, /* 16s */
+	[1] = 0x1,  /* 1s  */
+	[2] = 0x2,  /* 2s  */
+	[3] = 0x3,  /* 3s  */
+	[4] = 0x4,  /* 4s  */
+	[5] = 0x5,  /* 5s  */
+	[6] = 0x6,  /* 6s  */
+	[8] = 0x7,  /* 8s  */
+	[10] = 0x8, /* 10s */
+	[12] = 0x9, /* 12s */
+	[14] = 0xA, /* 14s */
+	[16] = 0xB, /* 16s */
 };
 
 static int sunxi_wdt_ping(struct watchdog_device *wdt_dev)
drivers/watchdog/via_wdt.c +1 -1
index d2cd9f0..56369c4 100644
@@ -232,7 +232,7 @@ err_out_disable_device:
 static void wdt_remove(struct pci_dev *pdev)
 {
 	watchdog_unregister_device(&wdt_dev);
-	del_timer(&timer);
+	del_timer_sync(&timer);
 	iounmap(wdt_mem);
 	release_mem_region(mmio, VIA_WDT_MMIO_LEN);
 	release_resource(&wdt_res);
drivers/watchdog/w83627hf_wdt.c +12 -3
index b1da0c1..7165704 100644
@@ -64,6 +64,10 @@ MODULE_PARM_DESC(nowayout,
 		"Watchdog cannot be stopped once started (default="
 				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
 
+static int early_disable;
+module_param(early_disable, int, 0);
+MODULE_PARM_DESC(early_disable, "Disable watchdog at boot time (default=0)");
+
 /*
  *	Kernel methods.
  */
@@ -208,9 +212,14 @@ static int w83627hf_init(struct watchdog_device *wdog, enum chips chip)
 
 	t = superio_inb(cr_wdt_timeout);
 	if (t != 0) {
-		pr_info("Watchdog already running. Resetting timeout to %d sec\n",
-			wdog->timeout);
-		superio_outb(cr_wdt_timeout, wdog->timeout);
+		if (early_disable) {
+			pr_warn("Stopping previously enabled watchdog until userland kicks in\n");
+			superio_outb(cr_wdt_timeout, 0);
+		} else {
+			pr_info("Watchdog already running. Resetting timeout to %d sec\n",
+				wdog->timeout);
+			superio_outb(cr_wdt_timeout, wdog->timeout);
+		}
 	}
 
 	/* set second mode & disable keyboard turning off watchdog */
drivers/watchdog/w83697hf_wdt.c deleted +0 -460

460 lines not on this page · raw message

drivers/watchdog/w83697ug_wdt.c deleted +0 -397

397 lines not on this page · raw message

include/linux/platform_data/intel-mid_wdt.h new file +22 -0
new file mode 100644
index 0000000..b982534
@@ -0,0 +1,22 @@
+/*
+ *      intel-mid_wdt: generic Intel MID SCU watchdog driver
+ *
+ *      Copyright (C) 2014 Intel Corporation. All rights reserved.
+ *      Contact: David Cohen <[email protected]>
+ *
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the terms of version 2 of the GNU General
+ *      Public License as published by the Free Software Foundation.
+ */
+
+#ifndef __INTEL_MID_WDT_H__
+#define __INTEL_MID_WDT_H__
+
+#include <linux/platform_device.h>
+
+struct intel_mid_wdt_pdata {
+	int irq;
+	int (*probe)(struct platform_device *pdev);
+};
+
+#endif /*__INTEL_MID_WDT_H__*/
#1 lore raw
Quoted 4 lines · Wim Van Sebroeck

Hi Linus,

Please pull from 'master' branch of
git://www.linux-watchdog.org/linux-watchdog.git

gmail has decided that you are a spammer, and the only reason I saw this email was that BenH had the same fate and emailed me from another account to check.

You and BenH have something in common: no SPF records. That tends to be one of the things that makes gmail unhappy, and look closer at emails and make it more likely to consider things spam:

Received-SPF: none (google.com: [email protected] does not
designate permitted sender hosts) client-ip=83.149.101.17;
Authentication-Results: mx.google.com;
spf=neutral (google.com: [email protected] does not
designate permitted sender hosts) [email protected]

Anyway, no need to resend since I found it, but you might want to talk to your email provider about your SPF records...

Linus