| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20241101121201.2464091-4-chin-ting_kuo@aspeedtech.com>
Date: Fri, 1 Nov 2024 20:12:01 +0800
From: Chin-Ting Kuo <chin-ting_kuo@...eedtech.com>
To: <patrick@...cx.xyz>, <joel@....id.au>, <andrew@...econstruct.com.au>,
<wim@...ux-watchdog.org>, <linux@...ck-us.net>,
<linux-arm-kernel@...ts.infradead.org>, <linux-aspeed@...ts.ozlabs.org>,
<linux-kernel@...r.kernel.org>, <linux-watchdog@...r.kernel.org>
CC: <Peter.Yin@...ntatw.com>, <Patrick_NC_Lin@...ynn.com>,
<Bonnie_Lo@...ynn.com>, <DELPHINE_CHIU@...ynn.com>, <bmc-sw@...eedtech.com>,
<chnguyen@...erecomputing.com>
Subject: [PATCH v4 3/3] watchdog: aspeed: Update restart implementations
Restart callback function is created to distinguish the restart mechanisms
between AST2400/AST2500 and AST2600.
On AST2400 and AST2500 platforms, system can only be reset by enabling
WDT and waiting for WDT timeout. Since AST2600, SW can trigger the reset
event consciously and directly by just cinfiguring some HW registers
without waiting for WDT timeout. This mechanism is named "SW restart" and
is implemented by HW. The WDT counter is not enabled when SW restart
is adopted.
Signed-off-by: Chin-Ting Kuo <chin-ting_kuo@...eedtech.com>
---
drivers/watchdog/aspeed_wdt.c | 59 +++++++++++++++++++++++++++++------
1 file changed, 49 insertions(+), 10 deletions(-)
diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c
index 63b5ff9e2751..28a16a0c442d 100644
--- a/drivers/watchdog/aspeed_wdt.c
+++ b/drivers/watchdog/aspeed_wdt.c
@@ -23,6 +23,14 @@ static bool nowayout = WATCHDOG_NOWAYOUT;
module_param(nowayout, bool, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+
+struct aspeed_wdt {
+ struct watchdog_device wdd;
+ void __iomem *base;
+ u32 ctrl;
+ const struct aspeed_wdt_data *data;
+};
+
struct aspeed_wdt_scu {
const char *compatible;
u32 reset_status_reg;
@@ -36,14 +44,11 @@ struct aspeed_wdt_data {
u32 irq_shift;
u32 irq_mask;
struct aspeed_wdt_scu scu;
+ int (*restart)(struct aspeed_wdt *wdt);
};
-struct aspeed_wdt {
- struct watchdog_device wdd;
- void __iomem *base;
- u32 ctrl;
- const struct aspeed_wdt_data *data;
-};
+static int aspeed_ast2400_wdt_restart(struct aspeed_wdt *wdt);
+static int aspeed_ast2600_wdt_restart(struct aspeed_wdt *wdt);
static const struct aspeed_wdt_data ast2400_data = {
.ext_pulse_width_mask = 0xff,
@@ -56,6 +61,7 @@ static const struct aspeed_wdt_data ast2400_data = {
.wdt_sw_reset_mask = 0,
.wdt_reset_mask_shift = 1,
},
+ .restart = aspeed_ast2400_wdt_restart,
};
static const struct aspeed_wdt_data ast2500_data = {
@@ -69,6 +75,7 @@ static const struct aspeed_wdt_data ast2500_data = {
.wdt_sw_reset_mask = 0,
.wdt_reset_mask_shift = 2,
},
+ .restart = aspeed_ast2400_wdt_restart,
};
static const struct aspeed_wdt_data ast2600_data = {
@@ -82,6 +89,7 @@ static const struct aspeed_wdt_data ast2600_data = {
.wdt_sw_reset_mask = 0x8,
.wdt_reset_mask_shift = 16,
},
+ .restart = aspeed_ast2600_wdt_restart,
};
static const struct of_device_id aspeed_wdt_of_table[] = {
@@ -112,6 +120,11 @@ MODULE_DEVICE_TABLE(of, aspeed_wdt_of_table);
#define WDT_CLEAR_TIMEOUT_AND_BOOT_CODE_SELECTION BIT(0)
#define WDT_RESET_MASK1 0x1c
#define WDT_RESET_MASK2 0x20
+#define WDT_SW_RESET_CTRL 0x24
+#define WDT_SW_RESET_COUNT_CLEAR 0xDEADDEAD
+#define WDT_SW_RESET_ENABLE 0xAEEDF123
+#define WDT_SW_RESET_MASK1 0x28
+#define WDT_SW_RESET_MASK2 0x2c
/*
* WDT_RESET_WIDTH controls the characteristics of the external pulse (if
@@ -231,11 +244,8 @@ static int aspeed_wdt_set_pretimeout(struct watchdog_device *wdd,
return 0;
}
-static int aspeed_wdt_restart(struct watchdog_device *wdd,
- unsigned long action, void *data)
+static int aspeed_ast2400_wdt_restart(struct aspeed_wdt *wdt)
{
- struct aspeed_wdt *wdt = to_aspeed_wdt(wdd);
-
wdt->ctrl &= ~WDT_CTRL_BOOT_SECONDARY;
aspeed_wdt_enable(wdt, 128 * WDT_RATE_1MHZ / 1000);
@@ -244,6 +254,35 @@ static int aspeed_wdt_restart(struct watchdog_device *wdd,
return 0;
}
+static int aspeed_ast2600_wdt_restart(struct aspeed_wdt *wdt)
+{
+ u32 reg;
+ u32 ctrl = WDT_CTRL_RESET_MODE_SOC |
+ WDT_CTRL_RESET_SYSTEM;
+
+ reg = readl(wdt->base + WDT_RESET_MASK1);
+ writel(reg, wdt->base + WDT_SW_RESET_MASK1);
+ reg = readl(wdt->base + WDT_RESET_MASK2);
+ writel(reg, wdt->base + WDT_SW_RESET_MASK2);
+
+ writel(ctrl, wdt->base + WDT_CTRL);
+ writel(WDT_SW_RESET_COUNT_CLEAR, wdt->base + WDT_SW_RESET_CTRL);
+ writel(WDT_SW_RESET_ENABLE, wdt->base + WDT_SW_RESET_CTRL);
+
+ /* system must be reset immediately */
+ mdelay(1000);
+
+ return 0;
+}
+
+static int aspeed_wdt_restart(struct watchdog_device *wdd,
+ unsigned long action, void *data)
+{
+ struct aspeed_wdt *wdt = to_aspeed_wdt(wdd);
+
+ return wdt->data->restart(wdt);
+}
+
static int aspeed_wdt_update_bootstatus(struct platform_device *pdev,
struct aspeed_wdt *wdt)
{
--
2.34.1
Powered by blists - more mailing lists