From patchwork Fri Jul 3 11:48:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?Sm9obnNvbiBDSCBDaGVuICjpmbPmmK3li7Mp?= X-Patchwork-Id: 11641745 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 28F3192A for ; Fri, 3 Jul 2020 11:48:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DBFF120737 for ; Fri, 3 Jul 2020 11:48:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=moxa.com header.i=@moxa.com header.b="K+nh2Q5O" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726098AbgGCLsS (ORCPT ); Fri, 3 Jul 2020 07:48:18 -0400 Received: from mail-eopbgr1310079.outbound.protection.outlook.com ([40.107.131.79]:8064 "EHLO APC01-SG2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726022AbgGCLsS (ORCPT ); Fri, 3 Jul 2020 07:48:18 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mO2Is/1C7YMp38wIQsUO0CpaXIA71QTW/JJxQOWPyNpuwSUAeFDAge85MdFcHqVrZGhPdDXoHMXDzj/0LP9TBKD5pYYBVO3HLN4LrJeVCBZbiOQ4Rh3MQxi+N5FXL+3BthxJd9AavzAzFXAEmjg3bCysa/l0kWn3mpP/sRZVJoWZMoU0uxH6oA83V56WGboqZthGhxepxApQswxJ/ZBx9+gafWrwDjpBL0HxRb2DPMcTudQpV4+TltXSZWqS6++6heLxyNLGrv774/xW1eiQXuyxqJ2cuXpXkBscUJ1Kjyf19hWUf+e/nU/saRAYeWxW9sK9MsZunLZJ9K7Ao09Fiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=d42Zg7jum3g8GLCPisahGZUVN/7UUWSYwHpt0Tev9Ko=; b=WwMLauGyC3pOsLCal7Z6de5S71uSp3OcyAQnNh4mQbLID1wNgotVW/B4xVAdCsFtdu8htFlzXqvu9F8hE0nxvy5uQgH/1NnqHJjAUVkQbHr/kAsiunO8RaMu/sPD6udRxQ0l+xPtSQGr8W3AalF6fuy0jsUCtpmT5YCnbqoBBdIO1tRzzLEAwTr8HEXW3/KXYdXEGlJ3MHTOufSgaRSL5DCDlgCAu2PlHs7Xqo+Q3lDJylItOUIa6mGHEleSVzM953Ct2DUNKPMn0XZVY9pODZRBvmviHQIz2YpOGMCVhBYzexdrcMC323jd97GegbiD8QkXruWIWgMz523GHz7sIQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=moxa.com; dmarc=pass action=none header.from=moxa.com; dkim=pass header.d=moxa.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=moxa.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=d42Zg7jum3g8GLCPisahGZUVN/7UUWSYwHpt0Tev9Ko=; b=K+nh2Q5OwzCgafgTzV4mOUQa+7f1aDQMJzoS/unH4NmxnrIv0RZeXjTk8juoMQw5yrRCjI6wKsD3JWhLqO6yRAwr07UKIXbqjJ3+UI4lBd7MMuBdc6qJeAbz9juvkUfURj5oIowBCbO4ZHo4YDC0BjwUCRF1KjnH+ncVgYtD87A= Received: from HK2PR01MB3281.apcprd01.prod.exchangelabs.com (2603:1096:202:22::12) by HKAPR01MB3650.apcprd01.prod.exchangelabs.com (2603:1096:203:d6::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.21; Fri, 3 Jul 2020 11:48:10 +0000 Received: from HK2PR01MB3281.apcprd01.prod.exchangelabs.com ([fe80::dce:9650:6c58:8b77]) by HK2PR01MB3281.apcprd01.prod.exchangelabs.com ([fe80::dce:9650:6c58:8b77%4]) with mapi id 15.20.3153.028; Fri, 3 Jul 2020 11:48:09 +0000 From: =?big5_tw?b?Sm9obnNvbiBDSCBDaGVuICizr6xMvrEp?= To: "linux-kernel@vger.kernel.org" CC: "linux-rtc@vger.kernel.org" , "linux-watchdog@vger.kernel.org" , Wim Van Sebroeck , Alessandro Zummo , Alexandre Belloni , "linux@roeck-us.net" Subject: [PATCH v2] rtc: rtc-ds1374: wdt: Use watchdog core for watchdog part Thread-Topic: [PATCH v2] rtc: rtc-ds1374: wdt: Use watchdog core for watchdog part Thread-Index: AQHWUS8HfLcV30QOOkmEN8LmAnoqcA== Date: Fri, 3 Jul 2020 11:48:09 +0000 Message-ID: Accept-Language: zh-TW, en-US Content-Language: zh-TW X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=moxa.com; x-originating-ip: [123.51.145.16] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 1065195d-83cd-40db-c6db-08d81f46f56c x-ms-traffictypediagnostic: HKAPR01MB3650: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2150; x-forefront-prvs: 045315E1EE x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: X+z50xEeVqh14WaFdZlbbZTks3arwBeTDdVQGjeG12cab2TgOrA/aPgJZKBjhNUK6TOjqgFz+FnkuPhnt9tnyQzt7YakXcABR9tZdqG8loVTHY3mFTllEQSYGcouLRfAzwwf1IytBSO4gAkanZD4s55O6Mf/DPsyjHNjV9S/1KXMSZMUYWr3Y54lH85mPZwQlI0VYPlhPezN9kZasV4A4C3HVMsBFborUAk3MnmGnOlOYxB9FtnCcEVo8cQAOmbRF51rs0tvZzxLSGiozbMy3TomxH775kSvA5NZ0oCisAG3GjoEVFRf246oC2rwwwMWMktqmebE7s0BHgyba7E5t0fVKtEa7zFu1Exy6IY/UHV7jdBmINqHIFUr43uykxafuHH1398BU1621l9wO2oW7Q== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HK2PR01MB3281.apcprd01.prod.exchangelabs.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(366004)(346002)(376002)(136003)(39850400004)(396003)(6506007)(316002)(66946007)(76116006)(54906003)(66446008)(66476007)(66556008)(64756008)(71200400001)(5660300002)(7696005)(186003)(6916009)(4326008)(86362001)(8936002)(85182001)(26005)(2906002)(83380400001)(478600001)(8676002)(33656002)(9686003)(52536014)(55016002)(171213001)(6606295002);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata: ExkqlmSQL07JI4Uwm4EHiFTwa2mNXt6Ma8vVGUmKSctAy6gGe4CTZq5tB6eh2rU4YvykqCcsv+YazkbyBBUpb68XhIC2UuNOZeZ+Jm/FwYUxTfNEaUvrf5DKUhUQpR2GhpBvt9QKpnj7WQbfwNgn+IGnnkEGx2TChAWu0EsV6Qj8RiqI5K0hOHmYPUjeGwKBrS5tg7aHqiSgP5Onr36pOSmw33pu4HKXoVhsx3GsrGCcJ/2gXwO2UqZavGMOAZPplF6ODlZJeNPo0p/VbQJfjBdBg3LbTuiZjyh/Zg97SvptZHWHcuYX3JS9m/ylbSdE15ozwpYSddq+TegEPwGt2pSvw7PwwRYHDDjdGb6NenBU5m+3C1dZONop08uZUtauT3M14FIy/p5vMMg3kC/BmD+pSIJCm1c1He0GT5FPHvLMCeUbOzDBdgvq7CpZiaTW5cwQ5ReEErZrThWOu61hgYTcOE0TLv2pokvqn7/mqUY= x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: moxa.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: HK2PR01MB3281.apcprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1065195d-83cd-40db-c6db-08d81f46f56c X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Jul 2020 11:48:09.6854 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 5571c7d4-286b-47f6-9dd5-0aa688773c8e X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: v6fHEOLuTJNjHDhS8GJxS4IhEXcm0UjQSD5V0kZjCEpsEuUv0ikKnDlg8mEEiQT+ePQUM1jvdrU4Ug7e1oMK+w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HKAPR01MB3650 Sender: linux-watchdog-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org Let ds1374 watchdog use watchdog core functions. It also includes improving watchdog timer setting and nowayout, and just uses ioctl() of watchdog core. Signed-off-by: Johnson Chen Reported-by: kernel test robot v1->v2: - Use ds1374_wdt_settimeout() before registering the watchdog - Remove watchdog_unregister_device() because devm_watchdog_register_device() is used - Remove ds1374_wdt_ping() - TIMER_MARGIN_MAX to 4095 for 24-bit value - Keep wdt_margin - Fix coding styles Reported-by: kernel test robot --- drivers/rtc/Kconfig | 1 + drivers/rtc/rtc-ds1374.c | 236 +++++++++------------------------------ 2 files changed, 52 insertions(+), 185 deletions(-) diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index b54d87d45c89..5e2444af5657 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -282,6 +282,7 @@ config RTC_DRV_DS1374 config RTC_DRV_DS1374_WDT bool "Dallas/Maxim DS1374 watchdog timer" depends on RTC_DRV_DS1374 + select WATCHDOG_CORE help If you say Y here you will get support for the watchdog timer in the Dallas Semiconductor DS1374 diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c index 9c51a12cf70f..57a4e503b34a 100644 --- a/drivers/rtc/rtc-ds1374.c +++ b/drivers/rtc/rtc-ds1374.c @@ -46,6 +46,7 @@ #define DS1374_REG_WDALM2 0x06 #define DS1374_REG_CR 0x07 /* Control */ #define DS1374_REG_CR_AIE 0x01 /* Alarm Int. Enable */ +#define DS1374_REG_CR_WDSTR 0x08 /* 1=INT, 0=RST */ #define DS1374_REG_CR_WDALM 0x20 /* 1=Watchdog, 0=Alarm */ #define DS1374_REG_CR_WACE 0x40 /* WD/Alarm counter enable */ #define DS1374_REG_SR 0x08 /* Status */ @@ -71,7 +72,9 @@ struct ds1374 { struct i2c_client *client; struct rtc_device *rtc; struct work_struct work; - +#ifdef CONFIG_RTC_DRV_DS1374_WDT + struct watchdog_device wdt; +#endif /* The mutex protects alarm operations, and prevents a race * between the enable_irq() in the workqueue and the free_irq() * in the remove function. @@ -371,72 +374,76 @@ static const struct rtc_class_ops ds1374_rtc_ops = { */ static struct i2c_client *save_client; /* Default margin */ -#define WD_TIMO 131762 +#define TIMER_MARGIN_DEFAULT 32 +#define TIMER_MARGIN_MIN 1 +#define TIMER_MARGIN_MAX 4095 /* 24-bit value */ #define DRV_NAME "DS1374 Watchdog" -static int wdt_margin = WD_TIMO; -static unsigned long wdt_is_open; +static int wdt_margin = TIMER_MARGIN_DEFAULT; module_param(wdt_margin, int, 0); MODULE_PARM_DESC(wdt_margin, "Watchdog timeout in seconds (default 32s)"); +static bool nowayout = WATCHDOG_NOWAYOUT; +module_param(nowayout, bool, 0); +MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default =" + __MODULE_STRING(WATCHDOG_NOWAYOUT)")"); + + static const struct watchdog_info ds1374_wdt_info = { .identity = "DS1374 WTD", .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE, }; -static int ds1374_wdt_settimeout(unsigned int timeout) +static int ds1374_wdt_settimeout(struct watchdog_device *wdt, unsigned int timeout) { - int ret = -ENOIOCTLCMD; - int cr; + int ret, cr; - ret = cr = i2c_smbus_read_byte_data(save_client, DS1374_REG_CR); - if (ret < 0) - goto out; + wdt->timeout = timeout; + + cr = i2c_smbus_read_byte_data(save_client, DS1374_REG_CR); + if (cr < 0) + return cr; /* Disable any existing watchdog/alarm before setting the new one */ cr &= ~DS1374_REG_CR_WACE; ret = i2c_smbus_write_byte_data(save_client, DS1374_REG_CR, cr); if (ret < 0) - goto out; + return ret; /* Set new watchdog time */ + timeout = timeout * 4096; ret = ds1374_write_rtc(save_client, timeout, DS1374_REG_WDALM0, 3); if (ret) { pr_info("couldn't set new watchdog time\n"); - goto out; + return ret; } /* Enable watchdog timer */ cr |= DS1374_REG_CR_WACE | DS1374_REG_CR_WDALM; + cr &= ~DS1374_REG_CR_WDSTR;/* for RST PIN */ cr &= ~DS1374_REG_CR_AIE; ret = i2c_smbus_write_byte_data(save_client, DS1374_REG_CR, cr); if (ret < 0) - goto out; + return ret; return 0; -out: - return ret; } - /* * Reload the watchdog timer. (ie, pat the watchdog) */ -static void ds1374_wdt_ping(void) +static int ds1374_wdt_start(struct watchdog_device *wdt) { u32 val; - int ret = 0; - ret = ds1374_read_rtc(save_client, &val, DS1374_REG_WDALM0, 3); - if (ret) - pr_info("WD TICK FAIL!!!!!!!!!! %i\n", ret); + return ds1374_read_rtc(save_client, &val, DS1374_REG_WDALM0, 3); } -static void ds1374_wdt_disable(void) +static int ds1374_wdt_stop(struct watchdog_device *wdt) { int cr; @@ -444,162 +451,16 @@ static void ds1374_wdt_disable(void) /* Disable watchdog timer */ cr &= ~DS1374_REG_CR_WACE; - i2c_smbus_write_byte_data(save_client, DS1374_REG_CR, cr); -} - -/* - * Watchdog device is opened, and watchdog starts running. - */ -static int ds1374_wdt_open(struct inode *inode, struct file *file) -{ - struct ds1374 *ds1374 = i2c_get_clientdata(save_client); - - if (MINOR(inode->i_rdev) == WATCHDOG_MINOR) { - mutex_lock(&ds1374->mutex); - if (test_and_set_bit(0, &wdt_is_open)) { - mutex_unlock(&ds1374->mutex); - return -EBUSY; - } - /* - * Activate - */ - wdt_is_open = 1; - mutex_unlock(&ds1374->mutex); - return stream_open(inode, file); - } - return -ENODEV; -} - -/* - * Close the watchdog device. - */ -static int ds1374_wdt_release(struct inode *inode, struct file *file) -{ - if (MINOR(inode->i_rdev) == WATCHDOG_MINOR) - clear_bit(0, &wdt_is_open); - - return 0; + return i2c_smbus_write_byte_data(save_client, DS1374_REG_CR, cr); } -/* - * Pat the watchdog whenever device is written to. - */ -static ssize_t ds1374_wdt_write(struct file *file, const char __user *data, - size_t len, loff_t *ppos) -{ - if (len) { - ds1374_wdt_ping(); - return 1; - } - return 0; -} - -static ssize_t ds1374_wdt_read(struct file *file, char __user *data, - size_t len, loff_t *ppos) -{ - return 0; -} - -/* - * Handle commands from user-space. - */ -static long ds1374_wdt_ioctl(struct file *file, unsigned int cmd, - unsigned long arg) -{ - int new_margin, options; - - switch (cmd) { - case WDIOC_GETSUPPORT: - return copy_to_user((struct watchdog_info __user *)arg, - &ds1374_wdt_info, sizeof(ds1374_wdt_info)) ? -EFAULT : 0; - - case WDIOC_GETSTATUS: - case WDIOC_GETBOOTSTATUS: - return put_user(0, (int __user *)arg); - case WDIOC_KEEPALIVE: - ds1374_wdt_ping(); - return 0; - case WDIOC_SETTIMEOUT: - if (get_user(new_margin, (int __user *)arg)) - return -EFAULT; - - /* the hardware's tick rate is 4096 Hz, so - * the counter value needs to be scaled accordingly - */ - new_margin <<= 12; - if (new_margin < 1 || new_margin > 16777216) - return -EINVAL; - - wdt_margin = new_margin; - ds1374_wdt_settimeout(new_margin); - ds1374_wdt_ping(); - /* fallthrough */ - case WDIOC_GETTIMEOUT: - /* when returning ... inverse is true */ - return put_user((wdt_margin >> 12), (int __user *)arg); - case WDIOC_SETOPTIONS: - if (copy_from_user(&options, (int __user *)arg, sizeof(int))) - return -EFAULT; - - if (options & WDIOS_DISABLECARD) { - pr_info("disable watchdog\n"); - ds1374_wdt_disable(); - return 0; - } - - if (options & WDIOS_ENABLECARD) { - pr_info("enable watchdog\n"); - ds1374_wdt_settimeout(wdt_margin); - ds1374_wdt_ping(); - return 0; - } - return -EINVAL; - } - return -ENOTTY; -} - -static long ds1374_wdt_unlocked_ioctl(struct file *file, unsigned int cmd, - unsigned long arg) -{ - int ret; - struct ds1374 *ds1374 = i2c_get_clientdata(save_client); - - mutex_lock(&ds1374->mutex); - ret = ds1374_wdt_ioctl(file, cmd, arg); - mutex_unlock(&ds1374->mutex); - - return ret; -} - -static int ds1374_wdt_notify_sys(struct notifier_block *this, - unsigned long code, void *unused) -{ - if (code == SYS_DOWN || code == SYS_HALT) - /* Disable Watchdog */ - ds1374_wdt_disable(); - return NOTIFY_DONE; -} - -static const struct file_operations ds1374_wdt_fops = { - .owner = THIS_MODULE, - .read = ds1374_wdt_read, - .unlocked_ioctl = ds1374_wdt_unlocked_ioctl, - .compat_ioctl = compat_ptr_ioctl, - .write = ds1374_wdt_write, - .open = ds1374_wdt_open, - .release = ds1374_wdt_release, - .llseek = no_llseek, +static const struct watchdog_ops ds1374_wdt_ops = { + .owner = THIS_MODULE, + .start = ds1374_wdt_start, + .stop = ds1374_wdt_stop, + .set_timeout = ds1374_wdt_settimeout, }; -static struct miscdevice ds1374_miscdev = { - .minor = WATCHDOG_MINOR, - .name = "watchdog", - .fops = &ds1374_wdt_fops, -}; - -static struct notifier_block ds1374_wdt_notifier = { - .notifier_call = ds1374_wdt_notify_sys, -}; #endif /*CONFIG_RTC_DRV_DS1374_WDT*/ /* @@ -653,15 +514,25 @@ static int ds1374_probe(struct i2c_client *client, #ifdef CONFIG_RTC_DRV_DS1374_WDT save_client = client; - ret = misc_register(&ds1374_miscdev); - if (ret) - return ret; - ret = register_reboot_notifier(&ds1374_wdt_notifier); + ds1374->wdt.info = &ds1374_wdt_info; + ds1374->wdt.ops = &ds1374_wdt_ops; + ds1374->wdt.timeout = TIMER_MARGIN_DEFAULT; + ds1374->wdt.min_timeout = TIMER_MARGIN_MIN; + ds1374->wdt.max_timeout = TIMER_MARGIN_MAX; + + watchdog_init_timeout(&ds1374->wdt, wdt_margin, &client->dev); + watchdog_set_nowayout(&ds1374->wdt, nowayout); + watchdog_stop_on_reboot(&ds1374->wdt); + watchdog_stop_on_unregister(&ds1374->wdt); + ds1374_wdt_settimeout(&ds1374->wdt, wdt_margin); + + ret = devm_watchdog_register_device(&client->dev, &ds1374->wdt); if (ret) { - misc_deregister(&ds1374_miscdev); + dev_err(&client->dev, "failed to register DS1374 watchdog device\n"); return ret; } - ds1374_wdt_settimeout(131072); + + dev_info(&client->dev, "DS1374 watchdog device enabled\n"); #endif return 0; @@ -670,11 +541,6 @@ static int ds1374_probe(struct i2c_client *client, static int ds1374_remove(struct i2c_client *client) { struct ds1374 *ds1374 = i2c_get_clientdata(client); -#ifdef CONFIG_RTC_DRV_DS1374_WDT - misc_deregister(&ds1374_miscdev); - ds1374_miscdev.parent = NULL; - unregister_reboot_notifier(&ds1374_wdt_notifier); -#endif if (client->irq > 0) { mutex_lock(&ds1374->mutex);