From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 67755C04A6B for ; Sun, 12 May 2019 13:28:27 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 368AF216C4 for ; Sun, 12 May 2019 13:28:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="no5kUnBM"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CeyfySyr" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 368AF216C4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=roeck-us.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender:Content-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=+WMZ9C28ATVw5DipIjQx8kjQivc/JHLyvQFRdixFz2o=; b=no5kUnBMiA7EFS/cio0SxcWYT gtmkZQDTpjpjuuAtjHlxrmwduF1CaTfBmqX6EossILQp2o5ZDA7nLzGvpCjgKqKUOm/a3u09C6bVl RJ1sYFf/KI49mQbTPuUtVJ3zOn086cJ8S4z4oK/trhWGfbLzZyeC3LvxVjZVFlu6NZYDjSfvlVCqw B6H5NzlDvt8Wj+sA8wk0WyjNMdZy+S61JfxBphWkRiwZFcWUaTi4PE38Whr/pvqXFhv+V451YYj06 f/ktDt74oXY2U5b2YPTF67RQmEVPsA/MJmfWOLwbi5n5oCBlwbc2G3W88d94zR2UQ7l7EKoVD5tVc VivLIBtuw==; 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 1hPoWc-00025n-6u; Sun, 12 May 2019 13:28:22 +0000 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hPoWZ-00024Z-29 for linux-arm-kernel@lists.infradead.org; Sun, 12 May 2019 13:28:20 +0000 Received: by mail-pf1-x443.google.com with SMTP id s11so5679044pfm.12 for ; Sun, 12 May 2019 06:28:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=9iYSr35LjsO+433vGXia3esy4nWZCsmPULrEXsBAJzw=; b=CeyfySyrOmPphPqLRUEGrd/qZVZgYg0MASuRTv4Z5j8/VwW5zFl2IW1LyKSxfTVRF4 W1hBhUlo1wXDuta7vYT4M8e0NetY7I8ucPKM51WV361WgDKl3wEnszsG8QyU8AAHbMl0 QkO/1OluyfHxhvHRbxGozh3HeJAvun2hOv1H4kE2AsjG4C7J5g9qyTLCmkjZNu7ls11V GAfPdyWzV8kAseWjkqr9UXBOz97PRTiLCWwr1M0UL2phQB1VFbYr6RlIf1tdmwKcuMXI Ha1rmQYz6lkm7M3Rq/rEIoRXKjJCfP+SkTUeA4xmtBR3N0uBWGU7rTWtp6zGYJhI9tQw yYWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=9iYSr35LjsO+433vGXia3esy4nWZCsmPULrEXsBAJzw=; b=MdNpueU56fn7k/0r2EMKzGd4e7ryO/sguyage2wL2lGOOkQ8cR/v7+zSxL49SMdnId jNxyGtR5cYG12RVCQU2qxac2GsHX9Um0rs0p+upj92V9PrXrpqGl1w9mPDCnAfgxg3t+ 5gge/35+YEZw+yMZyDiAlMxcDZCkI6DC7ZOMdh96mL3/TJZq6mFoldxYiQQ3W38lrBn1 wA9n5qAaouM3XVG5rMC6p6l1fZp5RL06LUHjBmhw6FW+puom8VUzwmWt7rn+QdW6t6vs +xQ/1BwZP8VB4Npbx5qQKEQXiFfxH8jiNTzz1GlV9M8yGzUtJkQ59lKiVToZLsXT++JW uTBg== X-Gm-Message-State: APjAAAVW1r40RzhI21q/MdFFeJQ3D/ogVQuaYeaOK7IopCBxo61fRWdc lmaB0uwQMHrd3zFzmKObu7Q= X-Google-Smtp-Source: APXvYqycIDg2AXzlbXvbal4yxV5hWYnJG4Yl6TuDt8zkcMxPKxhstBZ3mnGJRbP7LxGEWcliwIwceQ== X-Received: by 2002:a62:38d3:: with SMTP id f202mr23405366pfa.41.1557667697212; Sun, 12 May 2019 06:28:17 -0700 (PDT) Received: from server.roeck-us.net ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id 15sm15785312pfo.117.2019.05.12.06.28.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 May 2019 06:28:16 -0700 (PDT) Subject: Re: [PATCH RESEND V4 3/3] watchdog: imx_sc: Add pretimeout support To: Anson Huang , "robh+dt@kernel.org" , "mark.rutland@arm.com" , "wim@linux-watchdog.org" , "shawnguo@kernel.org" , "s.hauer@pengutronix.de" , "kernel@pengutronix.de" , "festevam@gmail.com" , Aisheng Dong , "ulf.hansson@linaro.org" , Daniel Baluta , Peng Fan , "devicetree@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-watchdog@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" References: <1557655528-12816-1-git-send-email-Anson.Huang@nxp.com> <1557655528-12816-3-git-send-email-Anson.Huang@nxp.com> From: Guenter Roeck Message-ID: Date: Sun, 12 May 2019 06:28:13 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <1557655528-12816-3-git-send-email-Anson.Huang@nxp.com> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190512_062819_132972_1B2002F8 X-CRM114-Status: GOOD ( 25.93 ) 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: dl-linux-imx Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 5/12/19 3:10 AM, Anson Huang wrote: > i.MX system controller watchdog can support pretimeout IRQ > via general SCU MU IRQ, it depends on IMX_SCU and driver MUST > be probed after SCU IPC ready, then enable corresponding SCU > IRQ group and register SCU IRQ notifier, when watchdog pretimeout > IRQ fires, SCU MU IRQ will be handled and watchdog pretimeout > notifier will be called to handle the event. > > Signed-off-by: Anson Huang Revviewed-by: Guenter Roeck Other patches waiting for DT review. IMX API feedback below. Side note: This patch depends on 'firmware: imx: enable imx scu general irq function' which is not yet in mainline. > --- > No change, just resend patch with correct encoding. > --- > drivers/watchdog/Kconfig | 1 + > drivers/watchdog/imx_sc_wdt.c | 116 +++++++++++++++++++++++++++++++++++------- > 2 files changed, 98 insertions(+), 19 deletions(-) > > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig > index 7ea6037..e08238c 100644 > --- a/drivers/watchdog/Kconfig > +++ b/drivers/watchdog/Kconfig > @@ -716,6 +716,7 @@ config IMX2_WDT > config IMX_SC_WDT > tristate "IMX SC Watchdog" > depends on HAVE_ARM_SMCCC > + depends on IMX_SCU > select WATCHDOG_CORE > help > This is the driver for the system controller watchdog > diff --git a/drivers/watchdog/imx_sc_wdt.c b/drivers/watchdog/imx_sc_wdt.c > index 49848b6..6ecc03f 100644 > --- a/drivers/watchdog/imx_sc_wdt.c > +++ b/drivers/watchdog/imx_sc_wdt.c > @@ -4,6 +4,7 @@ > */ > > #include > +#include > #include > #include > #include > @@ -33,11 +34,19 @@ > > #define SC_TIMER_WDOG_ACTION_PARTITION 0 > > +#define SC_IRQ_WDOG 1 > +#define SC_IRQ_GROUP_WDOG 1 > + > static bool nowayout = WATCHDOG_NOWAYOUT; > module_param(nowayout, bool, 0000); > MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" > __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); > > +struct imx_sc_wdt_device { > + struct watchdog_device wdd; > + struct notifier_block wdt_notifier; > +}; > + > static int imx_sc_wdt_ping(struct watchdog_device *wdog) > { > struct arm_smccc_res res; > @@ -85,24 +94,66 @@ static int imx_sc_wdt_set_timeout(struct watchdog_device *wdog, > return res.a0 ? -EACCES : 0; > } > > +static int imx_sc_wdt_set_pretimeout(struct watchdog_device *wdog, > + unsigned int pretimeout) > +{ > + struct arm_smccc_res res; > + > + arm_smccc_smc(IMX_SIP_TIMER, IMX_SIP_TIMER_SET_PRETIME_WDOG, > + pretimeout * 1000, 0, 0, 0, 0, 0, &res); > + if (res.a0) > + return -EACCES; > + > + wdog->pretimeout = pretimeout; > + > + return 0; > +} > + > +static int imx_sc_wdt_notify(struct notifier_block *nb, > + unsigned long event, void *group) > +{ > + struct imx_sc_wdt_device *imx_sc_wdd = > + container_of(nb, > + struct imx_sc_wdt_device, > + wdt_notifier); > + > + if (event & SC_IRQ_WDOG && > + *(u8 *)group == SC_IRQ_GROUP_WDOG) > + watchdog_notify_pretimeout(&imx_sc_wdd->wdd); This should really not be necessary. Event mask and target group (if needed with a wildcard for the group) should be parameters of imx_scu_irq_register_notifier(), and be handled in the imx code. Also, passing 'group' as pointed seems excessive. Might as well pass it directly. Guenter > + > + return 0; > +} > + > +static void imx_sc_wdt_action(void *data) > +{ > + struct notifier_block *wdt_notifier = data; > + > + imx_scu_irq_unregister_notifier(wdt_notifier); > + imx_scu_irq_group_enable(SC_IRQ_GROUP_WDOG, > + SC_IRQ_WDOG, > + false); > +} > + > static const struct watchdog_ops imx_sc_wdt_ops = { > .owner = THIS_MODULE, > .start = imx_sc_wdt_start, > .stop = imx_sc_wdt_stop, > .ping = imx_sc_wdt_ping, > .set_timeout = imx_sc_wdt_set_timeout, > + .set_pretimeout = imx_sc_wdt_set_pretimeout, > }; > > -static const struct watchdog_info imx_sc_wdt_info = { > +static struct watchdog_info imx_sc_wdt_info = { > .identity = "i.MX SC watchdog timer", > .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | > - WDIOF_MAGICCLOSE | WDIOF_PRETIMEOUT, > + WDIOF_MAGICCLOSE, > }; > > static int imx_sc_wdt_probe(struct platform_device *pdev) > { > + struct imx_sc_wdt_device *imx_sc_wdd; > + struct watchdog_device *wdog; > struct device *dev = &pdev->dev; > - struct watchdog_device *imx_sc_wdd; > int ret; > > imx_sc_wdd = devm_kzalloc(dev, sizeof(*imx_sc_wdd), GFP_KERNEL); > @@ -111,42 +162,69 @@ static int imx_sc_wdt_probe(struct platform_device *pdev) > > platform_set_drvdata(pdev, imx_sc_wdd); > > - imx_sc_wdd->info = &imx_sc_wdt_info; > - imx_sc_wdd->ops = &imx_sc_wdt_ops; > - imx_sc_wdd->min_timeout = 1; > - imx_sc_wdd->max_timeout = MAX_TIMEOUT; > - imx_sc_wdd->parent = dev; > - imx_sc_wdd->timeout = DEFAULT_TIMEOUT; > + wdog = &imx_sc_wdd->wdd; > + wdog->info = &imx_sc_wdt_info; > + wdog->ops = &imx_sc_wdt_ops; > + wdog->min_timeout = 1; > + wdog->max_timeout = MAX_TIMEOUT; > + wdog->parent = dev; > + wdog->timeout = DEFAULT_TIMEOUT; > > - watchdog_init_timeout(imx_sc_wdd, 0, dev); > - watchdog_stop_on_reboot(imx_sc_wdd); > - watchdog_stop_on_unregister(imx_sc_wdd); > + watchdog_init_timeout(wdog, 0, dev); > + watchdog_stop_on_reboot(wdog); > + watchdog_stop_on_unregister(wdog); > > - ret = devm_watchdog_register_device(dev, imx_sc_wdd); > + ret = devm_watchdog_register_device(dev, wdog); > if (ret) { > dev_err(dev, "Failed to register watchdog device\n"); > return ret; > } > > + ret = imx_scu_irq_group_enable(SC_IRQ_GROUP_WDOG, > + SC_IRQ_WDOG, > + true); > + if (ret) { > + dev_warn(dev, "Enable irq failed, pretimeout NOT supported\n"); > + return 0; > + } > + > + imx_sc_wdd->wdt_notifier.notifier_call = imx_sc_wdt_notify; > + ret = imx_scu_irq_register_notifier(&imx_sc_wdd->wdt_notifier); > + if (ret) { > + imx_scu_irq_group_enable(SC_IRQ_GROUP_WDOG, > + SC_IRQ_WDOG, > + false); > + dev_warn(dev, > + "Register irq notifier failed, pretimeout NOT supported\n"); > + return 0; > + } > + > + ret = devm_add_action_or_reset(dev, imx_sc_wdt_action, > + &imx_sc_wdd->wdt_notifier); > + if (!ret) > + imx_sc_wdt_info.options |= WDIOF_PRETIMEOUT; > + else > + dev_warn(dev, "Add action failed, pretimeout NOT supported\n"); > + > return 0; > } > > static int __maybe_unused imx_sc_wdt_suspend(struct device *dev) > { > - struct watchdog_device *imx_sc_wdd = dev_get_drvdata(dev); > + struct imx_sc_wdt_device *imx_sc_wdd = dev_get_drvdata(dev); > > - if (watchdog_active(imx_sc_wdd)) > - imx_sc_wdt_stop(imx_sc_wdd); > + if (watchdog_active(&imx_sc_wdd->wdd)) > + imx_sc_wdt_stop(&imx_sc_wdd->wdd); > > return 0; > } > > static int __maybe_unused imx_sc_wdt_resume(struct device *dev) > { > - struct watchdog_device *imx_sc_wdd = dev_get_drvdata(dev); > + struct imx_sc_wdt_device *imx_sc_wdd = dev_get_drvdata(dev); > > - if (watchdog_active(imx_sc_wdd)) > - imx_sc_wdt_start(imx_sc_wdd); > + if (watchdog_active(&imx_sc_wdd->wdd)) > + imx_sc_wdt_start(&imx_sc_wdd->wdd); > > return 0; > } > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel