Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp4335153ybb; Mon, 23 Mar 2020 18:57:15 -0700 (PDT) X-Google-Smtp-Source: ADFU+vv6AmFTRHk5zQvV/jObp+gOv2xYHY43pbJq0OqmYXNnxBHw1e3N1jdzDHqYc4OgaHjjdMzt X-Received: by 2002:a05:6830:2428:: with SMTP id k8mr405684ots.345.1585015035207; Mon, 23 Mar 2020 18:57:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585015035; cv=none; d=google.com; s=arc-20160816; b=ZxlmtVowwUwkRJ7vG07uD6X1tCeTR6PBmj2+M4TIVviPPzwbMsPdEfpVa83KrVJrQk rXMx4tC2RJw1yeS5QgEkg3KQn+HAF/vhYa1HjHacllXYkf90cYxVn+bPH2xv5/nUxkwp HOGsHoiqD9MuFFu1ZN499aIw++QhGMWFHNTclJAqShGnPKLaZbyngwnkSPrSEAEghy2B SUwNHDQX64nE5fWjvEB584RmoCzdz/DrUV1/+C7vPC1+/7dMyVfaPBj84IWAdFoNp/jy lbPkH3Y28RQt7irW3TS9dNbRFiOlhSX57FrgyC1WkWx2cW04yW1xC+C5poXo8BF1QrSn 1m/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:cc :to:from; bh=UN7b84MHUNJTHa6IN0IRzSTBboSg95X76cPJr3/NqRY=; b=JAOv/0rtl4uSTapFh05xwSEFol8wd3P9z+BtG3QdJznhMrtDj7S3M80C9de6y7eCYe mSC2Z64JwVSBKZxrcxYK5mMU93TQGfa9XepKQkS3W8ogKBmJMstJQKUeHtvChCcSdFHH PgjCtsjY5PzubCAHEksO2ZndXk0jPg6In/QozHlYkOTzMs/rQStGJdi43yMzXvmDyNZJ ZbxG9l6VpPHtOhrYvrAe1krBJhOQZfFlIhISWkXmKy5TN9ImXO1cbiS6XkkRLpaKlGBR z8uxPWT6Uxw1N7VF1Hv6VPwoUqOKsXA12r7oDiG4IE4vOP8rqaq2FBhbhSzcM6J644Li +lwg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 16si2877508oiq.222.2020.03.23.18.57.02; Mon, 23 Mar 2020 18:57:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727164AbgCXB4q (ORCPT + 99 others); Mon, 23 Mar 2020 21:56:46 -0400 Received: from [58.211.163.100] ([58.211.163.100]:49791 "EHLO mail.advantech.com.cn" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1727050AbgCXB4q (ORCPT ); Mon, 23 Mar 2020 21:56:46 -0400 X-Greylist: delayed 605 seconds by postgrey-1.27 at vger.kernel.org; Mon, 23 Mar 2020 21:56:44 EDT Received: from ACNMB2.ACN.ADVANTECH.CORP (unverified [172.21.128.148]) by ACN-SWEEPER01.ACN.ADVANTECH.CORP (Clearswift SMTPRS 5.6.0) with ESMTP id ; Tue, 24 Mar 2020 09:46:30 +0800 Received: from ADVANTECH.CORP (172.17.10.74) by ACNMB2.ACN.ADVANTECH.CORP (172.21.128.148) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 24 Mar 2020 09:46:30 +0800 From: To: <345351830@qq.com> CC: Jean Delvare , Guenter Roeck , , , , , , , Yuechao Zhao Subject: [v1,1/1] hwmon: (nct7904) Add watchdog function Date: Tue, 24 Mar 2020 01:46:19 +0000 Message-ID: <20200324014619.14276-1-yuechao.zhao@advantech.com.cn> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [172.17.10.74] X-ClientProxiedBy: ACLDAG.ADVANTECH.CORP (172.20.2.88) To ACNMB2.ACN.ADVANTECH.CORP (172.21.128.148) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yuechao Zhao implement watchdong functionality into the "hwmon/nct7904.c" Signed-off-by: Yuechao Zhao --- drivers/hwmon/nct7904.c | 157 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 156 insertions(+), 1 deletion(-) diff --git a/drivers/hwmon/nct7904.c b/drivers/hwmon/nct7904.c index 1f5743d..137199c 100644 --- a/drivers/hwmon/nct7904.c +++ b/drivers/hwmon/nct7904.c @@ -8,6 +8,9 @@ * Copyright (c) 2019 Advantech * Author: Amy.Shih * + * Copyright (c) 2020 Advantech + * Author: Yuechao Zhao + * * Supports the following chips: * * Chip #vin #fan #pwm #temp #dts chip ID @@ -20,6 +23,7 @@ #include #include #include +#include #define VENDOR_ID_REG 0x7A /* Any bank */ #define NUVOTON_ID 0x50 @@ -87,18 +91,39 @@ #define FANCTL1_FMR_REG 0x00 /* Bank 3; 1 reg per channel */ #define FANCTL1_OUT_REG 0x10 /* Bank 3; 1 reg per channel */ +#define WDT_LOCK_REG 0xE0 /* W/O Lock Watchdog Register */ +#define WDT_EN_REG 0xE1 /* R/O Watchdog Enable Register */ +#define WDT_STS_REG 0xE2 /* R/O Watchdog Status Register */ +#define WDT_TIMER_REG 0xE3 /* R/W Watchdog Timer Register */ +#define WDT_SOFT_EN 0x55 /* Enable soft watchdog timer */ +#define WDT_SOFT_DIS 0xAA /* Disable soft watchdog timer */ + #define VOLT_MONITOR_MODE 0x0 #define THERMAL_DIODE_MODE 0x1 #define THERMISTOR_MODE 0x3 #define ENABLE_TSI BIT(1) +#define WATCHDOG_TIMEOUT 1 /* 1 minute default timeout */ +static int ping_timeout = WATCHDOG_TIMEOUT; /* default feeding timeout */ + +static int timeout = WATCHDOG_TIMEOUT; +module_param(timeout, int, 0); +MODULE_PARM_DESC(timeout, "Watchdog timeout in minutes. 1 <= timeout <= 255, default=" + __MODULE_STRING(WATCHODOG_TIMEOUT) "."); + +static bool nowayout = WATCHDOG_NOWAYOUT; +module_param(nowayout, bool, 0); +MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started once started (default=" + __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + static const unsigned short normal_i2c[] = { 0x2d, 0x2e, I2C_CLIENT_END }; struct nct7904_data { struct i2c_client *client; + struct watchdog_device wdt; struct mutex bank_lock; int bank_sel; u32 fanin_mask; @@ -889,6 +914,91 @@ static int nct7904_detect(struct i2c_client *client, .info = nct7904_info, }; +/* + * Wathcdog Function + */ +static int nct7904_wdt_start(struct watchdog_device *wdt) +{ + int ret; + struct nct7904_data *data = watchdog_get_drvdata(wdt); + + /* Disable soft watchdog timer first */ + ret = nct7904_write_reg(data, BANK_0, WDT_LOCK_REG, WDT_SOFT_DIS); + if (ret < 0) + return ret; + + /* Enable soft watchdog timer */ + ret = nct7904_write_reg(data, BANK_0, WDT_LOCK_REG, WDT_SOFT_EN); + return ret; +} + +static int nct7904_wdt_stop(struct watchdog_device *wdt) +{ + struct nct7904_data *data = watchdog_get_drvdata(wdt); + int ret; + + ret = nct7904_write_reg(data, BANK_0, WDT_LOCK_REG, WDT_SOFT_DIS); + + return ret; +} + +static int nct7904_wdt_set_timeout(struct watchdog_device *wdt, + unsigned int timeout) +{ + struct nct7904_data *data = watchdog_get_drvdata(wdt); + + ping_timeout = timeout / 60; + + return nct7904_write_reg(data, BANK_0, WDT_TIMER_REG, ping_timeout); +} + +static int nct7904_wdt_ping(struct watchdog_device *wdt) +{ + /* + * Note: + * NCT7904 is not supported refresh WDT_TIMER_REG register when the + * watchdog is actiove. Please disable watchdog before fedding the + * watchdog and enable it again. + */ + struct nct7904_data *data = watchdog_get_drvdata(wdt); + int ret; + + /* Disable soft watchdog timer */ + ret = nct7904_write_reg(data, BANK_0, WDT_LOCK_REG, WDT_SOFT_DIS); + if (ret < 0) + goto ping_err; + + /* feed watchdog */ + ret = nct7904_write_reg(data, BANK_0, WDT_TIMER_REG, ping_timeout); + if (ret < 0) + goto ping_err; + + /* Enable soft watchdog timer */ + ret = nct7904_write_reg(data, BANK_0, WDT_TIMER_REG, WDT_SOFT_EN); + if (ret < 0) + goto ping_err; + + return 0; + +ping_err: + pr_err("nct7904 ping error\n"); + return ret; +} + +static const struct watchdog_info nct7904_wdt_info = { + .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | + WDIOF_MAGICCLOSE, + .identity = "nct7904 watchdog", +}; + +static const struct watchdog_ops nct7904_wdt_ops = { + .owner = THIS_MODULE, + .start = nct7904_wdt_start, + .stop = nct7904_wdt_stop, + .ping = nct7904_wdt_ping, + .set_timeout = nct7904_wdt_set_timeout, +}; + static int nct7904_probe(struct i2c_client *client, const struct i2c_device_id *id) { @@ -1012,7 +1122,51 @@ static int nct7904_probe(struct i2c_client *client, hwmon_dev = devm_hwmon_device_register_with_info(dev, client->name, data, &nct7904_chip_info, NULL); - return PTR_ERR_OR_ZERO(hwmon_dev); + ret = PTR_ERR_OR_ZERO(hwmon_dev); + if (ret) + return ret; + + /* Watchdog initialization */ + data->wdt.ops = &nct7904_wdt_ops; + data->wdt.info = &nct7904_wdt_info; + + data->wdt.timeout = timeout * 60; /* in seconds */ + data->wdt.min_timeout = 1; + data->wdt.max_timeout = 15300; + data->wdt.parent = &client->dev; + + watchdog_init_timeout(&data->wdt, timeout, &client->dev); + watchdog_set_nowayout(&data->wdt, nowayout); + watchdog_set_drvdata(&data->wdt, data); + + i2c_set_clientdata(client, data); + + ret = watchdog_register_device(&data->wdt); + if (ret) + return ret; + + dev_info(&client->dev, "NCT7904 HWMON and Watchdog device probed\n"); + + return ret; +} + +static int nct7904_remove(struct i2c_client *client) +{ + /* + * HWMON use devm_hwmon_device_register_with_info() register. So, do + * not need unregister it manually. + */ + struct nct7904_data *data = i2c_get_clientdata(client); + + /* disable watchdog */ + if (!nowayout) + nct7904_write_reg(data, BANK_0, WDT_LOCK_REG, WDT_SOFT_DIS); + + watchdog_unregister_device(&data->wdt); + + dev_info(&client->dev, "NCT7904 driver removed\n"); + + return 0; } static const struct i2c_device_id nct7904_id[] = { @@ -1030,6 +1184,7 @@ static int nct7904_probe(struct i2c_client *client, .id_table = nct7904_id, .detect = nct7904_detect, .address_list = normal_i2c, + .remove = nct7904_remove, }; module_i2c_driver(nct7904_driver); -- 1.8.3.1