Skip to contentSkip to conversation

watchdog: Fix omap watchdogs to enable the magic close bit

PATCH In review Tony Lindgren 6 participants 7 messages Oct 14, 2014 – Feb 2, 2015 2 messages not in the archive Watchdog device drivers

lore
Share & tools
lore

Tony Lindgren

author
#0 lore raw

PATCH 1/1 watchdog: Fix omap watchdogs to enable the magic close bit

This allows testing the watchdog easily with distros just by doing pkill -9 watchdog.

Reported-by Thomas Dziedzic <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>
drivers/watchdog/omap_wdt.c +1 -1
@@ -189,7 +189,7 @@ static int omap_wdt_set_timeout(struct watchdog_device *wdog,
 }
 
 static const struct watchdog_info omap_wdt_info = {
-	.options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
+	.options = WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE | WDIOF_KEEPALIVEPING,
 	.identity = "OMAP Watchdog",
 };
drivers/watchdog/retu_wdt.c +1 -1
@@ -94,7 +94,7 @@ static int retu_wdt_set_timeout(struct watchdog_device *wdog,
 }
 
 static const struct watchdog_info retu_wdt_info = {
-	.options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
+	.options = WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE | WDIOF_KEEPALIVEPING,
 	.identity = "Retu watchdog",
 };
drivers/watchdog/twl4030_wdt.c +1 -1
@@ -57,7 +57,7 @@ static int twl4030_wdt_set_timeout(struct watchdog_device *wdt,
 }
 
 static const struct watchdog_info twl4030_wdt_info = {
-	.options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
+	.options = WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE | WDIOF_KEEPALIVEPING,
 	.identity = "TWL4030 Watchdog",
 };
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Tony Lindgren

This allows testing the watchdog easily with distros just by doing pkill -9 watchdog.

Reported-by Thomas Dziedzic <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>

Good catch.

Reviewed-by Guenter Roeck <[email protected]>
Quoted 37 lines
drivers/watchdog/omap_wdt.c +1 -1
@@ -189,7 +189,7 @@ static int omap_wdt_set_timeout(struct watchdog_device *wdog,
 }
 
 static const struct watchdog_info omap_wdt_info = {
-	.options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
+	.options = WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE | WDIOF_KEEPALIVEPING,
 	.identity = "OMAP Watchdog",
 };
drivers/watchdog/retu_wdt.c +1 -1
@@ -94,7 +94,7 @@ static int retu_wdt_set_timeout(struct watchdog_device *wdog,
 }
 
 static const struct watchdog_info retu_wdt_info = {
-	.options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
+	.options = WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE | WDIOF_KEEPALIVEPING,
 	.identity = "Retu watchdog",
 };
drivers/watchdog/twl4030_wdt.c +1 -2
@@ -57,7 +57,7 @@ static int twl4030_wdt_set_timeout(struct watchdog_device *wdt,
 }
 
 static const struct watchdog_info twl4030_wdt_info = {
-	.options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
+	.options = WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE | WDIOF_KEEPALIVEPING,
 	.identity = "TWL4030 Watchdog",
 };
 
--

To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Reviewed-by on v1 1/1
#3 lore raw
In reply to Tony Lindgren
Quoted 5 lines · Tony Lindgren

This allows testing the watchdog easily with distros just by doing pkill -9 watchdog.

Reported-by Thomas Dziedzic <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>
Reviewed-by Felipe Balbi <[email protected]>
Quoted 38 lines
drivers/watchdog/omap_wdt.c +1 -1
@@ -189,7 +189,7 @@ static int omap_wdt_set_timeout(struct watchdog_device *wdog,
 }
 
 static const struct watchdog_info omap_wdt_info = {
-	.options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
+	.options = WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE | WDIOF_KEEPALIVEPING,
 	.identity = "OMAP Watchdog",
 };
drivers/watchdog/retu_wdt.c +1 -1
@@ -94,7 +94,7 @@ static int retu_wdt_set_timeout(struct watchdog_device *wdog,
 }
 
 static const struct watchdog_info retu_wdt_info = {
-	.options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
+	.options = WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE | WDIOF_KEEPALIVEPING,
 	.identity = "Retu watchdog",
 };
drivers/watchdog/twl4030_wdt.c +1 -2
@@ -57,7 +57,7 @@ static int twl4030_wdt_set_timeout(struct watchdog_device *wdt,
 }
 
 static const struct watchdog_info twl4030_wdt_info = {
-	.options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
+	.options = WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE | WDIOF_KEEPALIVEPING,
 	.identity = "TWL4030 Watchdog",
 };
 
--

To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Signature · 1 line
balbi

A message that is not in the archive (sent off-list or not yet received): [email protected]

#5 lore raw
Quoted 5 lines · Tony Lindgren

This allows testing the watchdog easily with distros just by doing pkill -9 watchdog.

Reported-by Thomas Dziedzic <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>

Wim, still not seeing this applied, did you forget about this one?

Regards,

Tony

Quoted 34 lines
drivers/watchdog/omap_wdt.c +1 -1
@@ -189,7 +189,7 @@ static int omap_wdt_set_timeout(struct watchdog_device *wdog,
 }
 
 static const struct watchdog_info omap_wdt_info = {
-	.options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
+	.options = WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE | WDIOF_KEEPALIVEPING,
 	.identity = "OMAP Watchdog",
 };
drivers/watchdog/retu_wdt.c +1 -1
@@ -94,7 +94,7 @@ static int retu_wdt_set_timeout(struct watchdog_device *wdog,
 }
 
 static const struct watchdog_info retu_wdt_info = {
-	.options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
+	.options = WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE | WDIOF_KEEPALIVEPING,
 	.identity = "Retu watchdog",
 };
drivers/watchdog/twl4030_wdt.c +1 -2
@@ -57,7 +57,7 @@ static int twl4030_wdt_set_timeout(struct watchdog_device *wdt,
 }
 
 static const struct watchdog_info twl4030_wdt_info = {
-	.options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
+	.options = WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE | WDIOF_KEEPALIVEPING,
 	.identity = "TWL4030 Watchdog",
 };
 
--
Quoted 4 lines

To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): [email protected]

#7 lore raw

Hi Tony,

Quoted 8 lines · Tony Lindgren
Quoted 5 lines

This allows testing the watchdog easily with distros just by doing pkill -9 watchdog.

Reported-by Thomas Dziedzic <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>

Wim, still not seeing this applied, did you forget about this one?

I just applied it to linux-watchdog-next. Didn't forgot about it, just didn't had the time yet.

Kind regards,
Wim.

--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

author
#8 lore raw
Quoted 6 lines · Wim Van Sebroeck

Hi Tony,

Quoted 4 lines · Tony Lindgren
Quoted 3 lines

This allows testing the watchdog easily with distros just by doing pkill -9 watchdog.

Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
Reported-by Thomas Dziedzic <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>

Wim, still not seeing this applied, did you forget about this one?

I just applied it to linux-watchdog-next. Didn't forgot about it, just didn't had the time yet.

OK thanks!

Tony