From: Sam Protsenko <semen.protsenko@linaro.org>
To: Peter Griffin <peter.griffin@linaro.org>
Cc: arnd@arndb.de, krzysztof.kozlowski@linaro.org,
linux@roeck-us.net, wim@linux-watchdog.org,
alim.akhtar@samsung.com, jaewon02.kim@samsung.com,
alexey.klimov@linaro.org, kernel-team@android.com,
tudor.ambarus@linaro.org, andre.draszik@linaro.org,
saravanak@google.com, willmcvicker@google.com,
linux-fsd@tesla.com, linux-watchdog@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org
Subject: Re: [PATCH v4 2/2] watchdog: s3c2410_wdt: use exynos_get_pmu_regmap_by_phandle() for PMU regs
Date: Fri, 9 Feb 2024 14:43:39 -0600 [thread overview]
Message-ID: <CAPLW+4n6e2SQSMSAQ66U09JhYRc7gqkwBqU2LOg_=Z2Aqdd4cw@mail.gmail.com> (raw)
In-Reply-To: <20240208161700.268570-3-peter.griffin@linaro.org>
On Thu, Feb 8, 2024 at 10:21 AM Peter Griffin <peter.griffin@linaro.org> wrote:
>
> Obtain the PMU regmap using the new API added to exynos-pmu driver rather
> than syscon_regmap_lookup_by_phandle(). As this driver no longer depends
> on mfd syscon remove that header and Kconfig dependency.
>
> Reviewed-by: Sam Protsenko <semen.protsenko@linaro.org>
> Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
> ---
Tested-by: Sam Protsenko <semen.protsenko@linaro.org>
Tested on my E850-96 board (Exynos850 chip) with Debian rootfs. Test procedure:
1. Added this to /chosen node in dts:
bootargs = "s3c2410_wdt.tmr_atboot=1 s3c2410_wdt.nowayout=1
s3c2410_wdt.soft_noboot=0";
2. Check if watchdogs are active:
# dmesg | grep watchdog
[ 1.488149] s3c2410-wdt 10050000.watchdog: starting watchdog timer
[ 1.489003] s3c2410-wdt 10050000.watchdog: watchdog active,
reset enabled, irq disabled
[ 1.496928] s3c2410-wdt 10060000.watchdog: starting watchdog timer
[ 1.502984] s3c2410-wdt 10060000.watchdog: watchdog active,
reset enabled, irq disabled
3. Generate a panic to cause wdt reset:
# echo c > /proc/sysrq-trigger
In 15 seconds (wdt timeout) reboot happens, and bootloader shows this
message for the reboot reason:
Watchdog or Warm Reset Detected
That proves regmap works fine with this patch. Otherwise reboot wouldn't happen.
> drivers/watchdog/Kconfig | 1 -
> drivers/watchdog/s3c2410_wdt.c | 8 ++++----
> 2 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index 7d22051b15a2..d78fe7137799 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -512,7 +512,6 @@ config S3C2410_WATCHDOG
> tristate "S3C6410/S5Pv210/Exynos Watchdog"
> depends on ARCH_S3C64XX || ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
> select WATCHDOG_CORE
> - select MFD_SYSCON if ARCH_EXYNOS
> help
> Watchdog timer block in the Samsung S3C64xx, S5Pv210 and Exynos
> SoCs. This will reboot the system when the timer expires with
> diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
> index 349d30462c8c..686cf544d0ae 100644
> --- a/drivers/watchdog/s3c2410_wdt.c
> +++ b/drivers/watchdog/s3c2410_wdt.c
> @@ -24,9 +24,9 @@
> #include <linux/slab.h>
> #include <linux/err.h>
> #include <linux/of.h>
> -#include <linux/mfd/syscon.h>
> #include <linux/regmap.h>
> #include <linux/delay.h>
> +#include <linux/soc/samsung/exynos-pmu.h>
>
> #define S3C2410_WTCON 0x00
> #define S3C2410_WTDAT 0x04
> @@ -699,11 +699,11 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
> return ret;
>
> if (wdt->drv_data->quirks & QUIRKS_HAVE_PMUREG) {
> - wdt->pmureg = syscon_regmap_lookup_by_phandle(dev->of_node,
> - "samsung,syscon-phandle");
> + wdt->pmureg = exynos_get_pmu_regmap_by_phandle(dev->of_node,
> + "samsung,syscon-phandle");
> if (IS_ERR(wdt->pmureg))
> return dev_err_probe(dev, PTR_ERR(wdt->pmureg),
> - "syscon regmap lookup failed.\n");
> + "PMU regmap lookup failed.\n");
> }
>
> wdt_irq = platform_get_irq(pdev, 0);
> --
> 2.43.0.594.gd9cf4e227d-goog
>
prev parent reply other threads:[~2024-02-09 20:43 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-08 16:16 [PATCH v4 0/2] Add regmap support to exynos-pmu for protected PMU regs Peter Griffin
2024-02-08 16:16 ` [PATCH v4 1/2] soc: samsung: exynos-pmu: Add regmap support for SoCs that protect " Peter Griffin
2024-02-08 17:47 ` Sam Protsenko
2024-02-09 14:52 ` Alexey Klimov
2024-02-09 15:19 ` Peter Griffin
2024-02-09 20:50 ` Sam Protsenko
2024-02-15 18:36 ` Krzysztof Kozlowski
2024-02-19 19:47 ` Peter Griffin
2024-02-20 6:56 ` Krzysztof Kozlowski
2024-02-20 10:43 ` Peter Griffin
2024-02-08 16:17 ` [PATCH v4 2/2] watchdog: s3c2410_wdt: use exynos_get_pmu_regmap_by_phandle() for " Peter Griffin
2024-02-08 17:38 ` Guenter Roeck
2024-02-09 10:35 ` Alexey Klimov
2024-02-09 20:43 ` Sam Protsenko [this message]
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='CAPLW+4n6e2SQSMSAQ66U09JhYRc7gqkwBqU2LOg_=Z2Aqdd4cw@mail.gmail.com' \
--to=semen.protsenko@linaro.org \
--cc=alexey.klimov@linaro.org \
--cc=alim.akhtar@samsung.com \
--cc=andre.draszik@linaro.org \
--cc=arnd@arndb.de \
--cc=jaewon02.kim@samsung.com \
--cc=kernel-team@android.com \
--cc=krzysztof.kozlowski@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-fsd@tesla.com \
--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=peter.griffin@linaro.org \
--cc=saravanak@google.com \
--cc=tudor.ambarus@linaro.org \
--cc=willmcvicker@google.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).