| Message ID | 20170705173320.72773-1-andriy.shevchenko@linux.intel.com |
|---|---|
| State | Accepted |
| Commit | 8f8a12d1e79779783a724e7a0f5d07c44dcfa872 |
| Delegated to: | Bin Meng |
| Headers | show |
On Thu, Jul 6, 2017 at 1:33 AM, Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > From: Felipe Balbi <felipe.balbi@linux.intel.com> > > Add watchdog driver for Intel Tangier based platforms. > > Signed-off-by: Vincent Tinelli <vincent.tinelli@intel.com> > Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > In v3: > - protect against overflow in hw_watchdog_reset() > > drivers/watchdog/Kconfig | 11 ++++++- > drivers/watchdog/Makefile | 1 + > drivers/watchdog/tangier_wdt.c | 71 ++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 82 insertions(+), 1 deletion(-) > create mode 100644 drivers/watchdog/tangier_wdt.c > Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
On Fri, 2017-07-07 at 12:51 +0800, Bin Meng wrote: > On Thu, Jul 6, 2017 at 1:33 AM, Andy Shevchenko > <andriy.shevchenko@linux.intel.com> wrote: > > From: Felipe Balbi <felipe.balbi@linux.intel.com> > > > > Add watchdog driver for Intel Tangier based platforms. Can we get it applied? > > > > Signed-off-by: Vincent Tinelli <vincent.tinelli@intel.com> > > Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > > --- > > In v3: > > - protect against overflow in hw_watchdog_reset() > > > > drivers/watchdog/Kconfig | 11 ++++++- > > drivers/watchdog/Makefile | 1 + > > drivers/watchdog/tangier_wdt.c | 71 > > ++++++++++++++++++++++++++++++++++++++++++ > > 3 files changed, 82 insertions(+), 1 deletion(-) > > create mode 100644 drivers/watchdog/tangier_wdt.c > > > > Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Hi Andy, On Sun, Jul 16, 2017 at 9:37 PM, Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > On Fri, 2017-07-07 at 12:51 +0800, Bin Meng wrote: >> On Thu, Jul 6, 2017 at 1:33 AM, Andy Shevchenko >> <andriy.shevchenko@linux.intel.com> wrote: >> > From: Felipe Balbi <felipe.balbi@linux.intel.com> >> > >> > Add watchdog driver for Intel Tangier based platforms. > > Can we get it applied? > Yes, it's on my todo list. Regards, Bin
On Fri, Jul 7, 2017 at 12:51 PM, Bin Meng <bmeng.cn@gmail.com> wrote: > On Thu, Jul 6, 2017 at 1:33 AM, Andy Shevchenko > <andriy.shevchenko@linux.intel.com> wrote: >> From: Felipe Balbi <felipe.balbi@linux.intel.com> >> >> Add watchdog driver for Intel Tangier based platforms. >> >> Signed-off-by: Vincent Tinelli <vincent.tinelli@intel.com> >> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> >> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> >> --- >> In v3: >> - protect against overflow in hw_watchdog_reset() >> >> drivers/watchdog/Kconfig | 11 ++++++- >> drivers/watchdog/Makefile | 1 + >> drivers/watchdog/tangier_wdt.c | 71 ++++++++++++++++++++++++++++++++++++++++++ >> 3 files changed, 82 insertions(+), 1 deletion(-) >> create mode 100644 drivers/watchdog/tangier_wdt.c >> > > Reviewed-by: Bin Meng <bmeng.cn@gmail.com> applied to u-boot-x86, thanks!
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index b911233db3..6cbc450b3c 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -19,7 +19,16 @@ config OMAP_WATCHDOG default y if AM33XX help Say Y here to enable the OMAP3+ watchdog driver. - + +config TANGIER_WATCHDOG + bool "Intel Tangier watchdog" + depends on INTEL_MID + select HW_WATCHDOG + help + This enables support for watchdog controller available on + Intel Tangier SoC. If you're using a board with Intel Tangier + SoC, say Y here. + config ULP_WATCHDOG bool "i.MX7ULP watchdog" help diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index 4b19e4ccf6..8a3fa1da67 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -14,6 +14,7 @@ obj-$(CONFIG_S5P) += s5p_wdt.o obj-$(CONFIG_XILINX_TB_WATCHDOG) += xilinx_tb_wdt.o obj-$(CONFIG_OMAP_WATCHDOG) += omap_wdt.o obj-$(CONFIG_DESIGNWARE_WATCHDOG) += designware_wdt.o +obj-$(CONFIG_TANGIER_WATCHDOG) += tangier_wdt.o obj-$(CONFIG_ULP_WATCHDOG) += ulp_wdog.o obj-$(CONFIG_WDT) += wdt-uclass.o obj-$(CONFIG_WDT_SANDBOX) += sandbox_wdt.o diff --git a/drivers/watchdog/tangier_wdt.c b/drivers/watchdog/tangier_wdt.c new file mode 100644 index 0000000000..9cf4bafa92 --- /dev/null +++ b/drivers/watchdog/tangier_wdt.c @@ -0,0 +1,71 @@ +/* + * Copyright (c) 2017 Intel Corporation + * + * SPDX-License-Identifier: GPL-2.0+ + */ +#include <common.h> +#include <watchdog.h> +#include <asm/scu.h> + +/* Hardware timeout in seconds */ +#define WDT_PRETIMEOUT 15 +#define WDT_TIMEOUT_MIN (1 + WDT_PRETIMEOUT) +#define WDT_TIMEOUT_MAX 170 +#define WDT_DEFAULT_TIMEOUT 90 + +#ifndef CONFIG_WATCHDOG_TIMEOUT_MSECS +#define WATCHDOG_HEARTBEAT 60000 +#else +#define WATCHDOG_HEARTBEAT CONFIG_WATCHDOG_TIMEOUT_MSECS +#endif + +enum { + SCU_WATCHDOG_START = 0, + SCU_WATCHDOG_STOP = 1, + SCU_WATCHDOG_KEEPALIVE = 2, + SCU_WATCHDOG_SET_ACTION_ON_TIMEOUT = 3, +}; + +void hw_watchdog_reset(void) +{ + static unsigned long last; + unsigned long now; + + if (gd->timer) + now = timer_get_us(); + else + now = rdtsc() / 1000; + + /* Do not flood SCU */ + if (last > now) + last = 0; + + if (unlikely((now - last) > (WDT_PRETIMEOUT / 2) * 1000000)) { + last = now; + scu_ipc_simple_command(IPCMSG_WATCHDOG_TIMER, SCU_WATCHDOG_KEEPALIVE); + } +} + +int hw_watchdog_disable(void) +{ + return scu_ipc_simple_command(IPCMSG_WATCHDOG_TIMER, SCU_WATCHDOG_STOP); +} + +void hw_watchdog_init(void) +{ + u32 timeout = WATCHDOG_HEARTBEAT / 1000; + int in_size; + struct ipc_wd_start { + u32 pretimeout; + u32 timeout; + } ipc_wd_start = { timeout - WDT_PRETIMEOUT, timeout }; + + /* + * SCU expects the input size for watchdog IPC + * to be based on 4 bytes + */ + in_size = DIV_ROUND_UP(sizeof(ipc_wd_start), 4); + + scu_ipc_command(IPCMSG_WATCHDOG_TIMER, SCU_WATCHDOG_START, + (u32 *)&ipc_wd_start, in_size, NULL, 0); +}