x530: Enable watchdog
Subsystems (2)
v3 cover x530: Enable watchdog
We've seen some issues with the x530 under extreme conditions where the DDR gets into a bad state. Generally this results in an application crash followed by a lock-up in u-boot.
Enabling the watchdog prevents the lock up and will let the DDR training have another go. Sometimes this recovers but even a reboot loop is better than a complete lockup.
Changes in v3:
- new
- specify timeout in milliseconds
Changes in v2:
- update commit message
Chris Packham (3):
watchdog: orion_wdt: support SPL usage
watchdog: orion_wdt: take timeout value in ms
arm: mvebu: x530: Enable watchdog in SPL and U-Boot
arch/arm/dts/armada-385-atl-x530-u-boot.dtsi | 4 ++ board/CZ.NIC/turris_omnia/turris_omnia.c | 2 +- board/alliedtelesis/x530/x530.c | 48 ++++++++++++++++++++ configs/x530_defconfig | 5 ++ drivers/watchdog/Kconfig | 1 + drivers/watchdog/orion_wdt.c | 26 ++++++++--- 6 files changed, 78 insertions(+), 8 deletions(-)
Signature · 1 line
2.20.1
PATCH v3 1/3 watchdog: orion_wdt: support SPL usage
When run from the SPL the mvebu targets are using the hardware default offset for the SoC peripherals. devfdt_get_addr_size_index() understands how to deal with this via dm_get_translation_offset() so use this instead of fdtdec_get_addr_size_auto_noparent().
---
Changes in v3: None
Changes in v2: None
drivers/watchdog/orion_wdt.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/watchdog/orion_wdt.c +1 -3
@@ -114,9 +114,7 @@ static inline bool save_reg_from_ofdata(struct udevice *dev, int index,fdt_addr_t addr;fdt_size_t off; - addr =fdtdec_get_addr_size_auto_noparent ( - gd->fdt_blob,dev_of_offset (dev),"reg" , index, &off, true); - + addr =devfdt_get_addr_size_index (dev, index, &off);if (addr ==FDT_ADDR_T_NONE )return false;
Signature · 1 line
2.20.1
PATCH v3 2/3 watchdog: orion_wdt: take timeout value in ms
In reply to Chris PackhamThe generic wdt_start API expects to be called with the timeout in milliseconds. Update the orion_wdt driver to accept a timeout in milliseconds and use the clock rate specified in the dts to convert the timeout to an appropriate value for the timer reload register.
---
It turned out to be easy enough to make orion_wdt conform to the expected wdt APIs. It looks like the turris_mox already assumed a timeout in ms, so only the turris_omnia needed updating.
Changes in v3:
- new
Changes in v2: None
board/CZ.NIC/turris_omnia/turris_omnia.c | 2 +- drivers/watchdog/Kconfig | 1 + drivers/watchdog/orion_wdt.c | 22 ++++++++++++++++++---- 3 files changed, 20 insertions(+), 5 deletions(-)
board/CZ.NIC/turris_omnia/turris_omnia.c +1 -1
@@ -379,7 +379,7 @@ int board_init(void) puts("Cannot find Armada 385 watchdog!\n"); }else {puts ("Enabling Armada 385 watchdog.\n" ); -wdt_start (watchdog_dev, (u32 )25000000 *120 ,0 ); +wdt_start (watchdog_dev,120000 ,0 ); }# endif
drivers/watchdog/Kconfig +1 -0
@@ -97,6 +97,7 @@ config WDT_BCM6345 config WDT_ORION bool "Orion watchdog timer support" depends on WDT + select CLK help Select this to enable Orion watchdog timer, which can be found on some Marvell Armada chips.
drivers/watchdog/orion_wdt.c +18 -4
@@ -14,6 +14,7 @@#include <common.h> #include <dm.h> +#include <clk.h> #include <wdt.h> #include <asm/io.h> #include <asm/arch/cpu.h>
@@ -27,6 +28,8 @@ struct orion_wdt_priv {void __iomem *rstout;void __iomem *rstout_mask;u32 timeout; +unsigned long clk_rate; +struct clk clk; };#define RSTOUT_ENABLE_BIT BIT(8)
@@ -44,17 +47,18 @@ static int orion_wdt_reset(struct udevice *dev)struct orion_wdt_priv *priv =dev_get_priv (dev);/* Reload watchdog duration */ -writel (priv->timeout, priv->reg + priv->wdt_counter_offset); +writel (priv->clk_rate * priv->timeout, + priv->reg + priv->wdt_counter_offset);return 0 ; } -static int orion_wdt_start (struct udevice *dev,u64 timeout,ulong flags) +static int orion_wdt_start (struct udevice *dev,u64 timeout_ms,ulong flags) {struct orion_wdt_priv *priv =dev_get_priv (dev);u32 reg; - priv->timeout = (u32 ) timeout; + priv->timeout = timeout_ms /1000 ;/* Enable the fixed watchdog clock input */ reg =readl (priv->reg +TIMER_CTRL );
@@ -62,7 +66,8 @@ static int orion_wdt_start(struct udevice *dev, u64 timeout, ulong flags)writel (reg, priv->reg +TIMER_CTRL );/* Set watchdog duration */ -writel (priv->timeout, priv->reg + priv->wdt_counter_offset); +writel (priv->clk_rate * priv->timeout, + priv->reg + priv->wdt_counter_offset);/* Clear the watchdog expiration bit */ reg =readl (priv->reg +TIMER_A370_STATUS );
@@ -147,9 +152,18 @@ err:static int orion_wdt_probe (struct udevice *dev) { +struct orion_wdt_priv *priv =dev_get_priv (dev); +int ret; +debug ("%s: Probing wdt%u\n" , __func__, dev->seq);orion_wdt_stop (dev); + ret =clk_get_by_name (dev,"fixed" , &priv->clk); +if (!ret) + priv->clk_rate =clk_get_rate (&priv->clk); +else + priv->clk_rate =25000000 ; +return 0 ; }
Signature · 1 line
2.20.1
PATCH v3 3/3 arm: mvebu: x530: Enable watchdog in SPL and U-Boot
In reply to Chris PackhamEnable the hardware watchdog to guard against system lock ups when running in the SPL or U-Boot. Stop the watchdog just before booting so that the OS can re-enable it if needed.
---
Changes in v3:
- specify timeout in milliseconds
Changes in v2:
- update commit message
arch/arm/dts/armada-385-atl-x530-u-boot.dtsi | 4 ++ board/alliedtelesis/x530/x530.c | 48 ++++++++++++++++++++ configs/x530_defconfig | 5 ++ 3 files changed, 57 insertions(+)
arch/arm/dts/armada-385-atl-x530-u-boot.dtsi +4 -0
@@ -11,3 +11,7 @@ &uart0 { u-boot,dm-pre-reloc; }; + +&watchdog { + u-boot,dm-pre-reloc; +};
board/alliedtelesis/x530/x530.c +48 -0
81 lines not on this page · raw message
configs/x530_defconfig +5 -0
@@ -19,6 +19,8 @@ CONFIG_SILENT_CONSOLE=y CONFIG_SILENT_U_BOOT_ONLY=y CONFIG_SILENT_CONSOLE_UPDATE_ON_RELOC=y CONFIG_MISC_INIT_R=y +CONFIG_SPL_BOARD_INIT=y +CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_CMD_MEMINFO=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y
@@ -70,3 +72,6 @@ CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_ASIX88179=y +CONFIG_WATCHDOG=y +CONFIG_WDT=y +CONFIG_WDT_ORION=y
Signature · 1 line
2.20.1