From nobody Thu Oct 2 20:27:49 2025 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) (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 8BE232DAFB1 for ; Fri, 12 Sep 2025 09:20:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757668838; cv=none; b=oovnr/jqp0LiKe5bgJe6kQh9L9zgNFba+JLVtMNxgH0yOW/BiR2Lk+E7PrC1Qst6b8Ye3vxS9DfDVS18hPp7oibhqEKb6WpE7S3nS6oLQFxh496XR9hXgKfXUPGsO89X8k5qGbeR3RGDLBK4scZJua0qt0fzu+Y5mXw6kHB6Ao0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757668838; c=relaxed/simple; bh=XHDjW/wNxNefieirIku9nqenuGi3hugPiqlbiOGBXww=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=T1BAVOienyCXInCDZLFNtxs6DWsrtJh3JsHcx42Eun18tDSsjwIKHZ7SPT607lOjV6hMReKUdjzInVcF4K29YlR+x7fTkHJd0010qCZqVj8Ue/77bg6f9GCyU7H+rDXxDEs1PiLI6v+vM6XLlXuUS5sS/VpLUkIz//8ZheYKEsU= 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=Q71QeADW; arc=none smtp.client-ip=209.85.210.178 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="Q71QeADW" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-7761b392d50so113514b3a.0 for ; Fri, 12 Sep 2025 02:20:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757668835; x=1758273635; 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=Sou0t32baZGB/gx7eFQ0Qu1pCOQaf+XXBy5bTuaz/cA=; b=Q71QeADWDL5KPRP7clMcdShl3XIJcuFkhj0sBFF/ErBiQwQxo3QMBv62fHFEE8lbmi hv4/fKp3j/e15wj0+3fDN4ZXTTjvIQ29xDiWA8IBh3ULVx7NiHVjIW3rGCRB603Mx9jv WAEN6QIvEt3jtfZhrOhuHg/jaJxp7F2du3SDEONPi52Iq3xe9UEofSzUCn7JQtE+9Js4 n7xEwF/80XiDDouWX8LOcuv0yKyOWfH8GX1L7nMl4gLSHdMzTReJpQGNdiwhinYB+E7J MLtOFrqOlBhJDs/hn6K7ZmIUhEsrrbBBlEjrXLdoEdzBwvE362j/6KjvKOvpw+X3dD/N +APQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757668835; x=1758273635; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Sou0t32baZGB/gx7eFQ0Qu1pCOQaf+XXBy5bTuaz/cA=; b=Rop7UTdumnZoxw2VEiv8PPRSjcEMtdY/msqA6ZN74TLBoCFsYkNki6G1gJDGMMHJwa dFtb4+l8FZoKiUEo62ZYN5ZRHHbd5NADajVzWxldbC8TVJpHZNFYaglsYYG6Ip7ny5JP IfgfWRyJMp2u+mXo4IAMPLgS9rRlWRxsKdiddh0EXZngKhxChS2QQOvRrqqa8mVjCfSO au1eeoxyA847ZKSGYJlTKC1I2y3tHSHnC1RAQ2sq8dqm3ZNGRRuc+J26VYDVFXi2QvkN R9YQV5KVS7KGSi9VNwNBM2ZGHURSRMlHZ3XBd5kSt65hGqT7WSAi+S9y6NJj4n2GCaZf 7f4g== X-Gm-Message-State: AOJu0YzrUrT7nwX/7Yrh38tgOo7y6m4LjoIRnB6GvnbuUinEd9RuYq+Q LVxyr2dxulFJAP93LphS/g0/XXPPOfcgbxbxl5FfHnKPJIhzEzCZTPSd X-Gm-Gg: ASbGncuqscMjaumVFRIbHL9VyBcOD4eFm24FTQsIctPzywEJTNxB9H2Aura9KTnqTF9 fPyleeCYc59UAV+ITmLbijrtYTOpVPrV0fQzVARIBKL4rVCDIOVdaoyn8chBzEMgXHE2rkBQvqa uDbDblc/M+stnG09EtJkJ2O0kAxjaWA1/w/MUiR47e1nlCft0rjJlZRxNgUgrBBk7Lr4jv9PJQS YwTMXXnItV5RT5N2NeMmZuZ6z9OxRZyjnn3BSoWkhDCx30VcXgML3T/1O47llE0uSTyaM8RyEgQ d5C5D4TTEZLbLqGu7svR0D9UluzncYUQAg2U9lzWrH9+xBrA/5td0du2wcrOSchBq7paqgVfhoq qtOAiyH0s+/iW3FgVsonbg45nXv3l9r25SHN0G8VRpZ1RcJXvnKy3y+0TGSmSOlAhvOsIN1UDd4 PU X-Google-Smtp-Source: AGHT+IFarZaqBIOCDVhUTwGs0hcK3RrcME2XeoEtQ9swwbf34sveLAXrrteQfQV6TYp/Cz0QEmm6aA== X-Received: by 2002:a05:6a20:e293:b0:24c:1f78:1803 with SMTP id adf61e73a8af0-2602c04a6a1mr3027944637.38.1757668834551; Fri, 12 Sep 2025 02:20:34 -0700 (PDT) Received: from hcdev-d520mt2.. (60-250-196-139.hinet-ip.hinet.net. [60.250.196.139]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b54a36dc461sm4066564a12.23.2025.09.12.02.20.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Sep 2025 02:20:34 -0700 (PDT) From: a0282524688@gmail.com To: tmyu0@nuvoton.com, lee@kernel.org, linus.walleij@linaro.org, brgl@bgdev.pl, andi.shyti@kernel.org, mkl@pengutronix.de, mailhol.vincent@wanadoo.fr, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, wim@linux-watchdog.org, linux@roeck-us.net, jdelvare@suse.com, alexandre.belloni@bootlin.com Cc: linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, linux-i2c@vger.kernel.org, linux-can@vger.kernel.org, netdev@vger.kernel.org, linux-watchdog@vger.kernel.org, linux-hwmon@vger.kernel.org, linux-rtc@vger.kernel.org, linux-usb@vger.kernel.org, Ming Yu Subject: [PATCH RESEND v14 5/7] watchdog: Add Nuvoton NCT6694 WDT support Date: Fri, 12 Sep 2025 17:19:50 +0800 Message-Id: <20250912091952.1169369-6-a0282524688@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250912091952.1169369-1-a0282524688@gmail.com> References: <20250912091952.1169369-1-a0282524688@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" From: Ming Yu This driver supports Watchdog timer functionality for NCT6694 MFD device based on USB interface. Acked-by: Guenter Roeck Signed-off-by: Ming Yu --- Changes since version 13: Changes since version 12: - Implement IDA in MFD driver to handle per-device IDs - Use same email address in the signaturei Changes since version 11: - Use platform_device's id to replace IDA Changes since version 10: - Implement IDA to allocate id - Add module parameters to configure WDT's timeout and pretimeout value Changes since version 9: Changes since version 8: - Modify the signed-off-by with my work address Changes since version 7: - Add error handling for devm_mutex_init() Changes since version 6: - Fix warning Changes since version 5: - Modify the module name and the driver name consistently Changes since version 4: - Modify arguments in read/write function to a pointer to cmd_header - Modify all callers that call the read/write function Changes since version 3: - Modify array buffer to structure - Fix defines and comments - Modify mutex_init() to devm_mutex_init() - Drop watchdog_init_timeout() Changes since version 2: - Add MODULE_ALIAS() - Modify the pretimeout validation procedure Changes since version 1: - Add each driver's command structure - Fix platform driver registration - Fix warnings - Drop unnecessary logs - Modify start() function to setup device MAINTAINERS | 1 + drivers/watchdog/Kconfig | 11 ++ drivers/watchdog/Makefile | 1 + drivers/watchdog/nct6694_wdt.c | 307 +++++++++++++++++++++++++++++++++ 4 files changed, 320 insertions(+) create mode 100644 drivers/watchdog/nct6694_wdt.c diff --git a/MAINTAINERS b/MAINTAINERS index 758c9a67184e..4639d5933c5e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -18089,6 +18089,7 @@ F: drivers/gpio/gpio-nct6694.c F: drivers/i2c/busses/i2c-nct6694.c F: drivers/mfd/nct6694.c F: drivers/net/can/usb/nct6694_canfd.c +F: drivers/watchdog/nct6694_wdt.c F: include/linux/mfd/nct6694.h =20 NUVOTON NCT7201 IIO DRIVER diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 0c25b2ed44eb..05008d937e40 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -760,6 +760,17 @@ config MAX77620_WATCHDOG MAX77620 chips. To compile this driver as a module, choose M here: the module will be called max77620_wdt. =20 +config NCT6694_WATCHDOG + tristate "Nuvoton NCT6694 watchdog support" + depends on MFD_NCT6694 + select WATCHDOG_CORE + help + Say Y here to support Nuvoton NCT6694 watchdog timer + functionality. + + This driver can also be built as a module. If so, the module + will be called nct6694_wdt. + config IMX2_WDT tristate "IMX2+ Watchdog" depends on ARCH_MXC || ARCH_LAYERSCAPE || COMPILE_TEST diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index bbd4d62d2cc3..b680e4d3c1bc 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -235,6 +235,7 @@ obj-$(CONFIG_WM831X_WATCHDOG) +=3D wm831x_wdt.o obj-$(CONFIG_WM8350_WATCHDOG) +=3D wm8350_wdt.o obj-$(CONFIG_MAX63XX_WATCHDOG) +=3D max63xx_wdt.o obj-$(CONFIG_MAX77620_WATCHDOG) +=3D max77620_wdt.o +obj-$(CONFIG_NCT6694_WATCHDOG) +=3D nct6694_wdt.o obj-$(CONFIG_ZIIRAVE_WATCHDOG) +=3D ziirave_wdt.o obj-$(CONFIG_SOFT_WATCHDOG) +=3D softdog.o obj-$(CONFIG_MENF21BMC_WATCHDOG) +=3D menf21bmc_wdt.o diff --git a/drivers/watchdog/nct6694_wdt.c b/drivers/watchdog/nct6694_wdt.c new file mode 100644 index 000000000000..bc3689bd4b6b --- /dev/null +++ b/drivers/watchdog/nct6694_wdt.c @@ -0,0 +1,307 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Nuvoton NCT6694 WDT driver based on USB interface. + * + * Copyright (C) 2025 Nuvoton Technology Corp. + */ + +#include +#include +#include +#include +#include +#include +#include + +#define DEVICE_NAME "nct6694-wdt" + +#define NCT6694_DEFAULT_TIMEOUT 10 +#define NCT6694_DEFAULT_PRETIMEOUT 0 + +#define NCT6694_WDT_MAX_DEVS 2 + +/* + * USB command module type for NCT6694 WDT controller. + * This defines the module type used for communication with the NCT6694 + * WDT controller over the USB interface. + */ +#define NCT6694_WDT_MOD 0x07 + +/* Command 00h - WDT Setup */ +#define NCT6694_WDT_SETUP 0x00 +#define NCT6694_WDT_SETUP_SEL(idx) (idx ? 0x01 : 0x00) + +/* Command 01h - WDT Command */ +#define NCT6694_WDT_COMMAND 0x01 +#define NCT6694_WDT_COMMAND_SEL(idx) (idx ? 0x01 : 0x00) + +static unsigned int timeout[NCT6694_WDT_MAX_DEVS] =3D { + [0 ... (NCT6694_WDT_MAX_DEVS - 1)] =3D NCT6694_DEFAULT_TIMEOUT +}; +module_param_array(timeout, int, NULL, 0644); +MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds"); + +static unsigned int pretimeout[NCT6694_WDT_MAX_DEVS] =3D { + [0 ... (NCT6694_WDT_MAX_DEVS - 1)] =3D NCT6694_DEFAULT_PRETIMEOUT +}; +module_param_array(pretimeout, int, NULL, 0644); +MODULE_PARM_DESC(pretimeout, "Watchdog pre-timeout in seconds"); + +static bool nowayout =3D WATCHDOG_NOWAYOUT; +module_param(nowayout, bool, 0); +MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (defau= lt=3D" + __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + +enum { + NCT6694_ACTION_NONE =3D 0, + NCT6694_ACTION_SIRQ, + NCT6694_ACTION_GPO, +}; + +struct __packed nct6694_wdt_setup { + __le32 pretimeout; + __le32 timeout; + u8 owner; + u8 scratch; + u8 control; + u8 status; + __le32 countdown; +}; + +struct __packed nct6694_wdt_cmd { + __le32 wdt_cmd; + __le32 reserved; +}; + +union __packed nct6694_wdt_msg { + struct nct6694_wdt_setup setup; + struct nct6694_wdt_cmd cmd; +}; + +struct nct6694_wdt_data { + struct watchdog_device wdev; + struct device *dev; + struct nct6694 *nct6694; + union nct6694_wdt_msg *msg; + unsigned char wdev_idx; +}; + +static int nct6694_wdt_setting(struct watchdog_device *wdev, + u32 timeout_val, u8 timeout_act, + u32 pretimeout_val, u8 pretimeout_act) +{ + struct nct6694_wdt_data *data =3D watchdog_get_drvdata(wdev); + struct nct6694_wdt_setup *setup =3D &data->msg->setup; + const struct nct6694_cmd_header cmd_hd =3D { + .mod =3D NCT6694_WDT_MOD, + .cmd =3D NCT6694_WDT_SETUP, + .sel =3D NCT6694_WDT_SETUP_SEL(data->wdev_idx), + .len =3D cpu_to_le16(sizeof(*setup)) + }; + unsigned int timeout_fmt, pretimeout_fmt; + + if (pretimeout_val =3D=3D 0) + pretimeout_act =3D NCT6694_ACTION_NONE; + + timeout_fmt =3D (timeout_val * 1000) | (timeout_act << 24); + pretimeout_fmt =3D (pretimeout_val * 1000) | (pretimeout_act << 24); + + memset(setup, 0, sizeof(*setup)); + setup->timeout =3D cpu_to_le32(timeout_fmt); + setup->pretimeout =3D cpu_to_le32(pretimeout_fmt); + + return nct6694_write_msg(data->nct6694, &cmd_hd, setup); +} + +static int nct6694_wdt_start(struct watchdog_device *wdev) +{ + struct nct6694_wdt_data *data =3D watchdog_get_drvdata(wdev); + int ret; + + ret =3D nct6694_wdt_setting(wdev, wdev->timeout, NCT6694_ACTION_GPO, + wdev->pretimeout, NCT6694_ACTION_GPO); + if (ret) + return ret; + + dev_dbg(data->dev, "Setting WDT(%d): timeout =3D %d, pretimeout =3D %d\n", + data->wdev_idx, wdev->timeout, wdev->pretimeout); + + return ret; +} + +static int nct6694_wdt_stop(struct watchdog_device *wdev) +{ + struct nct6694_wdt_data *data =3D watchdog_get_drvdata(wdev); + struct nct6694_wdt_cmd *cmd =3D &data->msg->cmd; + const struct nct6694_cmd_header cmd_hd =3D { + .mod =3D NCT6694_WDT_MOD, + .cmd =3D NCT6694_WDT_COMMAND, + .sel =3D NCT6694_WDT_COMMAND_SEL(data->wdev_idx), + .len =3D cpu_to_le16(sizeof(*cmd)) + }; + + memcpy(&cmd->wdt_cmd, "WDTC", 4); + cmd->reserved =3D 0; + + return nct6694_write_msg(data->nct6694, &cmd_hd, cmd); +} + +static int nct6694_wdt_ping(struct watchdog_device *wdev) +{ + struct nct6694_wdt_data *data =3D watchdog_get_drvdata(wdev); + struct nct6694_wdt_cmd *cmd =3D &data->msg->cmd; + const struct nct6694_cmd_header cmd_hd =3D { + .mod =3D NCT6694_WDT_MOD, + .cmd =3D NCT6694_WDT_COMMAND, + .sel =3D NCT6694_WDT_COMMAND_SEL(data->wdev_idx), + .len =3D cpu_to_le16(sizeof(*cmd)) + }; + + memcpy(&cmd->wdt_cmd, "WDTS", 4); + cmd->reserved =3D 0; + + return nct6694_write_msg(data->nct6694, &cmd_hd, cmd); +} + +static int nct6694_wdt_set_timeout(struct watchdog_device *wdev, + unsigned int new_timeout) +{ + int ret; + + ret =3D nct6694_wdt_setting(wdev, new_timeout, NCT6694_ACTION_GPO, + wdev->pretimeout, NCT6694_ACTION_GPO); + if (ret) + return ret; + + wdev->timeout =3D new_timeout; + + return 0; +} + +static int nct6694_wdt_set_pretimeout(struct watchdog_device *wdev, + unsigned int new_pretimeout) +{ + int ret; + + ret =3D nct6694_wdt_setting(wdev, wdev->timeout, NCT6694_ACTION_GPO, + new_pretimeout, NCT6694_ACTION_GPO); + if (ret) + return ret; + + wdev->pretimeout =3D new_pretimeout; + + return 0; +} + +static unsigned int nct6694_wdt_get_time(struct watchdog_device *wdev) +{ + struct nct6694_wdt_data *data =3D watchdog_get_drvdata(wdev); + struct nct6694_wdt_setup *setup =3D &data->msg->setup; + const struct nct6694_cmd_header cmd_hd =3D { + .mod =3D NCT6694_WDT_MOD, + .cmd =3D NCT6694_WDT_SETUP, + .sel =3D NCT6694_WDT_SETUP_SEL(data->wdev_idx), + .len =3D cpu_to_le16(sizeof(*setup)) + }; + unsigned int timeleft_ms; + int ret; + + ret =3D nct6694_read_msg(data->nct6694, &cmd_hd, setup); + if (ret) + return 0; + + timeleft_ms =3D le32_to_cpu(setup->countdown); + + return timeleft_ms / 1000; +} + +static const struct watchdog_info nct6694_wdt_info =3D { + .options =3D WDIOF_SETTIMEOUT | + WDIOF_KEEPALIVEPING | + WDIOF_MAGICCLOSE | + WDIOF_PRETIMEOUT, + .identity =3D DEVICE_NAME, +}; + +static const struct watchdog_ops nct6694_wdt_ops =3D { + .owner =3D THIS_MODULE, + .start =3D nct6694_wdt_start, + .stop =3D nct6694_wdt_stop, + .set_timeout =3D nct6694_wdt_set_timeout, + .set_pretimeout =3D nct6694_wdt_set_pretimeout, + .get_timeleft =3D nct6694_wdt_get_time, + .ping =3D nct6694_wdt_ping, +}; + +static void nct6694_wdt_ida_free(void *d) +{ + struct nct6694_wdt_data *data =3D d; + struct nct6694 *nct6694 =3D data->nct6694; + + ida_free(&nct6694->wdt_ida, data->wdev_idx); +} + +static int nct6694_wdt_probe(struct platform_device *pdev) +{ + struct device *dev =3D &pdev->dev; + struct nct6694 *nct6694 =3D dev_get_drvdata(dev->parent); + struct nct6694_wdt_data *data; + struct watchdog_device *wdev; + int ret; + + data =3D devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + data->msg =3D devm_kzalloc(dev, sizeof(union nct6694_wdt_msg), + GFP_KERNEL); + if (!data->msg) + return -ENOMEM; + + data->dev =3D dev; + data->nct6694 =3D nct6694; + + ret =3D ida_alloc(&nct6694->wdt_ida, GFP_KERNEL); + if (ret < 0) + return ret; + data->wdev_idx =3D ret; + + ret =3D devm_add_action_or_reset(dev, nct6694_wdt_ida_free, data); + if (ret) + return ret; + + wdev =3D &data->wdev; + wdev->info =3D &nct6694_wdt_info; + wdev->ops =3D &nct6694_wdt_ops; + wdev->timeout =3D timeout[data->wdev_idx]; + wdev->pretimeout =3D pretimeout[data->wdev_idx]; + if (timeout[data->wdev_idx] < pretimeout[data->wdev_idx]) { + dev_warn(data->dev, "pretimeout < timeout. Setting to zero\n"); + wdev->pretimeout =3D 0; + } + + wdev->min_timeout =3D 1; + wdev->max_timeout =3D 255; + + platform_set_drvdata(pdev, data); + + watchdog_set_drvdata(&data->wdev, data); + watchdog_set_nowayout(&data->wdev, nowayout); + watchdog_stop_on_reboot(&data->wdev); + + return devm_watchdog_register_device(dev, &data->wdev); +} + +static struct platform_driver nct6694_wdt_driver =3D { + .driver =3D { + .name =3D DEVICE_NAME, + }, + .probe =3D nct6694_wdt_probe, +}; + +module_platform_driver(nct6694_wdt_driver); + +MODULE_DESCRIPTION("USB-WDT driver for NCT6694"); +MODULE_AUTHOR("Ming Yu "); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:nct6694-wdt"); --=20 2.34.1