[lkml]   [2011]   [Jul]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Patch in this message
    Subject[PATCH 03/11] watchdog: WatchDog Timer Driver Core - Add WDIOC_KEEPALIVE ioctl
    This part add's the WDIOC_KEEPALIVE ioctl functionality to the
    WatchDog Timer Driver Core framework. Please note that the
    WDIOF_KEEPALIVEPING bit has to be set in the watchdog_info
    options field.

    Signed-off-by: Alan Cox <>
    Signed-off-by: Wim Van Sebroeck <>
    Documentation/watchdog/watchdog-kernel-api.txt | 3 +++
    drivers/watchdog/watchdog_dev.c | 5 +++++
    2 files changed, 8 insertions(+), 0 deletions(-)

    diff --git a/Documentation/watchdog/watchdog-kernel-api.txt b/Documentation/watchdog/watchdog-kernel-api.txt
    index 544eb19..8ca0571 100644
    --- a/Documentation/watchdog/watchdog-kernel-api.txt
    +++ b/Documentation/watchdog/watchdog-kernel-api.txt
    @@ -99,6 +99,9 @@ they are supported. These optional routines/operations are:
    the watchdog timer driver core does: to send a keepalive ping to the watchdog
    timer hardware it will either use the ping operation (when available) or the
    start operation (when the ping operation is not available).
    + (Note: the WDIOC_KEEPALIVE ioctl call will only be active when the
    + WDIOF_KEEPALIVEPING bit has been set in the option field on the watchdog's
    + info structure).
    * status: this routine checks the status of the watchdog timer device. The
    status of the device is reported with watchdog WDIOF_* status flags/bits.

    diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c
    index bebea38..cc361e1 100644
    --- a/drivers/watchdog/watchdog_dev.c
    +++ b/drivers/watchdog/watchdog_dev.c
    @@ -131,6 +131,11 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd,
    return put_user(val, p);
    return put_user(wdd->bootstatus, p);
    + if (!(wdd->info->options & WDIOF_KEEPALIVEPING))
    + return -EOPNOTSUPP;
    + watchdog_ping(wdd);
    + return 0;
    return -ENOTTY;

     \ /
      Last update: 2011-07-11 16:23    [W:0.034 / U:9.412 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site