Skip to contentSkip to conversation

watchdog: aspeed: Allow configuring for alternate boot

PATCH In review Eddie James 3 participants 3 messages Mar 15, 2018 – Mar 16, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 watchdog: aspeed: Allow configuring for alternate boot

From: Milton Miller <[email protected]>

Allow the device tree to specify a watchdog to fallover to the alternate boot source.

The aspeeed watchdog can set a latch directing flash chip select 0 to chip select 1, allowing boot from an alternate media if the watchdog is not reset in time. On the ast2400 bank 1 also goes to flash bank 1, while on the ast2500 the chip selects are swapped.

Also clear the secondary boot bit during the machine restart operation. Otherwise, the system will switch to the alternate boot after every reboot, which is not desired.

---
Changes since v1:
* Disable secondary boot before the restart operation.

 drivers/watchdog/aspeed_wdt.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/watchdog/aspeed_wdt.c +4 -0
index d1987d6..a5b8eb2 100644
@@ -46,6 +46,7 @@ struct aspeed_wdt_config {
 #define WDT_RELOAD_VALUE	0x04
 #define WDT_RESTART		0x08
 #define WDT_CTRL		0x0C
+#define   WDT_CTRL_BOOT_SECONDARY	BIT(7)
 #define   WDT_CTRL_RESET_MODE_SOC	(0x00 << 5)
 #define   WDT_CTRL_RESET_MODE_FULL_CHIP	(0x01 << 5)
 #define   WDT_CTRL_RESET_MODE_ARM_CPU	(0x10 << 5)
@@ -158,6 +159,7 @@ static int aspeed_wdt_restart(struct watchdog_device *wdd,
 {
 	struct aspeed_wdt *wdt = to_aspeed_wdt(wdd);
 
+	wdt->ctrl &= ~WDT_CTRL_BOOT_SECONDARY;
 	aspeed_wdt_enable(wdt, 128 * WDT_RATE_1MHZ / 1000);
 
 	mdelay(1000);
@@ -245,6 +247,8 @@ static int aspeed_wdt_probe(struct platform_device *pdev)
 	}
 	if (of_property_read_bool(np, "aspeed,external-signal"))
 		wdt->ctrl |= WDT_CTRL_WDT_EXT;
+	if (of_property_read_bool(np, "aspeed,alt-boot"))
+		wdt->ctrl |= WDT_CTRL_BOOT_SECONDARY;
 
 	if (readl(wdt->base + WDT_CTRL) & WDT_CTRL_ENABLE)  {
 		/*
Signature · 1 line
1.8.3.1
maintainer Reviewed-by on v2 1/1
#1 lore raw
Quoted 10 lines · Eddie James

From: Milton Miller <[email protected]>

Allow the device tree to specify a watchdog to fallover to the alternate boot source.

The aspeeed watchdog can set a latch directing flash chip select 0 to chip select 1, allowing boot from an alternate media if the watchdog is not reset in time. On the ast2400 bank 1 also goes to flash bank 1, while on the ast2500 the chip selects are swapped.

Quoted 6 lines

Also clear the secondary boot bit during the machine restart operation. Otherwise, the system will switch to the alternate boot after every reboot, which is not desired.

That will do.

Cheers,

Joel

Quoted 39 lines

---
Changes since v1:
* Disable secondary boot before the restart operation.

 drivers/watchdog/aspeed_wdt.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/watchdog/aspeed_wdt.c +4 -1
index d1987d6..a5b8eb2 100644
@@ -46,6 +46,7 @@ struct aspeed_wdt_config {
 #define WDT_RELOAD_VALUE       0x04
 #define WDT_RESTART            0x08
 #define WDT_CTRL               0x0C
+#define   WDT_CTRL_BOOT_SECONDARY      BIT(7)
 #define   WDT_CTRL_RESET_MODE_SOC      (0x00 << 5)
 #define   WDT_CTRL_RESET_MODE_FULL_CHIP        (0x01 << 5)
 #define   WDT_CTRL_RESET_MODE_ARM_CPU  (0x10 << 5)
@@ -158,6 +159,7 @@ static int aspeed_wdt_restart(struct watchdog_device *wdd,
 {
        struct aspeed_wdt *wdt = to_aspeed_wdt(wdd);
 
+       wdt->ctrl &= ~WDT_CTRL_BOOT_SECONDARY;
        aspeed_wdt_enable(wdt, 128 * WDT_RATE_1MHZ / 1000);
 
        mdelay(1000);
@@ -245,6 +247,8 @@ static int aspeed_wdt_probe(struct platform_device *pdev)
        }
        if (of_property_read_bool(np, "aspeed,external-signal"))
                wdt->ctrl |= WDT_CTRL_WDT_EXT;
+       if (of_property_read_bool(np, "aspeed,alt-boot"))
+               wdt->ctrl |= WDT_CTRL_BOOT_SECONDARY;
 
        if (readl(wdt->base + WDT_CTRL) & WDT_CTRL_ENABLE)  {
                /*
--

1.8.3.1

maintainer Reviewed-by on v2 1/1
#2 lore raw
In reply to Eddie James
Quoted 10 lines · Eddie James

From: Milton Miller <[email protected]>

Allow the device tree to specify a watchdog to fallover to the alternate boot source.

The aspeeed watchdog can set a latch directing flash chip select 0 to chip select 1, allowing boot from an alternate media if the watchdog is not reset in time. On the ast2400 bank 1 also goes to flash bank 1, while on the ast2500 the chip selects are swapped.

Quoted 6 lines

Also clear the secondary boot bit during the machine restart operation. Otherwise, the system will switch to the alternate boot after every reboot, which is not desired.

Quoted 37 lines

---
Changes since v1:
* Disable secondary boot before the restart operation.

  drivers/watchdog/aspeed_wdt.c | 4 ++++
  1 file changed, 4 insertions(+)
drivers/watchdog/aspeed_wdt.c +4 -0
index d1987d6..a5b8eb2 100644
@@ -46,6 +46,7 @@ struct aspeed_wdt_config {
  #define WDT_RELOAD_VALUE	0x04
  #define WDT_RESTART		0x08
  #define WDT_CTRL		0x0C
+#define   WDT_CTRL_BOOT_SECONDARY	BIT(7)
  #define   WDT_CTRL_RESET_MODE_SOC	(0x00 << 5)
  #define   WDT_CTRL_RESET_MODE_FULL_CHIP	(0x01 << 5)
  #define   WDT_CTRL_RESET_MODE_ARM_CPU	(0x10 << 5)
@@ -158,6 +159,7 @@ static int aspeed_wdt_restart(struct watchdog_device *wdd,
  {
  	struct aspeed_wdt *wdt = to_aspeed_wdt(wdd);
 
+	wdt->ctrl &= ~WDT_CTRL_BOOT_SECONDARY;
  	aspeed_wdt_enable(wdt, 128 * WDT_RATE_1MHZ / 1000);
 
  	mdelay(1000);
@@ -245,6 +247,8 @@ static int aspeed_wdt_probe(struct platform_device *pdev)
  	}
  	if (of_property_read_bool(np, "aspeed,external-signal"))
  		wdt->ctrl |= WDT_CTRL_WDT_EXT;
+	if (of_property_read_bool(np, "aspeed,alt-boot"))
+		wdt->ctrl |= WDT_CTRL_BOOT_SECONDARY;
 
  	if (readl(wdt->base + WDT_CTRL) & WDT_CTRL_ENABLE)  {
  		/*