From: Guenter Roeck <linux@roeck-us.net>
To: "Álvaro Fernández Rojas" <noltari@gmail.com>,
"Wim Van Sebroeck" <wim@linux-watchdog.org>,
linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] watchdog: bcm7038_wdt: add big endian support
Date: Mon, 22 Feb 2021 13:24:04 -0800 [thread overview]
Message-ID: <9381ef9e-a569-9bcd-5546-a48922e4961d@roeck-us.net> (raw)
In-Reply-To: <20210222200338.24696-1-noltari@gmail.com>
On 2/22/21 12:03 PM, Álvaro Fernández Rojas wrote:
> bcm7038_wdt can be used on bmips (bcm63xx) devices too.
>
It might make sense to actually enable it for BCM63XX.
> Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
> ---
> drivers/watchdog/bcm7038_wdt.c | 30 ++++++++++++++++++++++++------
> 1 file changed, 24 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/watchdog/bcm7038_wdt.c b/drivers/watchdog/bcm7038_wdt.c
> index 979caa18d3c8..62494da1ac57 100644
> --- a/drivers/watchdog/bcm7038_wdt.c
> +++ b/drivers/watchdog/bcm7038_wdt.c
> @@ -34,6 +34,24 @@ struct bcm7038_watchdog {
>
> static bool nowayout = WATCHDOG_NOWAYOUT;
>
> +static inline void bcm7038_wdt_write(unsigned long data, void __iomem *reg)
> +{
> +#ifdef CONFIG_CPU_BIG_ENDIAN
> + __raw_writel(data, reg);
> +#else
> + writel(data, reg);
> +#endif
> +}
> +
> +static inline unsigned long bcm7038_wdt_read(void __iomem *reg)
> +{
> +#ifdef CONFIG_CPU_BIG_ENDIAN
> + return __raw_readl(reg);
> +#else
> + return readl(reg);
> +#endif
> +}
> +
This needs further explanation. Why not just use __raw_writel() and
__raw_readl() unconditionally ? Also, is it known for sure that,
say, bmips_be_defconfig otherwise uses the wrong endianness
(vs. bmips_stb_defconfig which is a little endian configuration) ?
Thanks,
Guenter
> static void bcm7038_wdt_set_timeout_reg(struct watchdog_device *wdog)
> {
> struct bcm7038_watchdog *wdt = watchdog_get_drvdata(wdog);
> @@ -41,15 +59,15 @@ static void bcm7038_wdt_set_timeout_reg(struct watchdog_device *wdog)
>
> timeout = wdt->rate * wdog->timeout;
>
> - writel(timeout, wdt->base + WDT_TIMEOUT_REG);
> + bcm7038_wdt_write(timeout, wdt->base + WDT_TIMEOUT_REG);
> }
>
> static int bcm7038_wdt_ping(struct watchdog_device *wdog)
> {
> struct bcm7038_watchdog *wdt = watchdog_get_drvdata(wdog);
>
> - writel(WDT_START_1, wdt->base + WDT_CMD_REG);
> - writel(WDT_START_2, wdt->base + WDT_CMD_REG);
> + bcm7038_wdt_write(WDT_START_1, wdt->base + WDT_CMD_REG);
> + bcm7038_wdt_write(WDT_START_2, wdt->base + WDT_CMD_REG);
>
> return 0;
> }
> @@ -66,8 +84,8 @@ static int bcm7038_wdt_stop(struct watchdog_device *wdog)
> {
> struct bcm7038_watchdog *wdt = watchdog_get_drvdata(wdog);
>
> - writel(WDT_STOP_1, wdt->base + WDT_CMD_REG);
> - writel(WDT_STOP_2, wdt->base + WDT_CMD_REG);
> + bcm7038_wdt_write(WDT_STOP_1, wdt->base + WDT_CMD_REG);
> + bcm7038_wdt_write(WDT_STOP_2, wdt->base + WDT_CMD_REG);
>
> return 0;
> }
> @@ -88,7 +106,7 @@ static unsigned int bcm7038_wdt_get_timeleft(struct watchdog_device *wdog)
> struct bcm7038_watchdog *wdt = watchdog_get_drvdata(wdog);
> u32 time_left;
>
> - time_left = readl(wdt->base + WDT_CMD_REG);
> + time_left = bcm7038_wdt_read(wdt->base + WDT_CMD_REG);
>
> return time_left / wdt->rate;
> }
>
next prev parent reply other threads:[~2021-02-22 21:24 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-22 20:03 [PATCH] watchdog: bcm7038_wdt: add big endian support Álvaro Fernández Rojas
2021-02-22 21:24 ` Guenter Roeck [this message]
2021-02-22 21:48 ` Álvaro Fernández Rojas
2021-02-22 22:24 ` Guenter Roeck
2021-02-23 3:41 ` Florian Fainelli
2021-02-23 3:58 ` Florian Fainelli
2021-02-23 8:00 ` [PATCH v2] " Álvaro Fernández Rojas
2021-02-23 15:19 ` 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=9381ef9e-a569-9bcd-5546-a48922e4961d@roeck-us.net \
--to=linux@roeck-us.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=noltari@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: 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 NNTP newsgroup(s).