From: Peter Yin <peteryin.openbmc@gmail.com>
To: patrick@stwcx.xyz, Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Conor Dooley <conor+dt@kernel.org>, Joel Stanley <joel@jms.id.au>,
Andrew Jeffery <andrew@codeconstruct.com.au>,
Wim Van Sebroeck <wim@linux-watchdog.org>,
Guenter Roeck <linux@roeck-us.net>,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org,
linux-watchdog@vger.kernel.org
Subject: [PATCH v2] drivers: watchdog: ast2600 support bootstatus
Date: Mon, 18 Mar 2024 13:52:19 +0800 [thread overview]
Message-ID: <20240318055219.3460121-1-peteryin.openbmc@gmail.com> (raw)
Add WDIOF_EXTERN1 and WDIOF_CARDRESET bootstatus in ast2600
Regarding the AST2600 specification, the WDTn Timeout Status Register
(WDT10) has bit 1 reserved. To verify the second boot source,
we need to check SEC14 bit 12 and bit 13.
The bits 8-23 in the WDTn Timeout Status Register are the Watchdog
Event Count, which we can use to verify WDIOF_EXTERN1.
Signed-off-by: Peter Yin <peteryin.openbmc@gmail.com>
---
Change log:
v1 -> v2
- Add comment and support WDIOF_CARDRESET in ast2600
v1
- Patch 0001 - Add WDIOF_EXTERN1 bootstatus
---
arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | 8 ++---
drivers/watchdog/aspeed_wdt.c | 45 ++++++++++++++++++++++---
2 files changed, 44 insertions(+), 9 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
index e0b44498269f..23ae7f0430e9 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
+++ b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
@@ -556,24 +556,24 @@ uart5: serial@1e784000 {
wdt1: watchdog@1e785000 {
compatible = "aspeed,ast2600-wdt";
- reg = <0x1e785000 0x40>;
+ reg = <0x1e785000 0x40>, <0x1e6f2000 0x20>;
};
wdt2: watchdog@1e785040 {
compatible = "aspeed,ast2600-wdt";
- reg = <0x1e785040 0x40>;
+ reg = <0x1e785040 0x40>, <0x1e6f2000 0x020>;
status = "disabled";
};
wdt3: watchdog@1e785080 {
compatible = "aspeed,ast2600-wdt";
- reg = <0x1e785080 0x40>;
+ reg = <0x1e785080 0x40>, <0x1e6f2000 0x020>;
status = "disabled";
};
wdt4: watchdog@1e7850c0 {
compatible = "aspeed,ast2600-wdt";
- reg = <0x1e7850C0 0x40>;
+ reg = <0x1e7850C0 0x40>, <0x1e6f2000 0x020>;
status = "disabled";
};
diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c
index b4773a6aaf8c..65118e461130 100644
--- a/drivers/watchdog/aspeed_wdt.c
+++ b/drivers/watchdog/aspeed_wdt.c
@@ -33,6 +33,7 @@ struct aspeed_wdt {
void __iomem *base;
u32 ctrl;
const struct aspeed_wdt_config *cfg;
+ void __iomem *sec_base;
};
static const struct aspeed_wdt_config ast2400_config = {
@@ -82,6 +83,15 @@ MODULE_DEVICE_TABLE(of, aspeed_wdt_of_table);
#define WDT_RESET_MASK1 0x1c
#define WDT_RESET_MASK2 0x20
+/*
+ * Only Ast2600 support
+ */
+#define WDT_EVENT_COUNTER_MASK (0xFFF << 8)
+#define WDT_SECURE_ENGINE_STATUS (0x14)
+#define ABR_IMAGE_SOURCE BIT(12)
+#define ABR_IMAGE_SOURCE_SPI BIT(13)
+#define SECOND_BOOT_ENABLE BIT(14)
+
/*
* WDT_RESET_WIDTH controls the characteristics of the external pulse (if
* enabled), specifically:
@@ -313,6 +323,7 @@ static int aspeed_wdt_probe(struct platform_device *pdev)
const char *reset_type;
u32 duration;
u32 status;
+ u32 sec_st;
int ret;
wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL);
@@ -330,6 +341,12 @@ static int aspeed_wdt_probe(struct platform_device *pdev)
if (IS_ERR(wdt->base))
return PTR_ERR(wdt->base);
+ if (of_device_is_compatible(np, "aspeed,ast2600-wdt")) {
+ wdt->sec_base = devm_platform_ioremap_resource(pdev, 1);
+ if (IS_ERR(wdt->sec_base))
+ return PTR_ERR(wdt->sec_base);
+ }
+
wdt->wdd.info = &aspeed_wdt_info;
if (wdt->cfg->irq_mask) {
@@ -459,12 +476,30 @@ static int aspeed_wdt_probe(struct platform_device *pdev)
}
status = readl(wdt->base + WDT_TIMEOUT_STATUS);
- if (status & WDT_TIMEOUT_STATUS_BOOT_SECONDARY) {
- wdt->wdd.bootstatus = WDIOF_CARDRESET;
- if (of_device_is_compatible(np, "aspeed,ast2400-wdt") ||
- of_device_is_compatible(np, "aspeed,ast2500-wdt"))
- wdt->wdd.groups = bswitch_groups;
+ if (of_device_is_compatible(np, "aspeed,ast2600-wdt")) {
+ /*
+ * The WDTn Timeout Status Register bit 1 is reserved.
+ * To verify the second boot source,
+ * we need to check SEC14 bit 12 and bit 13.
+ */
+ sec_st = readl(wdt->sec_base + WDT_SECURE_ENGINE_STATUS);
+ if( sec_st & SECOND_BOOT_ENABLE)
+ if (sec_st & ABR_IMAGE_SOURCE ||
+ sec_st & ABR_IMAGE_SOURCE_SPI)
+ wdt->wdd.bootstatus |= WDIOF_CARDRESET;
+
+ /*
+ * To check Watchdog Event Count for WDIOF_EXTERN1
+ */
+ if (status & WDT_EVENT_COUNTER_MASK) {
+ wdt->wdd.bootstatus |= WDIOF_EXTERN1;
+ }
+ } else {
+ wdt->wdd.groups = bswitch_groups;
+
+ if (status & WDT_TIMEOUT_STATUS_BOOT_SECONDARY)
+ wdt->wdd.bootstatus = WDIOF_CARDRESET;
}
dev_set_drvdata(dev, wdt);
--
2.25.1
next reply other threads:[~2024-03-18 5:52 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-18 5:52 Peter Yin [this message]
2024-03-18 7:58 ` [PATCH v2] drivers: watchdog: ast2600 support bootstatus Krzysztof Kozlowski
2024-03-19 0:46 ` Guenter Roeck
2024-03-20 9:05 ` PeterYin
2024-03-25 17:06 ` 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=20240318055219.3460121-1-peteryin.openbmc@gmail.com \
--to=peteryin.openbmc@gmail.com \
--cc=andrew@codeconstruct.com.au \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=joel@jms.id.au \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-aspeed@lists.ozlabs.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=patrick@stwcx.xyz \
--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: 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).