linux-kernel - [PATCH v5 3/5] watchdog: davinci: add GET

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-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1386185970-14488-4-git-send-email-ivan.khoronzhuk@ti.com>
Date:	Wed, 4 Dec 2013 21:39:28 +0200
From:	Ivan Khoronzhuk <ivan.khoronzhuk@...com>
To:	Santosh Shilimkar <santosh.shilimkar@...com>
CC:	<linux-arm-kernel@...ts.infradead.org>, <mark.rutland@....com>,
	<wim@...ana.be>, <nsekhar@...com>,
	<linux-watchdog@...r.kernel.org>, <devicetree@...r.kernel.org>,
	<Pawel.Moll@....com>, <swarren@...dotorg.org>,
	<ijc+devicetree@...lion.org.uk>, <galak@...nel.crashing.org>,
	<rob.herring@...xeda.com>, <linux-kernel@...r.kernel.org>,
	<grant.likely@...aro.org>, <grygorii.strashko@...com>,
	Ivan Khoronzhuk <ivan.khoronzhuk@...com>
Subject: [PATCH v5 3/5] watchdog: davinci: add GET_TIMELEFT option support

Currently, the davinci watchdog can be read while counting,
so we can add ability to report the remaining time before
the system will reboot.

Acked-by: Santosh Shilimkar <santosh.shilimkar@...com>
Reviewed-by: Guenter Roeck <linux@...ck-us.net>
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@...com>
---
 drivers/watchdog/davinci_wdt.c |   26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index b6b82d1d..cd6ff9d 100644
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -116,6 +116,31 @@ static int davinci_wdt_ping(struct watchdog_device *wdd)
 	return 0;
 }
 
+static unsigned int davinci_wdt_get_timeleft(struct watchdog_device *wdd)
+{
+	u64 timer_counter;
+	unsigned long freq;
+	u32 val;
+	struct davinci_wdt_device *davinci_wdt = watchdog_get_drvdata(wdd);
+
+	/* if timeout has occured then return 0 */
+	val = ioread32(davinci_wdt->base + WDTCR);
+	if (val & WDFLAG)
+		return 0;
+
+	freq = clk_get_rate(davinci_wdt->clk);
+
+	if (!freq)
+		return 0;
+
+	timer_counter = ioread32(davinci_wdt->base + TIM12);
+	timer_counter |= ((u64)ioread32(davinci_wdt->base + TIM34) << 32);
+
+	do_div(timer_counter, freq);
+
+	return wdd->timeout - timer_counter;
+}
+
 static const struct watchdog_info davinci_wdt_info = {
 	.options = WDIOF_KEEPALIVEPING,
 	.identity = "DaVinci Watchdog",
@@ -126,6 +151,7 @@ static const struct watchdog_ops davinci_wdt_ops = {
 	.start		= davinci_wdt_start,
 	.stop		= davinci_wdt_ping,
 	.ping		= davinci_wdt_ping,
+	.get_timeleft	= davinci_wdt_get_timeleft,
 };
 
 static int davinci_wdt_probe(struct platform_device *pdev)
-- 
1.7.9.5

--
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/