* Fwd: [PATCH 3/8] watchdog: davinci: add GET_TIMELEFT option support
@ 2013-11-06 11:31 ` ivan.khoronzhuk
0 siblings, 0 replies; 12+ messages in thread
From: ivan.khoronzhuk @ 2013-11-06 11:31 UTC (permalink / raw)
To: Santosh Shilimkar, wim-IQzOog9fTRqzQB+pC5nmwQ,
nsekhar-l0cyMroinI0, linux-watchdog-u79uwXL29TY76Z2rM5mHXA,
devicetree-u79uwXL29TY76Z2rM5mHXA
Cc: grant.likely-QSEj5FYQhm4dnm+yROfE0A,
rob.herring-bsGFqQB8/DxBDgjK7y7TUQ, pawel.moll-5wv7dgnIgG8,
mark.rutland-5wv7dgnIgG8, swarren-3lzwWm7+Weoh9ZMKESR00Q,
galak-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r,
ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
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-l0cyMroinI0@public.gmane.org>
---
drivers/watchdog/davinci_wdt.c | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index 1fc2093..6cbf2e1 100644
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -117,6 +117,33 @@ 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 is occured then return 0 */
+ val = ioread32(davinci_wdt->base + WDTCR);
+ if (val & WDFLAG)
+ return 0;
+
+ freq = clk_get_rate(davinci_wdt->clk);
+
+ if (!freq) {
+ dev_err(wdd->dev, "clock freq is not set\n");
+ 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",
@@ -127,6 +154,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 devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 12+ messages in thread* Fwd: [PATCH 3/8] watchdog: davinci: add GET_TIMELEFT option support
@ 2013-11-06 11:31 ` ivan.khoronzhuk
0 siblings, 0 replies; 12+ messages in thread
From: ivan.khoronzhuk @ 2013-11-06 11:31 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
drivers/watchdog/davinci_wdt.c | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index 1fc2093..6cbf2e1 100644
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -117,6 +117,33 @@ 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 is occured then return 0 */
+ val = ioread32(davinci_wdt->base + WDTCR);
+ if (val & WDFLAG)
+ return 0;
+
+ freq = clk_get_rate(davinci_wdt->clk);
+
+ if (!freq) {
+ dev_err(wdd->dev, "clock freq is not set\n");
+ 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",
@@ -127,6 +154,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
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: Fwd: [PATCH 3/8] watchdog: davinci: add GET_TIMELEFT option support
2013-11-06 11:31 ` ivan.khoronzhuk
(?)
@ 2013-11-12 15:37 ` Santosh Shilimkar
-1 siblings, 0 replies; 12+ messages in thread
From: Santosh Shilimkar @ 2013-11-12 15:37 UTC (permalink / raw)
To: ivan.khoronzhuk
Cc: wim, nsekhar, linux-watchdog, devicetree, grant.likely,
rob.herring, pawel.moll, mark.rutland, swarren, galak,
ijc+devicetree, linux-kernel, linux-arm-kernel
On Wednesday 06 November 2013 06:31 AM, ivan.khoronzhuk wrote:
> 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>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: Fwd: [PATCH 3/8] watchdog: davinci: add GET_TIMELEFT option support
@ 2013-11-12 15:37 ` Santosh Shilimkar
0 siblings, 0 replies; 12+ messages in thread
From: Santosh Shilimkar @ 2013-11-12 15:37 UTC (permalink / raw)
To: ivan.khoronzhuk
Cc: wim, nsekhar, linux-watchdog, devicetree, grant.likely,
rob.herring, pawel.moll, mark.rutland, swarren, galak,
ijc+devicetree, linux-kernel, linux-arm-kernel
On Wednesday 06 November 2013 06:31 AM, ivan.khoronzhuk wrote:
> 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>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Fwd: [PATCH 3/8] watchdog: davinci: add GET_TIMELEFT option support
@ 2013-11-12 15:37 ` Santosh Shilimkar
0 siblings, 0 replies; 12+ messages in thread
From: Santosh Shilimkar @ 2013-11-12 15:37 UTC (permalink / raw)
To: linux-arm-kernel
On Wednesday 06 November 2013 06:31 AM, ivan.khoronzhuk wrote:
> 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>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: Fwd: [PATCH 3/8] watchdog: davinci: add GET_TIMELEFT option support
2013-11-06 11:31 ` ivan.khoronzhuk
(?)
@ 2013-11-17 2:22 ` Guenter Roeck
-1 siblings, 0 replies; 12+ messages in thread
From: Guenter Roeck @ 2013-11-17 2:22 UTC (permalink / raw)
To: ivan.khoronzhuk, Santosh Shilimkar, wim, nsekhar, linux-watchdog,
devicetree
Cc: grant.likely, rob.herring, pawel.moll, mark.rutland, swarren,
galak, ijc+devicetree, linux-kernel, linux-arm-kernel
On 11/06/2013 03:31 AM, ivan.khoronzhuk wrote:
> 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>
> ---
> drivers/watchdog/davinci_wdt.c | 28 ++++++++++++++++++++++++++++
> 1 file changed, 28 insertions(+)
>
> diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
> index 1fc2093..6cbf2e1 100644
> --- a/drivers/watchdog/davinci_wdt.c
> +++ b/drivers/watchdog/davinci_wdt.c
> @@ -117,6 +117,33 @@ 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 is occured then return 0 */
is -> has ?
> + val = ioread32(davinci_wdt->base + WDTCR);
> + if (val & WDFLAG)
> + return 0;
> +
> + freq = clk_get_rate(davinci_wdt->clk);
> +
> + if (!freq) {
> + dev_err(wdd->dev, "clock freq is not set\n");
> + return 0;
> + }
> +
This error check doesn't make sense to me; elsewhere the clock rate is not validated.
I would suggest to just return 0 here.
> + 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",
> @@ -127,6 +154,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)
>
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: Fwd: [PATCH 3/8] watchdog: davinci: add GET_TIMELEFT option support
@ 2013-11-17 2:22 ` Guenter Roeck
0 siblings, 0 replies; 12+ messages in thread
From: Guenter Roeck @ 2013-11-17 2:22 UTC (permalink / raw)
To: ivan.khoronzhuk, Santosh Shilimkar, wim-IQzOog9fTRqzQB+pC5nmwQ,
nsekhar-l0cyMroinI0, linux-watchdog-u79uwXL29TY76Z2rM5mHXA,
devicetree-u79uwXL29TY76Z2rM5mHXA
Cc: grant.likely-QSEj5FYQhm4dnm+yROfE0A,
rob.herring-bsGFqQB8/DxBDgjK7y7TUQ, pawel.moll-5wv7dgnIgG8,
mark.rutland-5wv7dgnIgG8, swarren-3lzwWm7+Weoh9ZMKESR00Q,
galak-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r,
ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
On 11/06/2013 03:31 AM, ivan.khoronzhuk wrote:
> 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-l0cyMroinI0@public.gmane.org>
> ---
> drivers/watchdog/davinci_wdt.c | 28 ++++++++++++++++++++++++++++
> 1 file changed, 28 insertions(+)
>
> diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
> index 1fc2093..6cbf2e1 100644
> --- a/drivers/watchdog/davinci_wdt.c
> +++ b/drivers/watchdog/davinci_wdt.c
> @@ -117,6 +117,33 @@ 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 is occured then return 0 */
is -> has ?
> + val = ioread32(davinci_wdt->base + WDTCR);
> + if (val & WDFLAG)
> + return 0;
> +
> + freq = clk_get_rate(davinci_wdt->clk);
> +
> + if (!freq) {
> + dev_err(wdd->dev, "clock freq is not set\n");
> + return 0;
> + }
> +
This error check doesn't make sense to me; elsewhere the clock rate is not validated.
I would suggest to just return 0 here.
> + 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",
> @@ -127,6 +154,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)
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 12+ messages in thread* Fwd: [PATCH 3/8] watchdog: davinci: add GET_TIMELEFT option support
@ 2013-11-17 2:22 ` Guenter Roeck
0 siblings, 0 replies; 12+ messages in thread
From: Guenter Roeck @ 2013-11-17 2:22 UTC (permalink / raw)
To: linux-arm-kernel
On 11/06/2013 03:31 AM, ivan.khoronzhuk wrote:
> 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>
> ---
> drivers/watchdog/davinci_wdt.c | 28 ++++++++++++++++++++++++++++
> 1 file changed, 28 insertions(+)
>
> diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
> index 1fc2093..6cbf2e1 100644
> --- a/drivers/watchdog/davinci_wdt.c
> +++ b/drivers/watchdog/davinci_wdt.c
> @@ -117,6 +117,33 @@ 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 is occured then return 0 */
is -> has ?
> + val = ioread32(davinci_wdt->base + WDTCR);
> + if (val & WDFLAG)
> + return 0;
> +
> + freq = clk_get_rate(davinci_wdt->clk);
> +
> + if (!freq) {
> + dev_err(wdd->dev, "clock freq is not set\n");
> + return 0;
> + }
> +
This error check doesn't make sense to me; elsewhere the clock rate is not validated.
I would suggest to just return 0 here.
> + 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",
> @@ -127,6 +154,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)
>
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: Fwd: [PATCH 3/8] watchdog: davinci: add GET_TIMELEFT option support
2013-11-17 2:22 ` Guenter Roeck
(?)
@ 2013-11-18 13:21 ` ivan.khoronzhuk
-1 siblings, 0 replies; 12+ messages in thread
From: ivan.khoronzhuk @ 2013-11-18 13:21 UTC (permalink / raw)
To: Guenter Roeck, Santosh Shilimkar, wim, nsekhar, linux-watchdog,
devicetree
Cc: grant.likely, rob.herring, pawel.moll, mark.rutland, swarren,
galak, ijc+devicetree, linux-kernel, linux-arm-kernel
On 11/17/2013 04:22 AM, Guenter Roeck wrote:
> On 11/06/2013 03:31 AM, ivan.khoronzhuk wrote:
>> 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>
>> ---
>> drivers/watchdog/davinci_wdt.c | 28 ++++++++++++++++++++++++++++
>> 1 file changed, 28 insertions(+)
>>
>> diff --git a/drivers/watchdog/davinci_wdt.c
>> b/drivers/watchdog/davinci_wdt.c
>> index 1fc2093..6cbf2e1 100644
>> --- a/drivers/watchdog/davinci_wdt.c
>> +++ b/drivers/watchdog/davinci_wdt.c
>> @@ -117,6 +117,33 @@ 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 is occured then return 0 */
>
> is -> has ?
>
Yes
>> + val = ioread32(davinci_wdt->base + WDTCR);
>> + if (val & WDFLAG)
>> + return 0;
>> +
>> + freq = clk_get_rate(davinci_wdt->clk);
>> +
>> + if (!freq) {
>> + dev_err(wdd->dev, "clock freq is not set\n");
>> + return 0;
>> + }
>> +
> This error check doesn't make sense to me; elsewhere the clock rate is
> not validated.
> I would suggest to just return 0 here.
>
Agree
>> + 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",
>> @@ -127,6 +154,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)
>>
>
--
Regards,
Ivan Khoronzhuk
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: Fwd: [PATCH 3/8] watchdog: davinci: add GET_TIMELEFT option support
@ 2013-11-18 13:21 ` ivan.khoronzhuk
0 siblings, 0 replies; 12+ messages in thread
From: ivan.khoronzhuk @ 2013-11-18 13:21 UTC (permalink / raw)
To: Guenter Roeck, Santosh Shilimkar, wim-IQzOog9fTRqzQB+pC5nmwQ,
nsekhar-l0cyMroinI0, linux-watchdog-u79uwXL29TY76Z2rM5mHXA,
devicetree-u79uwXL29TY76Z2rM5mHXA
Cc: grant.likely-QSEj5FYQhm4dnm+yROfE0A,
rob.herring-bsGFqQB8/DxBDgjK7y7TUQ, pawel.moll-5wv7dgnIgG8,
mark.rutland-5wv7dgnIgG8, swarren-3lzwWm7+Weoh9ZMKESR00Q,
galak-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r,
ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
On 11/17/2013 04:22 AM, Guenter Roeck wrote:
> On 11/06/2013 03:31 AM, ivan.khoronzhuk wrote:
>> 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-l0cyMroinI0@public.gmane.org>
>> ---
>> drivers/watchdog/davinci_wdt.c | 28 ++++++++++++++++++++++++++++
>> 1 file changed, 28 insertions(+)
>>
>> diff --git a/drivers/watchdog/davinci_wdt.c
>> b/drivers/watchdog/davinci_wdt.c
>> index 1fc2093..6cbf2e1 100644
>> --- a/drivers/watchdog/davinci_wdt.c
>> +++ b/drivers/watchdog/davinci_wdt.c
>> @@ -117,6 +117,33 @@ 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 is occured then return 0 */
>
> is -> has ?
>
Yes
>> + val = ioread32(davinci_wdt->base + WDTCR);
>> + if (val & WDFLAG)
>> + return 0;
>> +
>> + freq = clk_get_rate(davinci_wdt->clk);
>> +
>> + if (!freq) {
>> + dev_err(wdd->dev, "clock freq is not set\n");
>> + return 0;
>> + }
>> +
> This error check doesn't make sense to me; elsewhere the clock rate is
> not validated.
> I would suggest to just return 0 here.
>
Agree
>> + 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",
>> @@ -127,6 +154,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)
>>
>
--
Regards,
Ivan Khoronzhuk
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 12+ messages in thread* Fwd: [PATCH 3/8] watchdog: davinci: add GET_TIMELEFT option support
@ 2013-11-18 13:21 ` ivan.khoronzhuk
0 siblings, 0 replies; 12+ messages in thread
From: ivan.khoronzhuk @ 2013-11-18 13:21 UTC (permalink / raw)
To: linux-arm-kernel
On 11/17/2013 04:22 AM, Guenter Roeck wrote:
> On 11/06/2013 03:31 AM, ivan.khoronzhuk wrote:
>> 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>
>> ---
>> drivers/watchdog/davinci_wdt.c | 28 ++++++++++++++++++++++++++++
>> 1 file changed, 28 insertions(+)
>>
>> diff --git a/drivers/watchdog/davinci_wdt.c
>> b/drivers/watchdog/davinci_wdt.c
>> index 1fc2093..6cbf2e1 100644
>> --- a/drivers/watchdog/davinci_wdt.c
>> +++ b/drivers/watchdog/davinci_wdt.c
>> @@ -117,6 +117,33 @@ 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 is occured then return 0 */
>
> is -> has ?
>
Yes
>> + val = ioread32(davinci_wdt->base + WDTCR);
>> + if (val & WDFLAG)
>> + return 0;
>> +
>> + freq = clk_get_rate(davinci_wdt->clk);
>> +
>> + if (!freq) {
>> + dev_err(wdd->dev, "clock freq is not set\n");
>> + return 0;
>> + }
>> +
> This error check doesn't make sense to me; elsewhere the clock rate is
> not validated.
> I would suggest to just return 0 here.
>
Agree
>> + 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",
>> @@ -127,6 +154,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)
>>
>
--
Regards,
Ivan Khoronzhuk
^ permalink raw reply [flat|nested] 12+ messages in thread