tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'linux-watchdog-4.17-rc2' of git://www.linux-watchdog.org/linux-watchdog

Pull watchdog fixes from Wim Van Sebroeck:

- fall-through fixes

- MAINTAINER change for hpwdt

- renesas-wdt: Add support for WDIOF_CARDRESET

- aspeed: set bootstatus during probe

* tag 'linux-watchdog-4.17-rc2' of git://www.linux-watchdog.org/linux-watchdog:
aspeed: watchdog: Set bootstatus during probe
watchdog: renesas-wdt: Add support for WDIOF_CARDRESET
watchdog: wafer5823wdt: Mark expected switch fall-through
watchdog: w83977f_wdt: Mark expected switch fall-through
watchdog: sch311x_wdt: Mark expected switch fall-through
watchdog: hpwdt: change maintainer.

Linus Torvalds e46096b6 6488ec26

+15 -6
+1 -1
MAINTAINERS
··· 6268 6268 F: drivers/media/usb/hdpvr/ 6269 6269 6270 6270 HEWLETT PACKARD ENTERPRISE ILO NMI WATCHDOG DRIVER 6271 - M: Jimmy Vance <jimmy.vance@hpe.com> 6271 + M: Jerry Hoemann <jerry.hoemann@hpe.com> 6272 6272 S: Supported 6273 6273 F: Documentation/watchdog/hpwdt.txt 6274 6274 F: drivers/watchdog/hpwdt.c
+7
drivers/watchdog/aspeed_wdt.c
··· 55 55 #define WDT_CTRL_WDT_INTR BIT(2) 56 56 #define WDT_CTRL_RESET_SYSTEM BIT(1) 57 57 #define WDT_CTRL_ENABLE BIT(0) 58 + #define WDT_TIMEOUT_STATUS 0x10 59 + #define WDT_TIMEOUT_STATUS_BOOT_SECONDARY BIT(1) 58 60 59 61 /* 60 62 * WDT_RESET_WIDTH controls the characteristics of the external pulse (if ··· 194 192 struct device_node *np; 195 193 const char *reset_type; 196 194 u32 duration; 195 + u32 status; 197 196 int ret; 198 197 199 198 wdt = devm_kzalloc(&pdev->dev, sizeof(*wdt), GFP_KERNEL); ··· 309 306 */ 310 307 writel(duration - 1, wdt->base + WDT_RESET_WIDTH); 311 308 } 309 + 310 + status = readl(wdt->base + WDT_TIMEOUT_STATUS); 311 + if (status & WDT_TIMEOUT_STATUS_BOOT_SECONDARY) 312 + wdt->wdd.bootstatus = WDIOF_CARDRESET; 312 313 313 314 ret = devm_watchdog_register_device(&pdev->dev, &wdt->wdd); 314 315 if (ret) {
+4 -2
drivers/watchdog/renesas_wdt.c
··· 121 121 } 122 122 123 123 static const struct watchdog_info rwdt_ident = { 124 - .options = WDIOF_MAGICCLOSE | WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT, 124 + .options = WDIOF_MAGICCLOSE | WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT | 125 + WDIOF_CARDRESET, 125 126 .identity = "Renesas WDT Watchdog", 126 127 }; 127 128 ··· 198 197 return PTR_ERR(clk); 199 198 200 199 pm_runtime_enable(&pdev->dev); 201 - 202 200 pm_runtime_get_sync(&pdev->dev); 203 201 priv->clk_rate = clk_get_rate(clk); 202 + priv->wdev.bootstatus = (readb_relaxed(priv->base + RWTCSRA) & 203 + RWTCSRA_WOVF) ? WDIOF_CARDRESET : 0; 204 204 pm_runtime_put(&pdev->dev); 205 205 206 206 if (!priv->clk_rate) {
+1 -1
drivers/watchdog/sch311x_wdt.c
··· 299 299 if (sch311x_wdt_set_heartbeat(new_timeout)) 300 300 return -EINVAL; 301 301 sch311x_wdt_keepalive(); 302 - /* Fall */ 302 + /* Fall through */ 303 303 case WDIOC_GETTIMEOUT: 304 304 return put_user(timeout, p); 305 305 default:
+1 -1
drivers/watchdog/w83977f_wdt.c
··· 427 427 return -EINVAL; 428 428 429 429 wdt_keepalive(); 430 - /* Fall */ 430 + /* Fall through */ 431 431 432 432 case WDIOC_GETTIMEOUT: 433 433 return put_user(timeout, uarg.i);
+1 -1
drivers/watchdog/wafer5823wdt.c
··· 178 178 timeout = new_timeout; 179 179 wafwdt_stop(); 180 180 wafwdt_start(); 181 - /* Fall */ 181 + /* Fall through */ 182 182 case WDIOC_GETTIMEOUT: 183 183 return put_user(timeout, p); 184 184