linux-watchdog.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
To: Santosh Shilimkar <santosh.shilimkar@ti.com>,
	Wim Van Sebroeck <wim@iguana.be>, Sekhar Nori <nsekhar@ti.com>,
	<linux-watchdog@vger.kernel.org>, <devicetree@vger.kernel.org>
Cc: Grant Likely <grant.likely@linaro.org>,
	Rob Herring <rob.herring@calxeda.com>,
	Pawel Moll <pawel.moll@arm.com>,
	Mark Rutland <mark.rutland@arm.com>,
	Stephen Warren <swarren@wwwdotorg.org>,
	Kumar Gala <galak@kernel.crashing.org>,
	Ian Campbell <ijc+devicetree@hellion.org.uk>,
	<linux-kernel@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>,
	Strashko Grygorii <grygorii.strashko@ti.com>,
	Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Subject: [PATCH 3/6] watchdog: davinci: add GET_TIMELEFT option support
Date: Mon, 18 Nov 2013 19:18:56 +0200	[thread overview]
Message-ID: <1384795139-19466-4-git-send-email-ivan.khoronzhuk@ti.com> (raw)
In-Reply-To: <1384795139-19466-1-git-send-email-ivan.khoronzhuk@ti.com>

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

Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.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 b353df5..55deaf8 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


  parent reply	other threads:[~2013-11-18 17:21 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-18 17:18 [PATCH v2 0/6] Update Davinci watchdog driver Ivan Khoronzhuk
2013-11-18 17:18 ` [PATCH 1/6] watchdog: davinci: change driver to use WDT core Ivan Khoronzhuk
2013-11-19  5:12   ` Guenter Roeck
2013-11-19 16:17     ` Grygorii Strashko
2013-11-25 11:56   ` Sekhar Nori
2013-11-25 12:06     ` ivan.khoronzhuk
2013-11-18 17:18 ` [PATCH 2/6] watchdog: davinci: use davinci_wdt_device structure to hold device data Ivan Khoronzhuk
2013-11-18 17:18 ` Ivan Khoronzhuk [this message]
2013-11-19  5:14   ` [PATCH 3/6] watchdog: davinci: add GET_TIMELEFT option support Guenter Roeck
2013-11-18 17:18 ` [PATCH 4/6] watchdog: davinci: add "timeout-sec" property Ivan Khoronzhuk
2013-11-19  5:15   ` Guenter Roeck
2013-11-18 17:18 ` [PATCH 5/6] watchdog: davinci: reuse driver for keystone arch Ivan Khoronzhuk
2013-11-19  5:16   ` Guenter Roeck
2013-11-18 17:18 ` [PATCH 6/6] arm: dts: keystone: add watchdog entry Ivan Khoronzhuk
2013-11-25 13:06 ` [PATCH v2 0/6] Update Davinci watchdog driver Sekhar Nori
2013-11-25 13:19   ` ivan.khoronzhuk
2013-11-25 16:44     ` ivan.khoronzhuk

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1384795139-19466-4-git-send-email-ivan.khoronzhuk@ti.com \
    --to=ivan.khoronzhuk@ti.com \
    --cc=devicetree@vger.kernel.org \
    --cc=galak@kernel.crashing.org \
    --cc=grant.likely@linaro.org \
    --cc=grygorii.strashko@ti.com \
    --cc=ijc+devicetree@hellion.org.uk \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-watchdog@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=nsekhar@ti.com \
    --cc=pawel.moll@arm.com \
    --cc=rob.herring@calxeda.com \
    --cc=santosh.shilimkar@ti.com \
    --cc=swarren@wwwdotorg.org \
    --cc=wim@iguana.be \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).