From: Sam Protsenko <semen.protsenko@linaro.org> To: Guenter Roeck <linux@roeck-us.net>, Wim Van Sebroeck <wim@linux-watchdog.org> Cc: Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>, linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH v4 03/12] watchdog: s3c2410: Fail probe if can't find valid timeout Date: Sun, 21 Nov 2021 18:56:38 +0200 [thread overview] Message-ID: <20211121165647.26706-4-semen.protsenko@linaro.org> (raw) In-Reply-To: <20211121165647.26706-1-semen.protsenko@linaro.org> Driver can't work properly if there no valid timeout was found in s3c2410wdt_set_heartbeat(). Ideally, that function should be reworked in a way that it's always able to find some valid timeout. As a temporary solution let's for now just fail the driver probe in case the valid timeout can't be found in s3c2410wdt_set_heartbeat() function. Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> Reported-by: Guenter Roeck <linux@roeck-us.net> Suggested-by: Guenter Roeck <linux@roeck-us.net> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> --- Changes in v4: - Added R-b tag by Guenter Roeck Changes in v3: - Added R-b tag by Krzysztof Kozlowski Changes in v2: - (none): it's a new patch drivers/watchdog/s3c2410_wdt.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c index 2395f353e52d..00421cf22556 100644 --- a/drivers/watchdog/s3c2410_wdt.c +++ b/drivers/watchdog/s3c2410_wdt.c @@ -515,7 +515,6 @@ static int s3c2410wdt_probe(struct platform_device *pdev) struct s3c2410_wdt *wdt; struct resource *wdt_irq; unsigned int wtcon; - int started = 0; int ret; wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL); @@ -581,15 +580,15 @@ static int s3c2410wdt_probe(struct platform_device *pdev) ret = s3c2410wdt_set_heartbeat(&wdt->wdt_device, wdt->wdt_device.timeout); if (ret) { - started = s3c2410wdt_set_heartbeat(&wdt->wdt_device, - S3C2410_WATCHDOG_DEFAULT_TIME); - - if (started == 0) - dev_info(dev, - "tmr_margin value out of range, default %d used\n", + ret = s3c2410wdt_set_heartbeat(&wdt->wdt_device, + S3C2410_WATCHDOG_DEFAULT_TIME); + if (ret == 0) { + dev_warn(dev, "tmr_margin value out of range, default %d used\n", S3C2410_WATCHDOG_DEFAULT_TIME); - else - dev_info(dev, "default timer value is out of range, cannot start\n"); + } else { + dev_err(dev, "failed to use default timeout\n"); + goto err_cpufreq; + } } ret = devm_request_irq(dev, wdt_irq->start, s3c2410wdt_irq, 0, @@ -613,10 +612,10 @@ static int s3c2410wdt_probe(struct platform_device *pdev) if (ret < 0) goto err_unregister; - if (tmr_atboot && started == 0) { + if (tmr_atboot) { dev_info(dev, "starting watchdog timer\n"); s3c2410wdt_start(&wdt->wdt_device); - } else if (!tmr_atboot) { + } else { /* if we're not enabling the watchdog, then ensure it is * disabled if it has been left running from the bootloader * or other source */ -- 2.30.2
WARNING: multiple messages have this Message-ID (diff)
From: Sam Protsenko <semen.protsenko@linaro.org> To: Guenter Roeck <linux@roeck-us.net>, Wim Van Sebroeck <wim@linux-watchdog.org> Cc: Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>, linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH v4 03/12] watchdog: s3c2410: Fail probe if can't find valid timeout Date: Sun, 21 Nov 2021 18:56:38 +0200 [thread overview] Message-ID: <20211121165647.26706-4-semen.protsenko@linaro.org> (raw) In-Reply-To: <20211121165647.26706-1-semen.protsenko@linaro.org> Driver can't work properly if there no valid timeout was found in s3c2410wdt_set_heartbeat(). Ideally, that function should be reworked in a way that it's always able to find some valid timeout. As a temporary solution let's for now just fail the driver probe in case the valid timeout can't be found in s3c2410wdt_set_heartbeat() function. Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> Reported-by: Guenter Roeck <linux@roeck-us.net> Suggested-by: Guenter Roeck <linux@roeck-us.net> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> --- Changes in v4: - Added R-b tag by Guenter Roeck Changes in v3: - Added R-b tag by Krzysztof Kozlowski Changes in v2: - (none): it's a new patch drivers/watchdog/s3c2410_wdt.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c index 2395f353e52d..00421cf22556 100644 --- a/drivers/watchdog/s3c2410_wdt.c +++ b/drivers/watchdog/s3c2410_wdt.c @@ -515,7 +515,6 @@ static int s3c2410wdt_probe(struct platform_device *pdev) struct s3c2410_wdt *wdt; struct resource *wdt_irq; unsigned int wtcon; - int started = 0; int ret; wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL); @@ -581,15 +580,15 @@ static int s3c2410wdt_probe(struct platform_device *pdev) ret = s3c2410wdt_set_heartbeat(&wdt->wdt_device, wdt->wdt_device.timeout); if (ret) { - started = s3c2410wdt_set_heartbeat(&wdt->wdt_device, - S3C2410_WATCHDOG_DEFAULT_TIME); - - if (started == 0) - dev_info(dev, - "tmr_margin value out of range, default %d used\n", + ret = s3c2410wdt_set_heartbeat(&wdt->wdt_device, + S3C2410_WATCHDOG_DEFAULT_TIME); + if (ret == 0) { + dev_warn(dev, "tmr_margin value out of range, default %d used\n", S3C2410_WATCHDOG_DEFAULT_TIME); - else - dev_info(dev, "default timer value is out of range, cannot start\n"); + } else { + dev_err(dev, "failed to use default timeout\n"); + goto err_cpufreq; + } } ret = devm_request_irq(dev, wdt_irq->start, s3c2410wdt_irq, 0, @@ -613,10 +612,10 @@ static int s3c2410wdt_probe(struct platform_device *pdev) if (ret < 0) goto err_unregister; - if (tmr_atboot && started == 0) { + if (tmr_atboot) { dev_info(dev, "starting watchdog timer\n"); s3c2410wdt_start(&wdt->wdt_device); - } else if (!tmr_atboot) { + } else { /* if we're not enabling the watchdog, then ensure it is * disabled if it has been left running from the bootloader * or other source */ -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-11-21 16:58 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-11-21 16:56 [PATCH v4 00/12] watchdog: s3c2410: Add Exynos850 support Sam Protsenko 2021-11-21 16:56 ` Sam Protsenko 2021-11-21 16:56 ` [PATCH v4 01/12] dt-bindings: watchdog: Require samsung,syscon-phandle for Exynos7 Sam Protsenko 2021-11-21 16:56 ` [PATCH v4 01/12] dt-bindings: watchdog: Require samsung, syscon-phandle " Sam Protsenko 2021-11-21 16:56 ` [PATCH v4 02/12] dt-bindings: watchdog: Document Exynos850 watchdog bindings Sam Protsenko 2021-11-21 16:56 ` Sam Protsenko 2021-11-21 16:56 ` Sam Protsenko [this message] 2021-11-21 16:56 ` [PATCH v4 03/12] watchdog: s3c2410: Fail probe if can't find valid timeout Sam Protsenko 2021-11-21 16:56 ` [PATCH v4 04/12] watchdog: s3c2410: Let kernel kick watchdog Sam Protsenko 2021-11-21 16:56 ` Sam Protsenko 2021-11-21 16:56 ` [PATCH v4 05/12] watchdog: s3c2410: Make reset disable register optional Sam Protsenko 2021-11-21 16:56 ` Sam Protsenko 2021-11-21 16:56 ` [PATCH v4 06/12] watchdog: s3c2410: Extract disable and mask code into separate functions Sam Protsenko 2021-11-21 16:56 ` Sam Protsenko 2021-11-21 16:56 ` [PATCH v4 07/12] watchdog: s3c2410: Implement a way to invert mask reg value Sam Protsenko 2021-11-21 16:56 ` Sam Protsenko 2021-11-21 16:56 ` [PATCH v4 08/12] watchdog: s3c2410: Add support for WDT counter enable register Sam Protsenko 2021-11-21 16:56 ` Sam Protsenko 2021-11-21 16:56 ` [PATCH v4 09/12] watchdog: s3c2410: Cleanup PMU related code Sam Protsenko 2021-11-21 16:56 ` Sam Protsenko 2021-11-23 16:06 ` Guenter Roeck 2021-11-23 16:06 ` Guenter Roeck 2021-11-23 16:17 ` Sam Protsenko 2021-11-23 16:17 ` Sam Protsenko 2021-11-23 22:33 ` Guenter Roeck 2021-11-23 22:33 ` Guenter Roeck 2021-11-23 23:30 ` Sam Protsenko 2021-11-23 23:30 ` Sam Protsenko 2021-11-27 22:52 ` Sam Protsenko 2021-11-27 22:52 ` Sam Protsenko 2021-11-28 17:56 ` Guenter Roeck 2021-11-28 17:56 ` Guenter Roeck 2021-11-28 19:18 ` Sam Protsenko 2021-11-28 19:18 ` Sam Protsenko 2021-11-21 16:56 ` [PATCH v4 10/12] watchdog: s3c2410: Support separate source clock Sam Protsenko 2021-11-21 16:56 ` Sam Protsenko 2021-11-21 16:56 ` [PATCH v4 11/12] watchdog: s3c2410: Remove superfluous err label Sam Protsenko 2021-11-21 16:56 ` Sam Protsenko 2021-11-21 16:56 ` [PATCH v4 12/12] watchdog: s3c2410: Add Exynos850 support Sam Protsenko 2021-11-21 16:56 ` Sam Protsenko 2021-11-22 15:14 ` Sam Protsenko 2021-11-22 15:14 ` Sam Protsenko 2021-11-23 16:12 ` Guenter Roeck 2021-11-23 16:12 ` Guenter Roeck
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20211121165647.26706-4-semen.protsenko@linaro.org \ --to=semen.protsenko@linaro.org \ --cc=devicetree@vger.kernel.org \ --cc=krzysztof.kozlowski@canonical.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=linux-watchdog@vger.kernel.org \ --cc=linux@roeck-us.net \ --cc=robh+dt@kernel.org \ --cc=wim@linux-watchdog.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.