[PATCHv3 2/3] watchdog: add f71862fg support

[PATCHv3 2/3] watchdog: add f71862fg support

[Lutz Ballaschke]

from: Lutz Ballaschke <vegan.grindcore@googlemail.com>

ioctl WDIOC_GETTIMELEFT and helper function added to watchdog driver 
for common usage.

Signed-off-by: Lutz Ballaschke <vegan.grindcore@googlemail.com>
---

 drivers/watchdog/f71808e_wdt.c |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)


diff --git a/drivers/watchdog/f71808e_wdt.c b/drivers/watchdog/f71808e_wdt.c
index 546cef6..d070086 100644
--- a/drivers/watchdog/f71808e_wdt.c
+++ b/drivers/watchdog/f71808e_wdt.c
@@ -265,6 +265,24 @@ exit_unlock:
 	return err;
 }
 
+static int watchdog_time_left(void)
+{
+	int ret = 0;
+
+	mutex_lock(&watchdog.lock);
+	ret = superio_enter(watchdog.sioaddr);
+	if (ret)
+		goto exit_unlock;
+
+	superio_select(watchdog.sioaddr, SIO_F71808FG_LD_WDT);
+	ret = superio_inb(watchdog.sioaddr, F71808FG_REG_WD_TIME);
+	superio_exit(watchdog.sioaddr);
+
+exit_unlock:
+	mutex_unlock(&watchdog.lock);
+	return ret;
+}
+
 static int watchdog_keepalive(void)
 {
 	int err = 0;
@@ -590,6 +608,12 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd,
 	case WDIOC_GETTIMEOUT:
 		return put_user(watchdog.timeout, uarg.i);
 
+	case WDIOC_GETTIMELEFT:
+		status = watchdog_time_left();
+		if (status < 0)
+			return status;
+		return put_user(status, uarg.i);
+
 	default:
 		return -ENOTTY;
 

Re: [PATCHv3 2/3] watchdog: add f71862fg support

[Giel van Schijndel]

[-- Attachment #1: Type: text/plain, Size: 1057 bytes --]

On Sun, Sep 26, 2010 at 04:32:41PM +0200, Lutz Ballaschke wrote:
> ioctl WDIOC_GETTIMELEFT and helper function added to watchdog driver 
> for common usage.
> 
> ... snip ...
> 
> +static int watchdog_time_left(void)
> +{
> +	int ret = 0;
> +
> +	mutex_lock(&watchdog.lock);
> +	ret = superio_enter(watchdog.sioaddr);
> +	if (ret)
> +		goto exit_unlock;
> +
> +	superio_select(watchdog.sioaddr, SIO_F71808FG_LD_WDT);
> +	ret = superio_inb(watchdog.sioaddr, F71808FG_REG_WD_TIME);
> +	superio_exit(watchdog.sioaddr);
> +
> +exit_unlock:
> +	mutex_unlock(&watchdog.lock);
> +	return ret;
> +}

This function still has the problem I described earlier, namely that of
returning minutes to userspace (which expects seconds) when minutes_mode
is true.

I would thus suggest not to commit this patch as it violates the
Watchdog API.

-- 
Met vriendelijke groet,
With kind regards,
Giel van Schijndel
--
"There are only two kinds of languages: the ones people complain about
 and the ones nobody uses."
  -- Bjarne Stroustrup

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]