From patchwork Mon Nov 25 02:04:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Peng 1. (NSB - CN/Hangzhou)" X-Patchwork-Id: 11259455 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 E67C817F0 for ; Mon, 25 Nov 2019 02:04:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C67C2207DD for ; Mon, 25 Nov 2019 02:04:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726867AbfKYCEQ (ORCPT ); Sun, 24 Nov 2019 21:04:16 -0500 Received: from cnshjsmin05.nokia-sbell.com ([116.246.26.45]:29508 "EHLO cnshjsmin05.nokia-sbell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726830AbfKYCEQ (ORCPT ); Sun, 24 Nov 2019 21:04:16 -0500 X-AuditID: ac18929d-483ff700000014de-56-5ddb369d4d8f Received: from CNSHPPEXCH1608.nsn-intra.net (Unknown_Domain [135.251.51.108]) (using TLS with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by cnshjsmin05.nokia-sbell.com (Symantec Messaging Gateway) with SMTP id 81.3E.05342.D963BDD5; Mon, 25 Nov 2019 10:04:13 +0800 (HKT) Received: from CNSHPPEXCH1601.nsn-intra.net (135.251.51.101) by CNSHPPEXCH1608.nsn-intra.net (135.251.51.108) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Mon, 25 Nov 2019 10:04:13 +0800 Received: from CNSHPPEXCH1601.nsn-intra.net ([135.251.51.101]) by CNSHPPEXCH1601.nsn-intra.net ([135.251.51.101]) with mapi id 15.01.1713.007; Mon, 25 Nov 2019 10:04:13 +0800 From: "Wang, Peng 1. (NSB - CN/Hangzhou)" To: Guenter Roeck , Guenter Roeck CC: "wim@linux-watchdog.org" , "linux-watchdog@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: [PATCH v2.1] watchdog: make DesignWare watchdog allow users to set bigger timeout value Thread-Topic: [PATCH v2.1] watchdog: make DesignWare watchdog allow users to set bigger timeout value Thread-Index: AdWjNIrZT/zI+n3RTkOdyUq1ShRV4Q== Date: Mon, 25 Nov 2019 02:04:13 +0000 Message-ID: <8fa54e92c6cd4544a7a3eb60a373ac43@nokia-sbell.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [135.251.51.115] MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuphkeLIzCtJLcpLzFFi42Jp/22cozvX7Haswd8juhb7Oq8zWTT+u89q cXnXHDaLG+v2sVs8fvmP2YHVY+esu+weK9esAbK+N7B7fN4kF8ASxWWTkpqTWZZapG+XwJWx aec/loJVghWn78g3MH4Q6GLk5JAQMJFY/e81excjF4eQwCEmiRs9R9hBEkICfxklTr6whkhs YpR4e2s5G0iCTcBdomnTOjBbRMBb4tns+WwgRcwCuxkl5ja+YQFJCAskSWzYt5AJoihdYtLt 3VC2nsSpW9uYQWwWAVWJa/fOgW3jFbCTWLW1A6yXUUBWYtqj+2D1zALiEreezGeCOFVAYsme 88wQtqjEy8f/WLsYOYBsJYm+DUwgJrOApsT6XfoQnYoSU7ofQk0XlDg58wnLBEaRWUiGzkLo mIWkYxaSjgWMLKsYpZPzijOyinMz8wxM9fLyszMTdYuTUnNy9JLzczcxAuNojcSkuTsYOzvj DzEKcDAq8fBuWHsrVog1say4MvcQowQHs5IIr9vZG7FCvCmJlVWpRfnxRaU5qcWHGKU5WJTE eVsmL4wVEkhPLEnNTk0tSC2CyTJxcEo1MGpcOPjcnS04Znqp6hOmF/WLovblrvyycm623v1v 3xSi1sfeu3z8yN053dLqImLuUnK3+vfOV2IPs3hQFxQ4cVFK/6u0B76zJXhO9k2elFyQkB6w PcDxzClBeY8OwcCj59T3ffK7Mt/UZ0/1ScO4Zz5vN/PH+06y2PrO51zNYe+LGzjkNs5OalNi Kc5INNRiLipOBAA+x4qanwIAAA== Sender: linux-watchdog-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org From aabaa4b709bd451e566c906e8d1dca48f92f9b12 Mon Sep 17 00:00:00 2001 From: Peng Wang Date: Wed, 20 Nov 2019 15:12:59 +0800 Subject: [PATCH v2.1] watchdog: make DesignWare watchdog allow users to set bigger timeout value watchdog_dev.c provides means to allow users to set bigger timeout value than HW can support, make DesignWare watchdog align with this. Signed-off-by: Peng Wang Reviewed-by: Guenter Roeck --- v2 -> v2.1: - move Signed-off-by to be ahead of section separator v1 -> v2: - use top_s to compare with wdd->max_hw_heartbeat_ms - update wdd->timeout in case it's greater than HW supports - fix comments error v1: initial version --- drivers/watchdog/dw_wdt.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c index fef7c61..12c116e 100644 --- a/drivers/watchdog/dw_wdt.c +++ b/drivers/watchdog/dw_wdt.c @@ -114,7 +114,15 @@ static int dw_wdt_set_timeout(struct watchdog_device *wdd, unsigned int top_s) writel(top_val | top_val << WDOG_TIMEOUT_RANGE_TOPINIT_SHIFT, dw_wdt->regs + WDOG_TIMEOUT_RANGE_REG_OFFSET); - wdd->timeout = dw_wdt_top_in_seconds(dw_wdt, top_val); + /* + * In case users set bigger timeout value than HW can support, + * kernel(watchdog_dev.c) helps to feed watchdog before + * wdd->max_hw_heartbeat_ms + */ + if (top_s * 1000 <= wdd->max_hw_heartbeat_ms) + wdd->timeout = dw_wdt_top_in_seconds(dw_wdt, top_val); + else + wdd->timeout = top_s; return 0; }