From: Biju Das <biju.das.jz@bp.renesas.com>
To: Wim Van Sebroeck <wim@linux-watchdog.org>,
Guenter Roeck <linux@roeck-us.net>,
Philipp Zabel <p.zabel@pengutronix.de>
Cc: Biju Das <biju.das.jz@bp.renesas.com>,
linux-watchdog@vger.kernel.org,
Geert Uytterhoeven <geert+renesas@glider.be>,
Chris Paterson <Chris.Paterson2@renesas.com>,
Biju Das <biju.das@bp.renesas.com>,
Prabhakar Mahadev Lad <prabhakar.mahadev-lad.rj@bp.renesas.com>,
linux-renesas-soc@vger.kernel.org
Subject: [PATCH v5 6/7] watchdog: rzg2l_wdt: Use force reset for WDT reset
Date: Fri, 25 Feb 2022 17:53:19 +0000 [thread overview]
Message-ID: <20220225175320.11041-7-biju.das.jz@bp.renesas.com> (raw)
In-Reply-To: <20220225175320.11041-1-biju.das.jz@bp.renesas.com>
This patch uses the force reset(WDTRSTB) for triggering WDT reset for
restart callback. This method(ie, Generate Reset (WDTRSTB) Signal on
parity error)is faster compared to the overflow method for triggering
watchdog reset.
Overflow method:
reboot: Restarting system
Reboot failed -- System halted
NOTICE: BL2: v2.5(release):v2.5/rzg2l-1.00-27-gf48f1440c
Parity error method:
reboot: Restarting system
NOTICE: BL2: v2.5(release):v2.5/rzg2l-1.00-27-gf48f1440c
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
V4->V5:
* Added Rb tag from Geert.
V3->V4:
* Renamed PEEN_FORCE_RST->PEEN_FORCE
* Updated comments with parity error description
* Updated commit description
V2->v3:
* Patch reordering from patch 4->patch 2
* Updated the commit description.
V1->V2:
* Updated the commit description.
---
drivers/watchdog/rzg2l_wdt.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/watchdog/rzg2l_wdt.c b/drivers/watchdog/rzg2l_wdt.c
index 73b667ed3e99..4e7107655cc2 100644
--- a/drivers/watchdog/rzg2l_wdt.c
+++ b/drivers/watchdog/rzg2l_wdt.c
@@ -21,8 +21,11 @@
#define WDTSET 0x04
#define WDTTIM 0x08
#define WDTINT 0x0C
+#define PECR 0x10
+#define PEEN 0x14
#define WDTCNT_WDTEN BIT(0)
#define WDTINT_INTDISP BIT(0)
+#define PEEN_FORCE BIT(0)
#define WDT_DEFAULT_TIMEOUT 60U
@@ -117,17 +120,14 @@ static int rzg2l_wdt_restart(struct watchdog_device *wdev,
{
struct rzg2l_wdt_priv *priv = watchdog_get_drvdata(wdev);
- /* Reset the module before we modify any register */
- reset_control_reset(priv->rstc);
-
clk_prepare_enable(priv->pclk);
clk_prepare_enable(priv->osc_clk);
- /* smallest counter value to reboot soon */
- rzg2l_wdt_write(priv, WDTSET_COUNTER_VAL(1), WDTSET);
+ /* Generate Reset (WDTRSTB) Signal on parity error */
+ rzg2l_wdt_write(priv, 0, PECR);
- /* Enable watchdog timer*/
- rzg2l_wdt_write(priv, WDTCNT_WDTEN, WDTCNT);
+ /* Force parity error */
+ rzg2l_wdt_write(priv, PEEN_FORCE, PEEN);
return 0;
}
--
2.17.1
next prev parent reply other threads:[~2022-02-25 17:53 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-25 17:53 [PATCH v5 0/7] RZG2L_WDT Fixes and Improvements Biju Das
2022-02-25 17:53 ` [PATCH v5 1/7] watchdog: rzg2l_wdt: Fix 32bit overflow issue Biju Das
2022-02-25 17:53 ` [PATCH v5 2/7] watchdog: rzg2l_wdt: Fix Runtime PM usage Biju Das
2022-02-25 20:17 ` Guenter Roeck
2022-02-25 17:53 ` [PATCH v5 3/7] watchdog: rzg2l_wdt: Fix 'BUG: Invalid wait context' Biju Das
2022-02-25 20:18 ` Guenter Roeck
2022-02-25 17:53 ` [PATCH v5 4/7] watchdog: rzg2l_wdt: Fix reset control imbalance Biju Das
2022-03-01 11:20 ` Geert Uytterhoeven
2022-03-09 23:08 ` Guenter Roeck
2022-02-25 17:53 ` [PATCH v5 5/7] watchdog: rzg2l_wdt: Add error check for reset_control_deassert Biju Das
2022-02-26 9:15 ` Sergei Shtylyov
2022-02-28 14:36 ` Biju Das
2022-03-01 11:21 ` Geert Uytterhoeven
2022-03-09 23:09 ` Guenter Roeck
2022-02-25 17:53 ` Biju Das [this message]
2022-02-25 20:18 ` [PATCH v5 6/7] watchdog: rzg2l_wdt: Use force reset for WDT reset Guenter Roeck
2022-02-25 17:53 ` [PATCH v5 7/7] watchdog: rzg2l_wdt: Add set_timeout callback Biju Das
2022-02-25 20:18 ` Guenter Roeck
2022-03-07 8:52 ` [PATCH v5 0/7] RZG2L_WDT Fixes and Improvements Biju Das
2022-03-09 23:42 ` Guenter Roeck
2022-03-10 6:53 ` Biju Das
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=20220225175320.11041-7-biju.das.jz@bp.renesas.com \
--to=biju.das.jz@bp.renesas.com \
--cc=Chris.Paterson2@renesas.com \
--cc=biju.das@bp.renesas.com \
--cc=geert+renesas@glider.be \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=p.zabel@pengutronix.de \
--cc=prabhakar.mahadev-lad.rj@bp.renesas.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 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.