Skip to contentSkip to conversation

wdt/aspeed: Support software reset mode for AST2600

PATCH Applied Jamin Lin via 2 participants 4 messages Jan 24, 2025 Arm/Aspeed machine support

lore
Share & tools
lore
#0 lore raw

v2 cover wdt/aspeed: Support software reset mode for AST2600

v1:
Support software reset mode for AST2600
v2:
Change to validate WDT_CTRL_RESET_MODE_SOC

Jamin Lin (2):
aspeed/wdt: Fix coding style
aspeed/wdt: Support software reset mode for AST2600

 hw/watchdog/wdt_aspeed.c | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)
Signature · 1 line
2.34.1
#1 lore raw

PATCH v2 1/2 aspeed/wdt: Fix coding style

Fix coding style issues from checkpatch.pl.

---
 hw/watchdog/wdt_aspeed.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
hw/watchdog/wdt_aspeed.c +2 -1
index 81f5c5189a..22e94e7b9c 100644
@@ -278,7 +278,8 @@ static void aspeed_wdt_realize(DeviceState *dev, Error **errp)
 
     s->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, aspeed_wdt_timer_expired, dev);
 
-    /* FIXME: This setting should be derived from the SCU hw strapping
+    /*
+     * FIXME: This setting should be derived from the SCU hw strapping
      * register SCU70
      */
     s->pclk_freq = PCLK_HZ;
Signature · 1 line
2.34.1
#2 lore raw

PATCH v2 2/2 aspeed/wdt: Support software reset mode for AST2600

In reply to Jamin Lin via

On the AST2400 and AST2500 platforms, the system can only be reset by enabling the WDT (Watchdog Timer) and waiting for the WDT timeout. However, starting from the AST2600 platform, the reset event can be triggered directly and intentionally by software, without relying on the WDT timeout.

This mechanism, referred to as "software restart", is implemented in hardware. When using the software restart mechanism, the WDT counter is not enabled.

To trigger a reset generation in software mode, write 0xAEEDF123 to register 0x24 and software mode reset only support SOC reset mode.

A new function, "aspeed_wdt_is_soc_reset_mode", is introduced to determine whether the SoC reset mode is active.

---
 hw/watchdog/wdt_aspeed.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)
hw/watchdog/wdt_aspeed.c +15 -1
index 22e94e7b9c..d94b83c109 100644
@@ -51,11 +51,20 @@
 #define WDT_TIMEOUT_CLEAR               (0x14 / 4)
 
 #define WDT_RESTART_MAGIC               0x4755
+#define WDT_SW_RESET_ENABLE             0xAEEDF123
 
 #define AST2600_SCU_RESET_CONTROL1      (0x40 / 4)
 #define SCU_RESET_CONTROL1              (0x04 / 4)
 #define    SCU_RESET_SDRAM              BIT(0)
 
+static bool aspeed_wdt_is_soc_reset_mode(const AspeedWDTState *s)
+{
+    uint32_t mode;
+
+    mode = extract32(s->regs[WDT_CTRL], 5, 2);
+    return (mode == WDT_CTRL_RESET_MODE_SOC);
+}
+
 static bool aspeed_wdt_is_enabled(const AspeedWDTState *s)
 {
     return s->regs[WDT_CTRL] & WDT_CTRL_ENABLE;
@@ -199,13 +208,18 @@ static void aspeed_wdt_write(void *opaque, hwaddr offset, uint64_t data,
     case WDT_TIMEOUT_STATUS:
     case WDT_TIMEOUT_CLEAR:
     case WDT_RESET_MASK2:
-    case WDT_SW_RESET_CTRL:
     case WDT_SW_RESET_MASK1:
     case WDT_SW_RESET_MASK2:
         qemu_log_mask(LOG_UNIMP,
                       "%s: uninmplemented write at offset 0x%" HWADDR_PRIx "\n",
                       __func__, offset);
         break;
+    case WDT_SW_RESET_CTRL:
+        if (aspeed_wdt_is_soc_reset_mode(s) &&
+            (data == WDT_SW_RESET_ENABLE)) {
+            watchdog_perform_action();
+        }
+        break;
     default:
         qemu_log_mask(LOG_GUEST_ERROR,
                       "%s: Out-of-bounds write at offset 0x%" HWADDR_PRIx "\n",
Signature · 1 line
2.34.1
#3 lore raw
In reply to Jamin Lin via
Quoted 5 lines · Jamin Lin

v1:
Support software reset mode for AST2600
v2:
Change to validate WDT_CTRL_RESET_MODE_SOC

Quoted 7 lines

Jamin Lin (2):
aspeed/wdt: Fix coding style
aspeed/wdt: Support software reset mode for AST2600

  hw/watchdog/wdt_aspeed.c | 19 +++++++++++++++++--
  1 file changed, 17 insertions(+), 2 deletions(-)

Applied to aspeed-next.

Thanks,

C.