From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00D77C48BDF for ; Tue, 22 Jun 2021 11:08:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DB0C961351 for ; Tue, 22 Jun 2021 11:08:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229682AbhFVLLL (ORCPT ); Tue, 22 Jun 2021 07:11:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55306 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230092AbhFVLLL (ORCPT ); Tue, 22 Jun 2021 07:11:11 -0400 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E17BC061574 for ; Tue, 22 Jun 2021 04:08:55 -0700 (PDT) Received: by mail-wr1-x432.google.com with SMTP id d11so20774994wrm.0 for ; Tue, 22 Jun 2021 04:08:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=subject:to:cc:references:from:organization:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=Lq66Xjw5phBkXkJlrRj1+NbFKwtWmVfKpej/PiTxwz8=; b=lu/XpFbeQPRb3Kmlu2wIqg2ziWjqCteY1wketnLaG+eeKF2gnNuY6/TXszGZKzwLZX G0x4PUBL6KuhSN6ZhsePGOG+FKmWhlYahIl0sVH9WQ0N++7uGontZRdwlAvHFHYnL0ct YdgcVmIxpxXt48KHwuTpV90rphOmzxZQP3K+hpP5jaappI3/vQG6dH5Z9J/p3SwhLvhj qb0TkShFTp4A9RHYZ734dRU/KjTmwDJkhq/u/fO6+CCDEBZOIBF+iEx9aX3bELtzG/D+ dtk85tcmBV4Y8gH4zabe61pGw1Epk2eLSzXD2PxSrvny1h9HggAmi7Rl9QRaI0NFUK68 lGcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=Lq66Xjw5phBkXkJlrRj1+NbFKwtWmVfKpej/PiTxwz8=; b=n5ROeYou0I/ONXOKU4YxKlrr6H9Vvr72X6OlqwJpjtNWip0YYEkbSE67HL1ackhNsa QyVv+FG/0FcR5UwxFziGtOD/j6w1BW8UqrcXUCq4BVgaAsJ5y1TaEFCmXjT4N+pn45Y6 Qk/2UXeac6BdmIVoB8bvwY0ITbHsMzq3+5zO3/YVe9ln3tdM2OKcT/1o0c4aDEBIc4VG JM89oHI3jVGIgpjMcJYQyFZlZKA4VpC+nzIWtOBYbCulFPN0+Jxb7KicCNfxr9jKWKS1 laFfGK2nOSjLyj+8sFalzS6dTi7Qyr5w29tF8xXjg8XPyiwxttHst3nFwIkclNHAKui4 F17Q== X-Gm-Message-State: AOAM531942a8R93gy7PtstuzM60/xXiB9991L/POxc9SnAStGEp7K/q9 9w200vHNFFvOEZ0mKyh0l5xg9A== X-Google-Smtp-Source: ABdhPJwjDHkvFKgWlzcHBiFhM7t70Wscz+aLHos8OuzpYf1kseMkyODFDMtCSJ5qqjmtXYvMLmoTXg== X-Received: by 2002:a5d:6a0d:: with SMTP id m13mr3965814wru.318.1624360133978; Tue, 22 Jun 2021 04:08:53 -0700 (PDT) Received: from ?IPv6:2001:861:44c0:66c0:de9f:b167:e2fd:3d94? ([2001:861:44c0:66c0:de9f:b167:e2fd:3d94]) by smtp.gmail.com with ESMTPSA id b7sm7101142wrw.20.2021.06.22.04.08.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 22 Jun 2021 04:08:53 -0700 (PDT) Subject: Re: [PATCH] watchdog: meson_gxbb_wdt: improve To: Artem Lapkin Cc: wim@linux-watchdog.org, linux@roeck-us.net, khilman@baylibre.com, jbrunet@baylibre.com, christianshewitt@gmail.com, martin.blumenstingl@googlemail.com, linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, art@khadas.com, nick@khadas.com, gouwa@khadas.com References: <20210622095639.1280774-1-art@khadas.com> From: Neil Armstrong Organization: Baylibre Message-ID: Date: Tue, 22 Jun 2021 13:08:52 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <20210622095639.1280774-1-art@khadas.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org Hi Art, On 22/06/2021 11:56, Artem Lapkin wrote: > Improve meson_gxbb_wdt watchdog driver > 1) added module param timeout and nowayout same as other modules > 2) print watchdog driver start status > 3) add watchdog_stop_on_unregister > 4) remove watchdog_stop_on_reboot ( still can be activated by > watchdog.stop_on_reboot=1 ) i think this driver configuration more useful > becouse we can get reboot waranty for abnormal situations on shutdown stage Can you split the patch in 4 distinct changes ? Neil > > Signed-off-by: Artem Lapkin > --- > drivers/watchdog/meson_gxbb_wdt.c | 20 ++++++++++++++++++-- > 1 file changed, 18 insertions(+), 2 deletions(-) > > diff --git a/drivers/watchdog/meson_gxbb_wdt.c b/drivers/watchdog/meson_gxbb_wdt.c > index 5a9ca10fbcfa..15c889932c13 100644 > --- a/drivers/watchdog/meson_gxbb_wdt.c > +++ b/drivers/watchdog/meson_gxbb_wdt.c > @@ -35,6 +35,17 @@ struct meson_gxbb_wdt { > struct clk *clk; > }; > > +static bool nowayout = WATCHDOG_NOWAYOUT; > +static unsigned int timeout = DEFAULT_TIMEOUT; > + > +module_param(nowayout, bool, 0); > +MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started default=" > + __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); > + > +module_param(timeout, uint, 0); > +MODULE_PARM_DESC(timeout, "Watchdog heartbeat in seconds=" > + __MODULE_STRING(DEFAULT_TIMEOUT) ")"); > + > static int meson_gxbb_wdt_start(struct watchdog_device *wdt_dev) > { > struct meson_gxbb_wdt *data = watchdog_get_drvdata(wdt_dev); > @@ -174,7 +185,7 @@ static int meson_gxbb_wdt_probe(struct platform_device *pdev) > data->wdt_dev.ops = &meson_gxbb_wdt_ops; > data->wdt_dev.max_hw_heartbeat_ms = GXBB_WDT_TCNT_SETUP_MASK; > data->wdt_dev.min_timeout = 1; > - data->wdt_dev.timeout = DEFAULT_TIMEOUT; > + data->wdt_dev.timeout = timeout; > watchdog_set_drvdata(&data->wdt_dev, data); > > /* Setup with 1ms timebase */ > @@ -186,7 +197,12 @@ static int meson_gxbb_wdt_probe(struct platform_device *pdev) > > meson_gxbb_wdt_set_timeout(&data->wdt_dev, data->wdt_dev.timeout); > > - watchdog_stop_on_reboot(&data->wdt_dev); > + watchdog_set_nowayout(&data->wdt_dev, nowayout); > + watchdog_stop_on_unregister(&data->wdt_dev); > + > + dev_info(dev, "Watchdog enabled (timeout=%d sec, nowayout=%d)", > + data->wdt_dev.timeout, nowayout); > + > return devm_watchdog_register_device(dev, &data->wdt_dev); > } > >