lkml.org 
[lkml]   [2020]   [Aug]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 080/204] watchdog: f71808e_wdt: indicate WDIOF_CARDRESET support in watchdog_info.options
    Date
    From: Ahmad Fatoum <a.fatoum@pengutronix.de>

    commit e871e93fb08a619dfc015974a05768ed6880fd82 upstream.

    The driver supports populating bootstatus with WDIOF_CARDRESET, but so
    far userspace couldn't portably determine whether absence of this flag
    meant no watchdog reset or no driver support. Or-in the bit to fix this.

    Fixes: b97cb21a4634 ("watchdog: f71808e_wdt: Fix WDTMOUT_STS register read")
    Cc: stable@vger.kernel.org
    Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
    Reviewed-by: Guenter Roeck <linux@roeck-us.net>
    Link: https://lore.kernel.org/r/20200611191750.28096-3-a.fatoum@pengutronix.de
    Signed-off-by: Guenter Roeck <linux@roeck-us.net>
    Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/watchdog/f71808e_wdt.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/drivers/watchdog/f71808e_wdt.c
    +++ b/drivers/watchdog/f71808e_wdt.c
    @@ -692,7 +692,8 @@ static int __init watchdog_init(int sioa
    watchdog.sioaddr = sioaddr;
    watchdog.ident.options = WDIOC_SETTIMEOUT
    | WDIOF_MAGICCLOSE
    - | WDIOF_KEEPALIVEPING;
    + | WDIOF_KEEPALIVEPING
    + | WDIOF_CARDRESET;

    snprintf(watchdog.ident.identity,
    sizeof(watchdog.ident.identity), "%s watchdog",

    \
     
     \ /
      Last update: 2020-08-20 15:09    [W:4.109 / U:0.292 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site