Received: by 10.213.65.68 with SMTP id h4csp541796imn; Wed, 28 Mar 2018 08:16:42 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+ZgX6eY/XZ0IKaIUS39WeZJBC5/9mk3AYuezZSPtK7X3mtFM+FCC0ZYAoAd4KFa2Z5mmFJ X-Received: by 10.99.190.75 with SMTP id g11mr2847293pgo.127.1522250202093; Wed, 28 Mar 2018 08:16:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522250202; cv=none; d=google.com; s=arc-20160816; b=AQP3OAm/hbIVrpbKXN/68BpmIN4Yzc34weFz4kyb45MAPlMz2dfSc5iw+YQ0n+Qibi p1e9eZq1vYNgJJqpN4oYLY1JklMZVig7KLDz7GxYC5jytOuZCqTr6sQHDuvesJ4BcQfX cTPle7PANfy3s0tLId3N3knyfK3fk7U5C9/rhwAB9uJIzidRv8pXppxpWAz4e4RBpF6x HaA3UREreCchqLH6nlAnJ2Af+yRhes40QpiTPLlhPmfyyAOAGCkllar6y3xg0JFv9Jk6 bHrblra6Anbz9CuGMNX4NA13HZFpi3m5wPWAI+U+sN1mDm1Nl/K6ydroDL+HPHiVu+EP 0bqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=FJnJ1+t2U642du/ebaF4IDJfA3Wkaty++Sz9UrzeDvs=; b=rSAln7riDGOMFuD67Ll/pPyJB9tIYKvXEGXiKiDhHJDd1jDUKfTX1JeLC4ZZfafceS nJO0b6GP7487tR0dfag3sQ8rnDfNBJsRN8TyDf4U4/wYVnR25m7GxeVLl3J2nsT+zJUg MdaPfhhhLtbMIrOhCQdlP8NwCevFzB2lVv+f1TMDnT+fNnCXEBExq4uHX5jghGVoRWg/ /rQrwPB3mhrfhM1jbWzL6s3OQS6PnpxzSsc9vA3YzqcypnnaIUdHq3vrjYc+0YdsGnb8 dMjz671jpiwh+vRImwG+h5lG3P4j1GlKu14majjNwR3ry+sVTPkzmDu8u89rSgR5O2fk FUwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gateworks-com.20150623.gappssmtp.com header.s=20150623 header.b=Jm6KiPWh; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 38-v6si3707315pln.397.2018.03.28.08.16.04; Wed, 28 Mar 2018 08:16:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gateworks-com.20150623.gappssmtp.com header.s=20150623 header.b=Jm6KiPWh; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753970AbeC1POa (ORCPT + 99 others); Wed, 28 Mar 2018 11:14:30 -0400 Received: from mail-pl0-f66.google.com ([209.85.160.66]:42804 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753951AbeC1POT (ORCPT ); Wed, 28 Mar 2018 11:14:19 -0400 Received: by mail-pl0-f66.google.com with SMTP id g20-v6so1756973plo.9 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=WO5nE5xlSi01YZI+gZAQqUtD+7eZWgOgAg3w47iDm1dXPuuGATGV49AFyL5vP7OJo/ w7zsLItuTxCDHqaLGYTlG8AaF7P8uAIVp+jtx8l12IV2W+i2DTVxeaKbBlBmczjbkEQq 0BBlftUGCo6XxEViCx21ngNdi3024kmmTXRftOyrtSiyGNgqHKjL7dnf8z7h2S6fL3cu 5zlj8DoBSpFM1dDgdUrihbx0MpbXZiJF6c+MVCCHuKKh9BVga5CNLYVQnXZTQ4SqhypP zsRDSXZdIyU5JPoCQyabF3vYgpYQHVz23g4So5VX9/8lq5vtfZTRdMgtLdyyWqXvhysI bJ4g== X-Gm-Message-State: AElRT7F2fX2p+fUwxBhUrSfI8rgvfAyXaVgb6WJ3AJveHf7f05ieHOsM CYBIuJa3paf7IOs9s0zU5wX8dw== 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 Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-hwmon@vger.kernel.org, linux-input@vger.kernel.org, linux-watchdog@vger.kernel.org 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> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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"); -- 2.7.4