From patchwork Wed Mar 28 15:14:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Harvey X-Patchwork-Id: 10313505 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B171460467 for ; Wed, 28 Mar 2018 15:16:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9ED27286C4 for ; Wed, 28 Mar 2018 15:16:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 91CAC29614; Wed, 28 Mar 2018 15:16:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D48AE286C4 for ; Wed, 28 Mar 2018 15:16:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=J8qax+lWFZ8tJAhA5KCC7boM0Z/qCFbObhJHnrRHeZw=; b=JoGkIcQSK+gPgPBXBAcRrMD0r2 Uyt19feTlhZMEu8i/aRI4yX74Rbj4ztDDV3ezomX4tNHCxNze+ZF9Xr4Kh69v6kSG5owb7gSM44+S eK3KYD2UM9iAJ9XFJBTDFWQc34gpdC0/OxNpG6AbyOdV5nfSXqVS0xCot+JZ4X8mlUJjX0U2f6Do8 xDBA47YMUVPc8JpStGwVbAa5Ow9IPs8YlrREfa3BlbvNWYVbb3StfPo2SucTL0ylKzMMfAoTWwj5C dX1TMQZnacZo7WbQfnUZF52Cnk5w+KRppISfqLuWcGMHm+EVeXCixz1yreg+jn3p12Hjvt+DdYTQo LOTcjHmA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f1CoR-0007Pu-MB; Wed, 28 Mar 2018 15:16:31 +0000 Received: from mail-pl0-x241.google.com ([2607:f8b0:400e:c01::241]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f1CmO-0004lm-UL for linux-arm-kernel@lists.infradead.org; Wed, 28 Mar 2018 15:14:30 +0000 Received: by mail-pl0-x241.google.com with SMTP id 9-v6so1755139ple.11 for ; Wed, 28 Mar 2018 08:14:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gateworks-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FJnJ1+t2U642du/ebaF4IDJfA3Wkaty++Sz9UrzeDvs=; b=Jm6KiPWhk5iZ8MTYLVUS1R6PYkjibl663vlZK99Uwxiyfz0YEDIcqiXv2GSjiagKVg L1M4sT8L2jEbIW7LQ0MzvqBQYQhtOIAFCcc9onp2FCyZ2LVbrfgwrf9dKt/laZycE19k 2F5NpWwNdPrqzMuTsCAUtSksl7fgzLGZU/2hUBdCtkeBYvMlJIMIbqYqDvgtggk3LTTN LerKONO5FW8evc1doXutJwvpPBnLAvPl2YWjVzA7et2JcxTKe8y6iZ/IM+6XCAla1WcF dSD41zpNEPF/BBzF2Gke4UVTWXBaDFUiEQQZDmnppHabcnpaPfWkAN0G2p+eDeWDojCZ 798Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FJnJ1+t2U642du/ebaF4IDJfA3Wkaty++Sz9UrzeDvs=; b=Z6+0j8YxmPOHdKOITZ9BriAohSjb1D1q1NDPlNuPZYHmkYvSlyXszse486jdN63zLL myt62y3Pw76Z+v6AaqJw0n882tPCnD1nsjJROuaZANC6j5Mj0y8JFMeLgVLXe9mWu1wg XDkewI47d5ONi0StEjNMtEowNfdonEvfEih8QIA5lwEwIDK4BCGl5Z218dC5ZUENr0EC 7ptBBqyCh7rlrnV8cquS4OhuBuebE5qRd6rAAbkTVH375BlKIqPsuhchk1M5qvKEysqj YX7JQaptVndGgqDP+m9ZDv2ORgscDiQ3YRvKYvJHQ8p+tLpe6kpT/vRZr0W2U/NmScBX 6Yuw== X-Gm-Message-State: AElRT7FVT1tP3s0jJY+jKA7qLY6qLThNJTU2xTozw1VAUOgzk5hpFDIm +9HHCS9hgwHQMhM0XYp6iPVEhg== X-Google-Smtp-Source: AIpwx49vM4rUg3/aCsNoZNkzNuB9hvdnBLsXKMxdULzb+EP6hnJH9Is4RkdVvKu/cp7iDBEjtxbUZg== X-Received: by 2002:a17:902:6597:: with SMTP id c23-v6mr4265749plk.321.1522250058214; Wed, 28 Mar 2018 08:14:18 -0700 (PDT) Received: from tharvey.pdc.gateworks.com (68-189-91-139.static.snlo.ca.charter.com. [68.189.91.139]) by smtp.gmail.com with ESMTPSA id n8sm8204786pff.131.2018.03.28.08.14.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 28 Mar 2018 08:14:17 -0700 (PDT) From: Tim Harvey To: Lee Jones , Rob Herring , Mark Rutland , Mark Brown , Dmitry Torokhov , Wim Van Sebroeck , Guenter Roeck Subject: [PATCH v3 4/4] watchdog: add Gateworks System Controller support Date: Wed, 28 Mar 2018 08:14:03 -0700 Message-Id: <1522250043-8065-5-git-send-email-tharvey@gateworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1522250043-8065-1-git-send-email-tharvey@gateworks.com> References: <1522250043-8065-1-git-send-email-tharvey@gateworks.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180328_081424_975428_84B00AB1 X-CRM114-Status: GOOD ( 21.15 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-hwmon@vger.kernel.org, devicetree@vger.kernel.org, linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, linux-input@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Tim Harvey --- drivers/watchdog/Kconfig | 10 ++++ drivers/watchdog/Makefile | 1 + drivers/watchdog/gsc_wdt.c | 146 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 157 insertions(+) create mode 100644 drivers/watchdog/gsc_wdt.c diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index ca200d1..c9d4b2e 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -150,6 +150,16 @@ config GPIO_WATCHDOG_ARCH_INITCALL arch_initcall. If in doubt, say N. +config GSC_WATCHDOG + tristate "Gateworks System Controller (GSC) Watchdog support" + depends on MFD_GATEWORKS_GSC + select WATCHDOG_CORE + help + Say Y here to include support for the GSC Watchdog. + + This driver can also be built as a module. If so the module + will be called gsc_wdt. + config MENF21BMC_WATCHDOG tristate "MEN 14F021P00 BMC Watchdog" depends on MFD_MENF21BMC || COMPILE_TEST diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index 715a210..499327e 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -215,6 +215,7 @@ obj-$(CONFIG_DA9055_WATCHDOG) += da9055_wdt.o obj-$(CONFIG_DA9062_WATCHDOG) += da9062_wdt.o obj-$(CONFIG_DA9063_WATCHDOG) += da9063_wdt.o obj-$(CONFIG_GPIO_WATCHDOG) += gpio_wdt.o +obj-$(CONFIG_GSC_WATCHDOG) += gsc_wdt.o obj-$(CONFIG_TANGOX_WATCHDOG) += tangox_wdt.o obj-$(CONFIG_WDAT_WDT) += wdat_wdt.o obj-$(CONFIG_WM831X_WATCHDOG) += wm831x_wdt.o diff --git a/drivers/watchdog/gsc_wdt.c b/drivers/watchdog/gsc_wdt.c new file mode 100644 index 0000000..b43d083 --- /dev/null +++ b/drivers/watchdog/gsc_wdt.c @@ -0,0 +1,146 @@ +/* SPDX-License-Identifier: GPL-2.0 + * + * Copyright (C) 2018 Gateworks Corporation + * + * This driver registers a Linux Watchdog for the GSC + */ +#include +#include +#include +#include +#include + +#define WDT_DEFAULT_TIMEOUT 60 + +struct gsc_wdt { + struct watchdog_device wdt_dev; + struct gsc_dev *gsc; +}; + +static int gsc_wdt_start(struct watchdog_device *wdd) +{ + struct gsc_wdt *wdt = watchdog_get_drvdata(wdd); + unsigned int reg = (1 << GSC_CTRL_1_WDT_ENABLE); + int ret; + + dev_dbg(wdd->parent, "%s timeout=%d\n", __func__, wdd->timeout); + + /* clear first as regmap_update_bits will not write if no change */ + ret = regmap_update_bits(wdt->gsc->regmap, GSC_CTRL_1, reg, 0); + if (ret) + return ret; + return regmap_update_bits(wdt->gsc->regmap, GSC_CTRL_1, reg, reg); +} + +static int gsc_wdt_stop(struct watchdog_device *wdd) +{ + struct gsc_wdt *wdt = watchdog_get_drvdata(wdd); + unsigned int reg = (1 << GSC_CTRL_1_WDT_ENABLE); + + dev_dbg(wdd->parent, "%s\n", __func__); + + return regmap_update_bits(wdt->gsc->regmap, GSC_CTRL_1, reg, 0); +} + +static int gsc_wdt_set_timeout(struct watchdog_device *wdd, + unsigned int timeout) +{ + struct gsc_wdt *wdt = watchdog_get_drvdata(wdd); + unsigned int long_sel = 0; + + dev_dbg(wdd->parent, "%s: %d\n", __func__, timeout); + + switch (timeout) { + case 60: + long_sel = (1 << GSC_CTRL_1_WDT_TIME); + case 30: + regmap_update_bits(wdt->gsc->regmap, GSC_CTRL_1, + (1 << GSC_CTRL_1_WDT_TIME), + (long_sel << GSC_CTRL_1_WDT_TIME)); + wdd->timeout = timeout; + return 0; + } + + return -EINVAL; +} + +static const struct watchdog_info gsc_wdt_info = { + .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING, + .identity = "GSC Watchdog" +}; + +static const struct watchdog_ops gsc_wdt_ops = { + .owner = THIS_MODULE, + .start = gsc_wdt_start, + .stop = gsc_wdt_stop, + .set_timeout = gsc_wdt_set_timeout, +}; + +static int gsc_wdt_probe(struct platform_device *pdev) +{ + struct gsc_dev *gsc = dev_get_drvdata(pdev->dev.parent); + struct device *dev = &pdev->dev; + struct gsc_wdt *wdt; + int ret; + unsigned int reg; + + wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL); + if (!wdt) + return -ENOMEM; + + /* ensure GSC fw supports WD functionality */ + if (gsc->fwver < 44) { + dev_err(dev, "fw v44 or newer required for wdt function\n"); + return -EINVAL; + } + + /* ensure WD bit enabled */ + if (regmap_read(gsc->regmap, GSC_CTRL_1, ®)) + return -EIO; + if (!(reg & (1 << GSC_CTRL_1_WDT_ENABLE))) { + dev_err(dev, "not enabled - must be manually enabled\n"); + return -EINVAL; + } + + platform_set_drvdata(pdev, wdt); + + wdt->gsc = gsc; + wdt->wdt_dev.info = &gsc_wdt_info; + wdt->wdt_dev.ops = &gsc_wdt_ops; + wdt->wdt_dev.status = 0; + wdt->wdt_dev.min_timeout = 30; + wdt->wdt_dev.max_timeout = 60; + wdt->wdt_dev.parent = dev; + + watchdog_set_nowayout(&wdt->wdt_dev, 1); + watchdog_init_timeout(&wdt->wdt_dev, WDT_DEFAULT_TIMEOUT, dev); + + watchdog_set_drvdata(&wdt->wdt_dev, wdt); + ret = devm_watchdog_register_device(dev, &wdt->wdt_dev); + if (ret) + return ret; + + dev_info(dev, "watchdog driver (timeout=%d sec)\n", + wdt->wdt_dev.timeout); + + return 0; +} + +static const struct of_device_id gsc_wdt_dt_ids[] = { + { .compatible = "gw,gsc-watchdog", }, + {} +}; + +static struct platform_driver gsc_wdt_driver = { + .probe = gsc_wdt_probe, + .driver = { + .name = "gsc-wdt", + .of_match_table = gsc_wdt_dt_ids, + }, +}; + +module_platform_driver(gsc_wdt_driver); + +MODULE_AUTHOR("Tim Harvey "); +MODULE_DESCRIPTION("Gateworks System Controller Watchdog driver"); +MODULE_LICENSE("GPL v2");