From patchwork Mon Aug 20 20:30:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 1350901 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 50F78DFB6E for ; Mon, 20 Aug 2012 20:33:50 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T3YcT-0001h1-BY; Mon, 20 Aug 2012 20:30:41 +0000 Received: from mail-pz0-f49.google.com ([209.85.210.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1T3YcQ-0001gn-KI for linux-arm-kernel@lists.infradead.org; Mon, 20 Aug 2012 20:30:39 +0000 Received: by dajq27 with SMTP id q27so2599736daj.36 for ; Mon, 20 Aug 2012 13:30:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=YW95Pj5/iWswlurrzESqRgCYzyvbsfjL2ag+4Mwm+E0=; b=nVZgGukzrLHLzFyQoxtUnVA9v7tHOeCx3RtgtDDqfkuUrt0p4L++ZcjWXh+U5lnRNQ VA6EaX0NGTbu6zp60fueGqCFqYIH352ML68SMmYFA8NhCsBa5BNMnyaTvZg++sSeA+GH ACquHOfl7eUI7v/nvr+O6wV/hIGeEKw7PXKefkPx6aj3vVYsKK2XZv6Ii6YD2pilLwAs Xzsyac3VUxR7TGuqNYFGsEgREmgdfIUq7GzFLyS15FQFTPX+vy59hSBWGW2IjJb4IhWc K/Zfs4GWG5MXFEMgJ0uyowl376LkoCQRgHCEZpJGcDLxq3bCuP6dcswuSvdrKwbprUE0 u42Q== Received: by 10.68.217.202 with SMTP id pa10mr37842469pbc.15.1345494636676; Mon, 20 Aug 2012 13:30:36 -0700 (PDT) Received: from localhost.localdomain (S0106002369de4dac.cg.shawcable.net. [70.73.24.112]) by mx.google.com with ESMTPS id kt8sm11748799pbc.1.2012.08.20.13.30.35 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 20 Aug 2012 13:30:35 -0700 (PDT) From: mathieu.poirier@linaro.org To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2] drivers/watchdog: Adding PRCMU based WD for ux500 processors Date: Mon, 20 Aug 2012 14:30:24 -0600 Message-Id: <1345494624-7557-1-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 1.7.5.4 X-Gm-Message-State: ALoCoQkLMrK//LbbJLrSRVRJAnehlLs8cI3XcH5MRTC5THm2ypBRYwdrmm/bYekpCVxOnCWcxEw+ X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.210.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: baruch@tkos.co.il, lee.jones@linaro.org, linus.walleij@linaro.org, mathieu.poirier@linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: "Mathieu J. Poirier" This patch is a partial re-write of the driver developed by Jonas Aaberg and brings it up to the new watchdog interface now the standard in the mainline kernel. Cc: Jonas Aaberg Signed-off-by: Mathieu Poirier --- drivers/watchdog/Kconfig | 10 +++ drivers/watchdog/Makefile | 1 + drivers/watchdog/ux500_wdt.c | 174 +++++++++++++++++++++++++++++++++++++++++ include/linux/mfd/ux500_wdt.h | 19 +++++ 4 files changed, 204 insertions(+), 0 deletions(-) create mode 100644 drivers/watchdog/ux500_wdt.c create mode 100644 include/linux/mfd/ux500_wdt.h diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 53d7571..5e5f2e5 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -352,6 +352,16 @@ config IMX2_WDT To compile this driver as a module, choose M here: the module will be called imx2_wdt. +config UX500_WATCHDOG + bool "ST-Ericsson Ux500 watchdog" + depends on UX500_SOC_DB8500 + default y + help + Say Y here to include Watchdog timer support for the + watchdog existing in the prcmu of ST-Ericsson Ux500 series platforms. + This watchdog is used to reset the system and thus cannot be + compiled as a module. + # AVR32 Architecture config AT32AP700X_WDT diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index 572b39b..bec0ef8 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -52,6 +52,7 @@ obj-$(CONFIG_STMP3XXX_WATCHDOG) += stmp3xxx_wdt.o obj-$(CONFIG_NUC900_WATCHDOG) += nuc900_wdt.o obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o obj-$(CONFIG_IMX2_WDT) += imx2_wdt.o +obj-$(CONFIG_UX500_WATCHDOG) += ux500_wdt.o # AVR32 Architecture obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o diff --git a/drivers/watchdog/ux500_wdt.c b/drivers/watchdog/ux500_wdt.c new file mode 100644 index 0000000..0eb7ae3 --- /dev/null +++ b/drivers/watchdog/ux500_wdt.c @@ -0,0 +1,174 @@ +/* + * Copyright (C) ST-Ericsson SA 2011 + * + * License Terms: GNU General Public License v2 + * + * Author: Mathieu Poirier for ST-Ericsson + * Author: Jonas Aaberg for ST-Ericsson + * + * Heavily based upon geodewdt.c + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define WATCHDOG_TIMEOUT 600 /* 10 minutes */ +#define WATCHDOG_MIN 0 +#define WATCHDOG_MAX 268435 /* 28 bit resolution in ms == 268435.455 s */ + +static int timeout = WATCHDOG_TIMEOUT; +module_param(timeout, int, 0); +MODULE_PARM_DESC(timeout, + "Watchdog timeout in seconds. default=" + __MODULE_STRING(WATCHDOG_TIMEOUT) "."); + +static int nowayout = WATCHDOG_NOWAYOUT; +module_param(nowayout, int, 0); +MODULE_PARM_DESC(nowayout, + "Watchdog cannot be stopped once started (default=" + __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); +static bool wdt_en; +static bool wdt_auto_off; + +static int ux500_wdt_start(struct watchdog_device *wdd) +{ + wdt_en = true; + return db8500_prcmu_enable_a9wdog(0); +} + +static int ux500_wdt_stop(struct watchdog_device *wdd) +{ + return db8500_prcmu_disable_a9wdog(0); +} + +static int ux500_wdt_keepalive(struct watchdog_device *wdd) +{ + return db8500_prcmu_kick_a9wdog(0); +} + +static int ux500_wdt_set_timeout(struct watchdog_device *wdd, + unsigned int timeout) +{ + ux500_wdt_stop(wdd); + db8500_prcmu_load_a9wdog(0, timeout); + ux500_wdt_start(wdd); + + return 0; +} + +static const struct watchdog_info ux500_wdt_info = { + .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE, + .identity = "Ux500 WDT", + .firmware_version = 1, +}; + +static struct watchdog_ops ux500_wdt_ops = { + .owner = THIS_MODULE, + .start = ux500_wdt_start, + .stop = ux500_wdt_stop, + .ping = ux500_wdt_keepalive, + .set_timeout = ux500_wdt_set_timeout, + +}; + +static struct watchdog_device ux500_wdt = { + .info = &ux500_wdt_info, + .ops = &ux500_wdt_ops, + .min_timeout = WATCHDOG_MIN, + .max_timeout = WATCHDOG_MAX, +}; + +static int __init ux500_wdt_probe(struct platform_device *pdev) +{ + int err; + struct ux500_wdt_data *pdata = pdev->dev.platform_data; + + if (pdata) { + timeout = pdata->timeout; + nowayout = pdata->nowayout; + } + + watchdog_set_nowayout(&ux500_wdt, nowayout); + + /* auto off on sleep */ + db8500_prcmu_config_a9wdog(1, wdt_auto_off); + + /* set HW initial value */ + db8500_prcmu_load_a9wdog(0, timeout * 1000); + + err = watchdog_register_device(&ux500_wdt); + if (err) + return err; + + dev_info(&pdev->dev, "initialized\n"); + + return 0; +} + +static int __exit ux500_wdt_remove(struct platform_device *dev) +{ + watchdog_unregister_device(&ux500_wdt); + + return 0; +} + +#ifdef CONFIG_PM +static int ux500_wdt_suspend(struct platform_device *pdev, + pm_message_t state) +{ + if (wdt_en && !wdt_auto_off) { + ux500_wdt_stop(&ux500_wdt); + db8500_prcmu_config_a9wdog(1, true); + + db8500_prcmu_load_a9wdog(0, timeout * 1000); + ux500_wdt_start(&ux500_wdt); + } + return 0; +} + +static int ux500_wdt_resume(struct platform_device *pdev) +{ + if (wdt_en && !wdt_auto_off) { + ux500_wdt_stop(&ux500_wdt); + db8500_prcmu_config_a9wdog(1, true); + + db8500_prcmu_load_a9wdog(0, timeout * 1000); + ux500_wdt_start(&ux500_wdt); + } + return 0; +} + +#else +#define ux500_wdt_suspend NULL +#define ux500_wdt_resume NULL +#endif +static struct platform_driver ux500_wdt_driver = { + .remove = __exit_p(ux500_wdt_remove), + .driver = { + .owner = THIS_MODULE, + .name = "ux500_wdt", + }, + .suspend = ux500_wdt_suspend, + .resume = ux500_wdt_resume, +}; + +static int __init ux500_wdt_init(void) +{ + return platform_driver_probe(&ux500_wdt_driver, ux500_wdt_probe); +} +module_init(ux500_wdt_init); + +MODULE_AUTHOR("Jonas Aaberg "); +MODULE_DESCRIPTION("Ux500 Watchdog Driver"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); diff --git a/include/linux/mfd/ux500_wdt.h b/include/linux/mfd/ux500_wdt.h new file mode 100644 index 0000000..bfb91f1 --- /dev/null +++ b/include/linux/mfd/ux500_wdt.h @@ -0,0 +1,19 @@ +/* + * Copyright (C) ST Ericsson SA 2011 + * + * License Terms: GNU General Public License v2 + * + * STE Ux500 PRCMU API + */ +#ifndef __UX500_WDT_H +#define __UX500_WDT_H + +/** + * struct ux500_wdt_data + */ +struct ux500_wdt_data { + int timeout; + int nowayout; +}; + +#endif /* __UX500_WDT_H */