From nobody Sun May 24 20:33:25 2026 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B97AC3876C1 for ; Fri, 22 May 2026 23:26:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779492375; cv=none; b=OATg/YOFrVTvCWfcnYZQQx7gg8Jhg1J/SwzZYQVBrMRZs/Xa7nEWjmwYDvFjjRcL2lKlFR1QUC38Xz9JmWA6yaG3GLRi1tgnR1P6ECUlpM2DZlGqP/V00kPV76h8rv8i98+FDMFMXVs17PmFPICh4U3yOhuCVBr77Nua5Hn/WVQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779492375; c=relaxed/simple; bh=b7hZEdF9gGm5SUGjirtVoYQHtnJkko9xW3itleM/3Xc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LNLSYOeQ5Ws3ill/xdrHczU54N6BBf6cmhZWt9Zq/L+kQsaZ+P9Ks6MljKvH5asB1NUbaRRZzKygXMfjmHyGjiw7fP2rKezvGFf6r0L6YfRFgJ/oMAbgX1UxyNjWRZWIn4Oo+bqrLbyVeGiRPSOmvX0jkUtPLu6vYnkX4Ke/K+U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=UqIaYwU/; arc=none smtp.client-ip=209.85.210.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UqIaYwU/" Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-82fbdd60b64so6558151b3a.3 for ; Fri, 22 May 2026 16:26:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779492373; x=1780097173; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yLbBePjPrv6qNDD1/f9ZKyQ/SjpAXnBSe6vKkphP87A=; b=UqIaYwU/51to5YEh47UZaBQSog9Ai48mz2p3t1ZUl0mJlbYJvBdgD5MZX8oVpjV0Vv tPEryylaK5IMhKfuJ8KIzGtB2Wjxm6DNSMVhMe25CD0aZsDbDYsp4zV6ZzdtwWxbPlv5 eYp4Og2PN5KfIK1aJIHoH5xOkS8Vyhyj6fyLOTrA4LM9hItS8dL3aVwkhq2S6Nl8rO8l hpePgAKpvzxDyvIOSF/ypamN1PV+AzZPMBiI0Ni+Kd31WOfafL/EqnAvU0jCYYwX5TK8 LZgBnNXikkcBJE2mQJIlN2LKmbSgeIRH/ROfD/iHcZGUcwvd6oV8+0+/FyF6c8EmB6yR d4bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779492373; x=1780097173; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=yLbBePjPrv6qNDD1/f9ZKyQ/SjpAXnBSe6vKkphP87A=; b=OsaRXqFDQlqV5Jna61jG6NQ43QbpAoiw/cSz6v5sz4PZCB7d5Wt+KecFSMOEOupbTB YPwn9CIFx2moUBbEJivobKJ+Or3KnmxIact2Jix7ThZL4sL5SYHxZwcxJjrVdjrJyf91 ScHh89BE/otC5iP+hvtvgz26yqwloW0T0P6hPaANVX1RHvp7x/AvEVwFeQhT0dMfAYq6 dAIAE0kg+HeMohOgrOPPdxJpwAe4yJgDBaLvXGkm2BVxpPbUmFhI8dQSQDKcatxWjxUj Gng0s2EdO2yA+Gx5BshRaemMzwFaNEh6UQz+CDtA2AdqvcSdocUmhVmuHelYvG52Dxpf mQkA== X-Forwarded-Encrypted: i=1; AFNElJ8ZARjTANhVEECUce7ShNhAeHJjyHdVj20nBN5WiIPUGDo5u4ih88a51iuLiqaIrKFsiEusAvnG4cXyTCA=@vger.kernel.org X-Gm-Message-State: AOJu0Yxi26ma+G0KHV2qMb6EPEymbjKBuLPz7kNcxowB2pkGjYP0t+h5 g5btiHDigHqiisRXTJ8xDgXQfbJJ1K3SywZ6xihrAREfE1ja/HJ/SIO4 X-Gm-Gg: Acq92OG7brX5VqFXvo0oIx+RqwtdKGHBLuD8vmE4rRqPgPn3XPLQE5SwiGPhYGH+UCB 2dEDwt5dm/pwqcKrrJpJZle7F1wHbX9bPcTgUV135CA8kDXQ4nkxul+zc2eGNWhSI3/NmeDOwIv LKvt+xBfsFyLrmnzERf3zrFOEi3W3vIL76h/dUjobEdK+A6MyNxUzAyb5a0AtEI8iJDSUF4Xvui nOFTCIgQdNkWjwbqJJL4btyJvpHIQ2xJoLxLvJeZKgENi4KcL7vLrtzlRDAJEZPcJxuMkz0MOW8 pyji5wUDjfKkKeiROrxmm/Ouv4Kzs3vIEk34plx+JXUBEP4nF4EYDuSWQ05h3HWSha/80U8Mpz/ MYNM6Lh5wa7F42nuBipPRWGjxCIKtHZEwb1hlxpb2Swu1+oKe/j/+DbmAG8nuL2sSnPNdfJsn0/ 21uIQREWPdhfU/kStVzsU0ajXTlNeEH8zKx7JCBcvPDXeEnAtM1MH2IWb3tmT6BEa7fCnIx+U9h fD3qMLlVsBuDP2YRxAt9eqGnXUrwleSoDI= X-Received: by 2002:a05:6a00:138b:b0:83f:9c6:9c with SMTP id d2e1a72fcca58-8415f11f645mr6008369b3a.10.1779492372844; Fri, 22 May 2026 16:26:12 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84164ac99b0sm2898323b3a.4.2026.05.22.16.26.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2026 16:26:12 -0700 (PDT) From: Rosen Penev To: linux-watchdog@vger.kernel.org Cc: Wim Van Sebroeck , Guenter Roeck , linux-kernel@vger.kernel.org (open list) Subject: [PATCH 1/2] watchdog: ath79_wdt: select OF and COMPILE_TEST Date: Fri, 22 May 2026 16:25:52 -0700 Message-ID: <20260522232553.44748-2-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260522232553.44748-1-rosenp@gmail.com> References: <20260522232553.44748-1-rosenp@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This has always been an OF driver. Select OF in Kconfig. Add COMPILE_TEST for all platforms, not just ARM. Signed-off-by: Rosen Penev --- drivers/watchdog/Kconfig | 3 ++- drivers/watchdog/ath79_wdt.c | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 08cb8612d41f..8319c503319a 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -1785,7 +1785,8 @@ config M54xx_WATCHDOG =20 config ATH79_WDT tristate "Atheros AR71XX/AR724X/AR913X hardware watchdog" - depends on ATH79 || (ARM && COMPILE_TEST) + depends on ATH79 || COMPILE_TEST + depends on OF help Hardware driver for the built-in watchdog timer on the Atheros AR71XX/AR724X/AR913X SoCs. diff --git a/drivers/watchdog/ath79_wdt.c b/drivers/watchdog/ath79_wdt.c index 7df703e9852a..409a40b14901 100644 --- a/drivers/watchdog/ath79_wdt.c +++ b/drivers/watchdog/ath79_wdt.c @@ -295,13 +295,11 @@ static void ath79_wdt_shutdown(struct platform_device= *pdev) ath79_wdt_disable(); } =20 -#ifdef CONFIG_OF static const struct of_device_id ath79_wdt_match[] =3D { { .compatible =3D "qca,ar7130-wdt" }, {}, }; MODULE_DEVICE_TABLE(of, ath79_wdt_match); -#endif =20 static struct platform_driver ath79_wdt_driver =3D { .probe =3D ath79_wdt_probe, @@ -309,7 +307,7 @@ static struct platform_driver ath79_wdt_driver =3D { .shutdown =3D ath79_wdt_shutdown, .driver =3D { .name =3D DRIVER_NAME, - .of_match_table =3D of_match_ptr(ath79_wdt_match), + .of_match_table =3D ath79_wdt_match, }, }; =20 --=20 2.54.0 From nobody Sun May 24 20:33:25 2026 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6443131326C for ; Fri, 22 May 2026 23:26:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779492377; cv=none; b=boPIPMDFaQdFkVaz99SQuYZH3wRWnIMPydrxLWfXRG4nmRq5KS6HSfeNH3WN0mAFQRU+/gxFCK97tfLXfSi7SsjCyVsu0ErU3AnB66MelsmzrKYh80Y/akretmrr/v59G4ro18FHl4saoXSnQbBKUhC2Wv6HnjEqowVj1l8dOgw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779492377; c=relaxed/simple; bh=ljxxA/MiAeqjnFRa/x5wsuu4xcbnEH5O0bHgT4G5UUA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uduhyR1I4sMw8zFhrThaoTQ8eL0k8fR5T+i1TLpjYHj/IUkI5m8adC9ETNzZ62ZL1TXv9dtH31iuQTt/8FHQ8I+cz7h8PbKANvTdm83fMzQjhBQlRBCfmorRbgz/kMNlRd09VAU+qOv/YtgCybYVB+KZZytfGOObJewLVnRRmQg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=C1EmvlGw; arc=none smtp.client-ip=209.85.210.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="C1EmvlGw" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-835b78c3797so3503749b3a.2 for ; Fri, 22 May 2026 16:26:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779492374; x=1780097174; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=et4iMYWPR8kPY1AxwvYOYkHWsRcmwMD2r6+/6NYftHw=; b=C1EmvlGwRmwzuy9X5hcLtBHjKaQbkNe7JA0klYnMl1cNJk3jJzSWJrZbs+/N9jhU+2 L5zQY1Mp6yVx8P4yEzsvvM99ZR8VFyMSmJ1OQfN9XRuJ0auyHmjMbqgL5dxleX6l4UcZ SY9BZ2/fP3ifKvXKVXjnIAnasAbtB/WIrDl8QYb73FTldqh0mQL/egI+rV+I74C/yZ8z +HcWLg9V9bD5WySS9uMdiyzRXp4UK3lncg7oZrlHzjEKoHx9B0RW6uCfxR43XyKZGTQt k2DxbZcMnc3zoibQy4N5zJNPv0kZ+ZH+HBOfBOYdiXvPfYEcsRZW6VSLyls8JqSqtz0C pEcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779492374; x=1780097174; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=et4iMYWPR8kPY1AxwvYOYkHWsRcmwMD2r6+/6NYftHw=; b=gtKQ9gAjYpM3E6wW1JUUi5lwLER6y6TIv9oyieTE8qKUDT0FRIkCd4pfxdMAkqUmhM qX2JIADNdkvjdYCWMaWCHoLXwFin1xWc7FseCMOcGVnfxtlkL083EcHSDMZJh9u4Rg61 FrJd/lnZRRDHPUEZgQY1pNn/rb/bTTwsaRQNO+H7mRGRjUrJnfh8F2WAYzwav1JGXnPh jQkcCfN4aCxMcG2DsjYROVLpNuPyqc27mAjMV6+5xAg3WfcOKODKW/7rTG7N7TbzvnFC 6aDfqkw8UimcV4EYMwZF6BDG1axG90MnO5fjzreg03uT+idGXUx7ZaqQ2nULMerLdwnx 3+hg== X-Forwarded-Encrypted: i=1; AFNElJ/CnEzGLIIvU02OCLFbOL7FI37FZVL85VldObjT0LFqptR/Nf9Pb8X9+B7PCDgrsQVxqEA1fPF28SwLzwo=@vger.kernel.org X-Gm-Message-State: AOJu0YydGHDpVgJzhigHFjJaPx/A1dYB+xjuVoiviX1Eo0REyaJqkWeB SvK5iIElktHupqjm1wGoVttkbmaw7fdDcyxSKdnyn3eTVn92jNTTRcowX6/oaQ== X-Gm-Gg: Acq92OG9VZXP7K/aQ+mDDn6WWOThv3xwZmMcHliTze9I2sfS+KMUguVke5Z4gydlUAG N1koh3rh6nI2/o+lUeA2IWm5bqx/cEGbu9bYv1k+OnUiA9HiTIBrjkP4OAdl+3nsocH9ndPKzrM tCrBCLo2EtNDyPe5extGcHEFnS/I/Xfu53OIlSW1KwPJghFysAXz/L2fbZD+GN/Rxs170DOpyzy YS2G08D+BKKFXnVsBeSu8dni6gKHTBqmVDdp5/fG+3AFdR8OhYyhu2r/KYghT4luR21HLrHFcFp QhkjwggSGepv9HSnFXW6LOlM6ehW5nDumHBi6g8lLH8xOfvUp6s5gMzpNZpIzT2c1xEdAkQX0pq kV+ESP+XVDXZNMON5u0SLEIsJBeqeFwkKNaUNwSDuwKIEpJ6fC4lVm3dXwnLEjkgp3QHPC4bHY7 VkkwxSLbyRs75cr7zieFO3ydYLNuim/PnE1j3GFxnyq3+W9xQvm0qJUPYE0jnRmRL5wuEi3aq2M JOpaTjh7MvPZ5LabpF46O94Xqcjp5FbRLdYPXDjt+E/PQ== X-Received: by 2002:a05:6a00:ad07:b0:83f:2568:d456 with SMTP id d2e1a72fcca58-8415f30c0c0mr5759217b3a.29.1779492374524; Fri, 22 May 2026 16:26:14 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84164ac99b0sm2898323b3a.4.2026.05.22.16.26.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2026 16:26:13 -0700 (PDT) From: Rosen Penev To: linux-watchdog@vger.kernel.org Cc: Wim Van Sebroeck , Guenter Roeck , linux-kernel@vger.kernel.org (open list) Subject: [PATCH 2/2] watchdog: ath79: convert to watchdog_device Date: Fri, 22 May 2026 16:25:53 -0700 Message-ID: <20260522232553.44748-3-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260522232553.44748-1-rosenp@gmail.com> References: <20260522232553.44748-1-rosenp@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Converts from the legacy miscdevice/file_operations interface to the watchdog_device framework, simplifying the driver and properly handling EPROBE_DEFER. Use wdd->timeout in all callbacks instead of a global, fix get_timeleft() to return seconds instead of raw clock ticks, store max_timeout in the watchdog_device struct, wire up nowayout via watchdog_set_nowayout(), pass the module parameter to watchdog_init_timeout(), add .owner to watchdog_ops, and remove the leftover file-ops state (wdt_flags and the busy/expect-close bits). Tested on an Archer C7v2. sysupgrade watchdog handoff works fine. Assisted-by: Claude:Sonnet-4.6 Signed-off-by: Rosen Penev --- drivers/watchdog/ath79_wdt.c | 244 +++++++++++------------------------ 1 file changed, 73 insertions(+), 171 deletions(-) diff --git a/drivers/watchdog/ath79_wdt.c b/drivers/watchdog/ath79_wdt.c index 409a40b14901..eeb7c33377fb 100644 --- a/drivers/watchdog/ath79_wdt.c +++ b/drivers/watchdog/ath79_wdt.c @@ -15,13 +15,10 @@ =20 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt =20 -#include #include #include -#include #include #include -#include #include #include #include @@ -31,7 +28,6 @@ #include #include #include -#include =20 #define DRIVER_NAME "ath79-wdt" =20 @@ -57,37 +53,32 @@ module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds " "(default=3D" __MODULE_STRING(WDT_TIMEOUT) "s)"); =20 -static unsigned long wdt_flags; - -#define WDT_FLAGS_BUSY 0 -#define WDT_FLAGS_EXPECT_CLOSE 1 - -static struct clk *wdt_clk; -static unsigned long wdt_freq; -static int boot_status; -static int max_timeout; -static void __iomem *wdt_base; +struct ath79_wdt { + void __iomem *base; + unsigned long freq; + struct watchdog_device wdd; +}; =20 -static inline void ath79_wdt_wr(unsigned reg, u32 val) +static inline void ath79_wdt_wr(struct ath79_wdt *wdt, unsigned int reg, u= 32 val) { - iowrite32(val, wdt_base + reg); + iowrite32(val, wdt->base + reg); } =20 -static inline u32 ath79_wdt_rr(unsigned reg) +static inline u32 ath79_wdt_rr(struct ath79_wdt *wdt, unsigned int reg) { - return ioread32(wdt_base + reg); + return ioread32(wdt->base + reg); } =20 -static inline void ath79_wdt_keepalive(void) +static inline void ath79_wdt_keepalive(struct ath79_wdt *wdt, unsigned int= timeout) { - ath79_wdt_wr(WDOG_REG_TIMER, wdt_freq * timeout); + ath79_wdt_wr(wdt, WDOG_REG_TIMER, wdt->freq * timeout); /* flush write */ - ath79_wdt_rr(WDOG_REG_TIMER); + ath79_wdt_rr(wdt, WDOG_REG_TIMER); } =20 -static inline void ath79_wdt_enable(void) +static inline void ath79_wdt_enable(struct ath79_wdt *wdt, unsigned int ti= meout) { - ath79_wdt_keepalive(); + ath79_wdt_keepalive(wdt, timeout); =20 /* * Updating the TIMER register requires a few microseconds @@ -97,202 +88,115 @@ static inline void ath79_wdt_enable(void) */ udelay(2); =20 - ath79_wdt_wr(WDOG_REG_CTRL, WDOG_CTRL_ACTION_FCR); + ath79_wdt_wr(wdt, WDOG_REG_CTRL, WDOG_CTRL_ACTION_FCR); /* flush write */ - ath79_wdt_rr(WDOG_REG_CTRL); + ath79_wdt_rr(wdt, WDOG_REG_CTRL); } =20 -static inline void ath79_wdt_disable(void) +static inline void ath79_wdt_disable(struct ath79_wdt *wdt) { - ath79_wdt_wr(WDOG_REG_CTRL, WDOG_CTRL_ACTION_NONE); + ath79_wdt_wr(wdt, WDOG_REG_CTRL, WDOG_CTRL_ACTION_NONE); /* flush write */ - ath79_wdt_rr(WDOG_REG_CTRL); + ath79_wdt_rr(wdt, WDOG_REG_CTRL); } =20 -static int ath79_wdt_set_timeout(int val) +static int ath79_wdt_ping(struct watchdog_device *wdd) { - if (val < 1 || val > max_timeout) - return -EINVAL; + struct ath79_wdt *wdt =3D watchdog_get_drvdata(wdd); =20 - timeout =3D val; - ath79_wdt_keepalive(); + ath79_wdt_keepalive(wdt, wdd->timeout); =20 return 0; } =20 -static int ath79_wdt_open(struct inode *inode, struct file *file) +static int ath79_wdt_set_timeout(struct watchdog_device *wdd, unsigned int= val) { - if (test_and_set_bit(WDT_FLAGS_BUSY, &wdt_flags)) - return -EBUSY; + struct ath79_wdt *wdt =3D watchdog_get_drvdata(wdd); =20 - clear_bit(WDT_FLAGS_EXPECT_CLOSE, &wdt_flags); - ath79_wdt_enable(); + wdd->timeout =3D val; + ath79_wdt_keepalive(wdt, val); =20 - return stream_open(inode, file); + return 0; } =20 -static int ath79_wdt_release(struct inode *inode, struct file *file) +static int ath79_wdt_start(struct watchdog_device *wdd) { - if (test_bit(WDT_FLAGS_EXPECT_CLOSE, &wdt_flags)) - ath79_wdt_disable(); - else { - pr_crit("device closed unexpectedly, watchdog timer will not stop!\n"); - ath79_wdt_keepalive(); - } + struct ath79_wdt *wdt =3D watchdog_get_drvdata(wdd); =20 - clear_bit(WDT_FLAGS_BUSY, &wdt_flags); - clear_bit(WDT_FLAGS_EXPECT_CLOSE, &wdt_flags); + ath79_wdt_enable(wdt, wdd->timeout); =20 return 0; } =20 -static ssize_t ath79_wdt_write(struct file *file, const char *data, - size_t len, loff_t *ppos) +static unsigned int ath79_wdt_get_timeleft(struct watchdog_device *wdd) { - if (len) { - if (!nowayout) { - size_t i; - - clear_bit(WDT_FLAGS_EXPECT_CLOSE, &wdt_flags); + struct ath79_wdt *wdt =3D watchdog_get_drvdata(wdd); =20 - for (i =3D 0; i !=3D len; i++) { - char c; - - if (get_user(c, data + i)) - return -EFAULT; + return ath79_wdt_rr(wdt, WDOG_REG_TIMER) / wdt->freq; +} =20 - if (c =3D=3D 'V') - set_bit(WDT_FLAGS_EXPECT_CLOSE, - &wdt_flags); - } - } +static int ath79_wdt_stop(struct watchdog_device *wdd) +{ + struct ath79_wdt *wdt =3D watchdog_get_drvdata(wdd); =20 - ath79_wdt_keepalive(); - } + ath79_wdt_disable(wdt); =20 - return len; + return 0; } =20 static const struct watchdog_info ath79_wdt_info =3D { - .options =3D WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | - WDIOF_MAGICCLOSE | WDIOF_CARDRESET, - .firmware_version =3D 0, - .identity =3D "ATH79 watchdog", + .options =3D WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_CARDRESET, + .firmware_version =3D 0, + .identity =3D "ATH79 watchdog", }; =20 -static long ath79_wdt_ioctl(struct file *file, unsigned int cmd, - unsigned long arg) -{ - void __user *argp =3D (void __user *)arg; - int __user *p =3D argp; - int err; - int t; - - switch (cmd) { - case WDIOC_GETSUPPORT: - err =3D copy_to_user(argp, &ath79_wdt_info, - sizeof(ath79_wdt_info)) ? -EFAULT : 0; - break; - - case WDIOC_GETSTATUS: - err =3D put_user(0, p); - break; - - case WDIOC_GETBOOTSTATUS: - err =3D put_user(boot_status, p); - break; - - case WDIOC_KEEPALIVE: - ath79_wdt_keepalive(); - err =3D 0; - break; - - case WDIOC_SETTIMEOUT: - err =3D get_user(t, p); - if (err) - break; - - err =3D ath79_wdt_set_timeout(t); - if (err) - break; - fallthrough; - - case WDIOC_GETTIMEOUT: - err =3D put_user(timeout, p); - break; - - default: - err =3D -ENOTTY; - break; - } - - return err; -} - -static const struct file_operations ath79_wdt_fops =3D { - .owner =3D THIS_MODULE, - .write =3D ath79_wdt_write, - .unlocked_ioctl =3D ath79_wdt_ioctl, - .compat_ioctl =3D compat_ptr_ioctl, - .open =3D ath79_wdt_open, - .release =3D ath79_wdt_release, -}; - -static struct miscdevice ath79_wdt_miscdev =3D { - .minor =3D WATCHDOG_MINOR, - .name =3D "watchdog", - .fops =3D &ath79_wdt_fops, +static const struct watchdog_ops ath79_wdt_ops =3D { + .owner =3D THIS_MODULE, + .start =3D ath79_wdt_start, + .stop =3D ath79_wdt_stop, + .ping =3D ath79_wdt_ping, + .set_timeout =3D ath79_wdt_set_timeout, + .get_timeleft =3D ath79_wdt_get_timeleft, }; =20 static int ath79_wdt_probe(struct platform_device *pdev) { + struct ath79_wdt *wdt; + struct clk *wdt_clk; u32 ctrl; - int err; =20 - if (wdt_base) - return -EBUSY; + wdt =3D devm_kzalloc(&pdev->dev, sizeof(*wdt), GFP_KERNEL); + if (!wdt) + return -ENOMEM; =20 - wdt_base =3D devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(wdt_base)) - return PTR_ERR(wdt_base); + wdt->base =3D devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(wdt->base)) + return PTR_ERR(wdt->base); =20 wdt_clk =3D devm_clk_get_enabled(&pdev->dev, "wdt"); if (IS_ERR(wdt_clk)) return PTR_ERR(wdt_clk); =20 - wdt_freq =3D clk_get_rate(wdt_clk); - if (!wdt_freq) + wdt->freq =3D clk_get_rate(wdt_clk); + if (!wdt->freq) return -EINVAL; =20 - max_timeout =3D (0xfffffffful / wdt_freq); - if (timeout < 1 || timeout > max_timeout) { - timeout =3D max_timeout; - dev_info(&pdev->dev, - "timeout value must be 0 < timeout < %d, using %d\n", - max_timeout, timeout); - } - - ctrl =3D ath79_wdt_rr(WDOG_REG_CTRL); - boot_status =3D (ctrl & WDOG_CTRL_LAST_RESET) ? WDIOF_CARDRESET : 0; + wdt->wdd.max_timeout =3D U32_MAX / wdt->freq; =20 - err =3D misc_register(&ath79_wdt_miscdev); - if (err) { - dev_err(&pdev->dev, - "unable to register misc device, err=3D%d\n", err); - return err; - } + ctrl =3D ath79_wdt_rr(wdt, WDOG_REG_CTRL); + wdt->wdd.bootstatus =3D (ctrl & WDOG_CTRL_LAST_RESET) ? WDIOF_CARDRESET := 0; =20 - return 0; -} + wdt->wdd.info =3D &ath79_wdt_info; + wdt->wdd.ops =3D &ath79_wdt_ops; + wdt->wdd.min_timeout =3D 1; + wdt->wdd.timeout =3D WDT_TIMEOUT; + watchdog_init_timeout(&wdt->wdd, timeout, &pdev->dev); + watchdog_set_nowayout(&wdt->wdd, nowayout); + watchdog_stop_on_reboot(&wdt->wdd); =20 -static void ath79_wdt_remove(struct platform_device *pdev) -{ - misc_deregister(&ath79_wdt_miscdev); -} + watchdog_set_drvdata(&wdt->wdd, wdt); =20 -static void ath79_wdt_shutdown(struct platform_device *pdev) -{ - ath79_wdt_disable(); + return devm_watchdog_register_device(&pdev->dev, &wdt->wdd); } =20 static const struct of_device_id ath79_wdt_match[] =3D { @@ -303,8 +207,6 @@ MODULE_DEVICE_TABLE(of, ath79_wdt_match); =20 static struct platform_driver ath79_wdt_driver =3D { .probe =3D ath79_wdt_probe, - .remove =3D ath79_wdt_remove, - .shutdown =3D ath79_wdt_shutdown, .driver =3D { .name =3D DRIVER_NAME, .of_match_table =3D ath79_wdt_match, @@ -314,7 +216,7 @@ static struct platform_driver ath79_wdt_driver =3D { module_platform_driver(ath79_wdt_driver); =20 MODULE_DESCRIPTION("Atheros AR71XX/AR724X/AR913X hardware watchdog driver"= ); -MODULE_AUTHOR("Gabor Juhos "); +MODULE_AUTHOR("Imre Kaloz "); MODULE_LICENSE("GPL v2"); MODULE_ALIAS("platform:" DRIVER_NAME); --=20 2.54.0