bcm2835: wdt: support for the bcm2835/2836 wdt
Subsystems (5)
PATCH v2 1/1 bcm2835: wdt: support for the bcm2835/2836 wdt
The following patch add support for the watchdog built into the bcm2835/2836 chips, using the max timeout (~15s).
Tested on my RaspberryPi2.
Changelog:
v2: fixed __eufi_runtime usage and moved to Kconfig
Paolo Pisati (1):
bcm2835_wdt: support for the BCM2835/2836 watchdog
arch/arm/mach-bcm283x/reset.c | 21 ++++++++++++++++++--- board/raspberrypi/rpi/rpi.c | 4 ++++ drivers/watchdog/Kconfig | 15 +++++++++++++++ drivers/watchdog/Makefile | 1 + drivers/watchdog/bcm2835_wdt.c | 35 +++++++++++++++++++++++++++++++++++ 5 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 drivers/watchdog/bcm2835_wdt.c
Signature · 1 line
2.7.4
PATCH 1/1 bcm2835_wdt: support for the BCM2835/2836 watchdog
Signed-off-by Paolo Pisati <[email protected]>
--- arch/arm/mach-bcm283x/reset.c | 21 ++++++++++++++++++--- board/raspberrypi/rpi/rpi.c | 4 ++++ drivers/watchdog/Kconfig | 15 +++++++++++++++ drivers/watchdog/Makefile | 1 + drivers/watchdog/bcm2835_wdt.c | 35 +++++++++++++++++++++++++++++++++++ 5 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 drivers/watchdog/bcm2835_wdt.c
arch/arm/mach-bcm283x/reset.c +18 -3
@@ -21,18 +21,33 @@*/ #define BCM2835_WDOG_RSTS_RASPBERRYPI_HALT 0x555 +/* max ticks timeout */ +#define BCM2835_WDOG_MAX_TIMEOUT 0x000fffff + +#ifdef CONFIG_BCM2835_WDT +extern void hw_watchdog_disable (void ); +#else +void hw_watchdog_disable (void ) {} +#endif + __efi_runtime_data struct bcm2835_wdog_regs *wdog_regs = (struct bcm2835_wdog_regs *)BCM2835_WDOG_PHYSADDR ; -void __efi_runtime reset_cpu(ulong addr) +void __efi_runtime reset_cpu(ulong ticks) { -uint32_t rstc; +uint32_t rstc, timeout; + +if (ticks ==0 ) { +hw_watchdog_disable (); + timeout =RESET_TIMEOUT ; + }else + timeout = ticks &BCM2835_WDOG_MAX_TIMEOUT ; rstc =readl (&wdog_regs->rstc); rstc &= ~BCM2835_WDOG_RSTC_WRCFG_MASK ; rstc |=BCM2835_WDOG_RSTC_WRCFG_FULL_RESET ; -writel (BCM2835_WDOG_PASSWORD |RESET_TIMEOUT , &wdog_regs->wdog); +writel (BCM2835_WDOG_PASSWORD | timeout, &wdog_regs->wdog);writel (BCM2835_WDOG_PASSWORD | rstc, &wdog_regs->rstc); }
board/raspberrypi/rpi/rpi.c +4 -0
@@ -22,6 +22,7 @@#ifdef CONFIG_ARM64 #include <asm/armv8/mmu.h> #endif +#include <watchdog.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -478,6 +479,9 @@ static void rpi_disable_inactive_uart(void)int board_init (void ) { +#ifdef CONFIG_HW_WATCHDOG +hw_watchdog_init (); +#endif #ifndef CONFIG_PL01X_SERIAL rpi_disable_inactive_uart ();#endif
drivers/watchdog/Kconfig +15 -0
@@ -0,0 +1,15 @@ +menu "Watchdog support" + +config HW_WATCHDOG + bool + +config BCM2835_WDT + bool "Enable BCM2835/2836 watchdog driver" + select HW_WATCHDOG + help + Say Y here to enable the BCM2835/2836 watchdog + + This provides basic infrastructure to support BCM2835/2836 watchdog + hardware, with a max timeout of ~15secs. + +endmenu
drivers/watchdog/Makefile +1 -0
@@ -15,3 +15,4 @@ obj-$(CONFIG_XILINX_TB_WATCHDOG) += xilinx_tb_wdt.o obj-$(CONFIG_BFIN_WATCHDOG) += bfin_wdt.o obj-$(CONFIG_OMAP_WATCHDOG) += omap_wdt.o obj-$(CONFIG_DESIGNWARE_WATCHDOG) += designware_wdt.o +obj-$(CONFIG_BCM2835_WDT) += bcm2835_wdt.o
drivers/watchdog/bcm2835_wdt.c new file +35 -0
@@ -0,0 +1,35 @@ +/* +* Watchdog driver for Broadcom BCM2835 +* +* Copyright (C) 2017 Paolo Pisati <[email protected]> +* +* SPDX-License-Identifier: GPL-2.0 +*/ + +#include <common.h> +#include <efi_loader.h> +#include <asm/io.h> +#include <asm/arch/wdog.h> + +#define SECS_TO_WDOG_TICKS (x) ((x) << 16) +#define MAX_TIMEOUT 0xf/* ~15s */ + +static __efi_runtime_data bool enabled = true; + +extern void reset_cpu (ulong ticks); + +void hw_watchdog_reset (void ) +{ +if (enabled) +reset_cpu (SECS_TO_WDOG_TICKS (MAX_TIMEOUT )); +} + +void hw_watchdog_init (void ) +{ +hw_watchdog_reset (); +} + +void __efi_runtime hw_watchdog_disable(void) +{ + enabled = false; +}
Signature · 1 line
2.7.4
[U-Boot] bcm2835_wdt: support for the BCM2835/2836 watchdog
Quoted 1 line · Paolo Pisati
Signed-off-by Paolo Pisati <[email protected]>
After some fiddling of the Kconfig parts, applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170510/bca2c79d/attachment.sig>