From: Christophe Roullier <christophe.roullier@st.com> To: <wim@linux-watchdog.org>, <linux@roeck-us.net>, <mcoquelin.stm32@gmail.com>, <alexandre.torgue@st.com> Cc: <linux-watchdog@vger.kernel.org>, <christophe.roullier@st.com>, <linux-kernel@vger.kernel.org>, <linux-stm32@st-md-mailman.stormreply.com>, <linux-arm-kernel@lists.infradead.org> Subject: [PATCH v2 1/1] drivers: watchdog: stm32_iwdg: set WDOG_HW_RUNNING at probe Date: Fri, 22 Nov 2019 09:24:42 +0100 [thread overview] Message-ID: <20191122082442.21695-1-christophe.roullier@st.com> (raw) If the watchdog hardware is already enabled during the boot process, when the Linux watchdog driver loads, it should start/reset the watchdog and tell the watchdog framework. As a result, ping can be generated from the watchdog framework (if CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED is set), until the userspace watchdog daemon takes over control Fixes:4332d113c66a ("watchdog: Add STM32 IWDG driver") Signed-off-by: Christophe Roullier <christophe.roullier@st.com> --- Changes since v1: According to Guenter I follow the guidance from intel-mid_wdt.c and I added test to check if CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED is set because we need to be flexible (depends on customer config, but watchdog not always start by bootloader (Uboot, ..)) I've tested some config and it is working as expected: Watchdog enable in Uboot + HANDLE_BOOT_ENABLE is not set + daemon watchdog in userland ON ==> No reset IWDG2 Watchdog enable in Uboot + HANDLE_BOOT_ENABLE is not set ==> Reset IWDG2 Watchdog enable in Uboot + HANDLE_BOOT_ENABLE=y ==> No reset IWDG2 Watchdog enable in Uboot + HANDLE_BOOT_ENABLE=y + daemon watchdog in userland ON puis OFF ==> Reset IWDG2 Watchdog disable in Uboot + HANDLE_BOOT_ENABLE is not set ==> No reset IWDG2 Watchdog disable in Uboot + HANDLE_BOOT_ENABLE=y ==> No reset IWDG2 Watchdog disable in Uboot + HANDLE_BOOT_ENABLE=y + daemon watchdog in userland ON ==> No reset IWDG2 Watchdog disable in Uboot + HANDLE_BOOT_ENABLE=y + daemon watchdog in userland ON puis OFF ==> Reset IWDG2 Thanks, Christophe drivers/watchdog/stm32_iwdg.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/drivers/watchdog/stm32_iwdg.c b/drivers/watchdog/stm32_iwdg.c index a3a329011a06..7f454a6e17ba 100644 --- a/drivers/watchdog/stm32_iwdg.c +++ b/drivers/watchdog/stm32_iwdg.c @@ -50,6 +50,9 @@ #define TIMEOUT_US 100000 #define SLEEP_US 1000 +static bool handle_boot_enabled = + IS_ENABLED(CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED); + struct stm32_iwdg_data { bool has_pclk; u32 max_prescaler; @@ -262,6 +265,24 @@ static int stm32_iwdg_probe(struct platform_device *pdev) watchdog_set_nowayout(wdd, WATCHDOG_NOWAYOUT); watchdog_init_timeout(wdd, 0, dev); + /* + * In case of CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED is set + * (Means U-Boot/bootloaders leaves the watchdog running) + * When we get here we should make a decision to prevent + * any side effects before user space daemon will take care of it. + * The best option, taking into consideration that there is no + * way to read values back from hardware, is to enforce watchdog + * being run with deterministic values. + */ + if (handle_boot_enabled) { + ret = stm32_iwdg_start(wdd); + if (ret) + return ret; + + /* Make sure the watchdog is serviced */ + set_bit(WDOG_HW_RUNNING, &wdd->status); + } + ret = devm_watchdog_register_device(dev, wdd); if (ret) return ret; -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Christophe Roullier <christophe.roullier@st.com> To: <wim@linux-watchdog.org>, <linux@roeck-us.net>, <mcoquelin.stm32@gmail.com>, <alexandre.torgue@st.com> Cc: linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org, christophe.roullier@st.com Subject: [PATCH v2 1/1] drivers: watchdog: stm32_iwdg: set WDOG_HW_RUNNING at probe Date: Fri, 22 Nov 2019 09:24:42 +0100 [thread overview] Message-ID: <20191122082442.21695-1-christophe.roullier@st.com> (raw) If the watchdog hardware is already enabled during the boot process, when the Linux watchdog driver loads, it should start/reset the watchdog and tell the watchdog framework. As a result, ping can be generated from the watchdog framework (if CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED is set), until the userspace watchdog daemon takes over control Fixes:4332d113c66a ("watchdog: Add STM32 IWDG driver") Signed-off-by: Christophe Roullier <christophe.roullier@st.com> --- Changes since v1: According to Guenter I follow the guidance from intel-mid_wdt.c and I added test to check if CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED is set because we need to be flexible (depends on customer config, but watchdog not always start by bootloader (Uboot, ..)) I've tested some config and it is working as expected: Watchdog enable in Uboot + HANDLE_BOOT_ENABLE is not set + daemon watchdog in userland ON ==> No reset IWDG2 Watchdog enable in Uboot + HANDLE_BOOT_ENABLE is not set ==> Reset IWDG2 Watchdog enable in Uboot + HANDLE_BOOT_ENABLE=y ==> No reset IWDG2 Watchdog enable in Uboot + HANDLE_BOOT_ENABLE=y + daemon watchdog in userland ON puis OFF ==> Reset IWDG2 Watchdog disable in Uboot + HANDLE_BOOT_ENABLE is not set ==> No reset IWDG2 Watchdog disable in Uboot + HANDLE_BOOT_ENABLE=y ==> No reset IWDG2 Watchdog disable in Uboot + HANDLE_BOOT_ENABLE=y + daemon watchdog in userland ON ==> No reset IWDG2 Watchdog disable in Uboot + HANDLE_BOOT_ENABLE=y + daemon watchdog in userland ON puis OFF ==> Reset IWDG2 Thanks, Christophe drivers/watchdog/stm32_iwdg.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/drivers/watchdog/stm32_iwdg.c b/drivers/watchdog/stm32_iwdg.c index a3a329011a06..7f454a6e17ba 100644 --- a/drivers/watchdog/stm32_iwdg.c +++ b/drivers/watchdog/stm32_iwdg.c @@ -50,6 +50,9 @@ #define TIMEOUT_US 100000 #define SLEEP_US 1000 +static bool handle_boot_enabled = + IS_ENABLED(CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED); + struct stm32_iwdg_data { bool has_pclk; u32 max_prescaler; @@ -262,6 +265,24 @@ static int stm32_iwdg_probe(struct platform_device *pdev) watchdog_set_nowayout(wdd, WATCHDOG_NOWAYOUT); watchdog_init_timeout(wdd, 0, dev); + /* + * In case of CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED is set + * (Means U-Boot/bootloaders leaves the watchdog running) + * When we get here we should make a decision to prevent + * any side effects before user space daemon will take care of it. + * The best option, taking into consideration that there is no + * way to read values back from hardware, is to enforce watchdog + * being run with deterministic values. + */ + if (handle_boot_enabled) { + ret = stm32_iwdg_start(wdd); + if (ret) + return ret; + + /* Make sure the watchdog is serviced */ + set_bit(WDOG_HW_RUNNING, &wdd->status); + } + ret = devm_watchdog_register_device(dev, wdd); if (ret) return ret; -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next reply other threads:[~2019-11-22 8:25 UTC|newest] Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-22 8:24 Christophe Roullier [this message] 2019-11-22 8:24 ` [PATCH v2 1/1] drivers: watchdog: stm32_iwdg: set WDOG_HW_RUNNING at probe Christophe Roullier 2019-11-22 10:28 ` [Linux-stm32] " Ahmad Fatoum 2019-11-22 10:28 ` Ahmad Fatoum 2019-11-22 13:15 ` Christophe ROULLIER 2019-11-22 13:15 ` Christophe ROULLIER 2019-11-22 13:31 ` Ahmad Fatoum 2019-11-22 13:31 ` Ahmad Fatoum 2019-11-22 10:45 ` Guenter Roeck 2019-11-22 10:45 ` 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=20191122082442.21695-1-christophe.roullier@st.com \ --to=christophe.roullier@st.com \ --cc=alexandre.torgue@st.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-stm32@st-md-mailman.stormreply.com \ --cc=linux-watchdog@vger.kernel.org \ --cc=linux@roeck-us.net \ --cc=mcoquelin.stm32@gmail.com \ --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.