linux-kernel - [PATCH] watchdog: at91sam9: keep watchdog running in idle mode

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1444163325-3041-1-git-send-email-sylvain.rochet@finsecur.com>
Date:	Tue,  6 Oct 2015 22:28:45 +0200
From:	Sylvain Rochet <sylvain.rochet@...secur.com>
To:	Guenter Roeck <linux@...ck-us.net>,
	Alexandre Belloni <alexandre.belloni@...e-electrons.com>,
	Boris BREZILLON <boris.brezillon@...e-electrons.com>,
	linux-kernel@...r.kernel.org,
	Nicolas Ferre <nicolas.ferre@...el.com>,
	Ludovic Desroches <ludovic.desroches@...el.com>,
	linux-arm-kernel@...ts.infradead.org
Cc:	Sylvain Rochet <sylvain.rochet@...secur.com>,
	<stable@...r.kernel.org>
Subject: [PATCH] watchdog: at91sam9: keep watchdog running in idle mode

Since turning on idle-halt in commit 5161b31dc39a (watchdog:
at91sam9_wdt: better watchdog support"), SoCs compatible with
at91sam9260-wdt not using a device tree no longer reboot if the watchdog
times out while the CPU is in idle state. Removing the
AT91_WDT_WDIDLEHLT flag that was set by default fixes this.

Signed-off-by: Sylvain Rochet <sylvain.rochet@...secur.com>
Fixes: 5161b31dc39a ("watchdog: at91sam9_wdt: better watchdog support")
Cc: <stable@...r.kernel.org> # 3.14+
---
 drivers/watchdog/at91sam9_wdt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index 7e6acaf..6e3a167 100644
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -339,7 +339,7 @@ static int __init at91wdt_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	wdt->mr = (WDT_HW_TIMEOUT * 256) | AT91_WDT_WDRSTEN | AT91_WDT_WDD |
-		  AT91_WDT_WDDBGHLT | AT91_WDT_WDIDLEHLT;
+		  AT91_WDT_WDDBGHLT;
 	wdt->mr_mask = 0x3FFFFFFF;
 	wdt->nowayout = nowayout;
 	wdt->wdd.parent = &pdev->dev;
-- 
2.5.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/