[U-Boot,10/16] board: ge: bx50v3: Enable hardware watchdog

Message ID	1510156790-26463-11-git-send-email-martyn.welch@collabora.co.uk
State	Changes Requested
Delegated to:	Stefano Babic
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> sender: martyn) with ESMTPSA id F3F1C26E9A4 From: Martyn Welch <martyn.welch@collabora.co.uk> To: u-boot@lists.denx.de Date: Wed, 8 Nov 2017 15:59:44 +0000 Message-Id: <1510156790-26463-11-git-send-email-martyn.welch@collabora.co.uk> In-Reply-To: <1510156790-26463-1-git-send-email-martyn.welch@collabora.co.uk> References: <1510156790-26463-1-git-send-email-martyn.welch@collabora.co.uk> Cc: Ian Ray <ian.ray@ge.com> Subject: [U-Boot] [PATCH 10/16] board: ge: bx50v3: Enable hardware watchdog Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	Updates / improvements to bx50v3 support \| expand [U-Boot,00/16] Updates / improvements to bx50v3 support [U-Boot,01/16] board: ge: mx53ppd: Move check_time() to common location [U-Boot,02/16] net: e1000: add support for writing to EEPROM [U-Boot,03/16] net: e1000: split e1000_read_mac_addr [U-Boot,04/16] net: e1000: implement eth_write_hwaddr [U-Boot,05/16] rtc: adding RX8010SJ rtc driver [U-Boot,06/16] board: ge: Enable access to i2c bus 1 and 2 [U-Boot,07/16] configs: Add network device support for bx50v3 products [U-Boot,08/16] board: ge: bx50v3: move FEC MAC address programming to driver [U-Boot,09/16] board: ge: bx50v3: program MAC address to I210 [U-Boot,10/16] board: ge: bx50v3: Enable hardware watchdog [U-Boot,11/16] board: ge: bx50v3: Support FIT and select configuration based on VPD [U-Boot,12/16] config: ge_bx50v3: read boot script [U-Boot,13/16] configs: ge_bx50v3: enable bootcount [U-Boot,14/16] board: ge: bx50v3: mount rootfs read-only [U-Boot,15/16] configs: ge_bx50v3: automatic partition selection and video output failure message [U-Boot,16/16] board,ge,bx50v3 - rtc time validation

Message ID

1510156790-26463-11-git-send-email-martyn.welch@collabora.co.uk

State

Changes Requested

Delegated to:

Stefano Babic

Headers

From: Martyn Welch <martyn.welch@collabora.co.uk>
To: u-boot@lists.denx.de
Date: Wed,  8 Nov 2017 15:59:44 +0000
Message-Id: <1510156790-26463-11-git-send-email-martyn.welch@collabora.co.uk>
In-Reply-To: <1510156790-26463-1-git-send-email-martyn.welch@collabora.co.uk>
References: <1510156790-26463-1-git-send-email-martyn.welch@collabora.co.uk>
Cc: Ian Ray <ian.ray@ge.com>
Subject: [U-Boot] [PATCH 10/16] board: ge: bx50v3: Enable hardware watchdog
Precedence: list
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Series

Updates / improvements to bx50v3 support | expand

Commit Message

Martyn Welch Nov. 8, 2017, 3:59 p.m. UTC

Enable the hardware watchdog on bx50v3 to cause it to reset in the event
the board hangs.

Configure GPIO_9 pin as WDOG1_B so that a watchdog timeout results in a
full system reset.

The watchdog is used and reconfigured by systemd approximately 1.7 seconds
into boot. Adding a few seconds for U-Boot and a few more seconds as a
safety margin.

Note that the PCIe controller is _not_ put back into a safe state prior
to board reset.  This is a problem if board reset is implemented as CPU
reset.

Signed-off-by: Ian Ray <ian.ray@ge.com>
Signed-off-by: Martyn Welch <martyn.welch@collabora.co.uk>
---
 board/ge/bx50v3/bx50v3.c    | 1 +
 include/configs/ge_bx50v3.h | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/board/ge/bx50v3/bx50v3.c b/board/ge/bx50v3/bx50v3.c
index 07b4298..48c26e0 100644
--- a/board/ge/bx50v3/bx50v3.c
+++ b/board/ge/bx50v3/bx50v3.c
@@ -659,6 +659,7 @@  static iomux_v3_cfg_t const misc_pads[] = {
 	MX6_PAD_EIM_OE__GPIO2_IO25	| MUX_PAD_CTRL(NC_PAD_CTRL),
 	MX6_PAD_EIM_BCLK__GPIO6_IO31	| MUX_PAD_CTRL(NC_PAD_CTRL),
 	MX6_PAD_GPIO_1__GPIO1_IO01	| MUX_PAD_CTRL(NC_PAD_CTRL),
+	MX6_PAD_GPIO_9__WDOG1_B         | MUX_PAD_CTRL(NC_PAD_CTRL),
 };
 #define SUS_S3_OUT	IMX_GPIO_NR(4, 11)
 #define WIFI_EN	IMX_GPIO_NR(6, 14)
diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index 94e406c..162e915 100644
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -44,6 +44,10 @@ 
 #define CONFIG_REVISION_TAG
 #define CONFIG_SYS_MALLOC_LEN		(10 * SZ_1M)
 
+#define CONFIG_HW_WATCHDOG
+#define CONFIG_IMX_WATCHDOG
+#define CONFIG_WATCHDOG_TIMEOUT_MSECS 6000
+
 #define CONFIG_LAST_STAGE_INIT
 
 #define CONFIG_MXC_GPIO

[U-Boot,10/16] board: ge: bx50v3: Enable hardware watchdog

Commit Message

Patch