From patchwork Fri Feb 10 12:17:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergio Paracuellos X-Patchwork-Id: 55406 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp920722wrn; Fri, 10 Feb 2023 04:23:43 -0800 (PST) X-Google-Smtp-Source: AK7set+kBHj0g8zRqRuFkXdKg3PNAxF+wbett0rBQdxb2QBVb6TZN6MclLFqhLLpGETHLnKXlVfG X-Received: by 2002:aa7:9797:0:b0:5a8:4955:6d96 with SMTP id o23-20020aa79797000000b005a849556d96mr7380760pfp.3.1676031823181; Fri, 10 Feb 2023 04:23:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676031823; cv=none; d=google.com; s=arc-20160816; b=f6kzr7qj14R7MlepixTeqE3rA1XG0zDVn6t6MwO/AfB9eXXfrtxYuRztH55LcP4lVH AuszMcrmo0R3bK7dd32jmoaEZNoigm8dAKGqUkPeeBvHhUTj2LcyKxrrEtVE5cUiPZjY SoYLOZW+ozTbwbiwq1DmGMZ6pVUpRb96Y461SGT46MKdy6J0FDgF2/ds4nyHPjtegoZ6 W2PoQ9qJpTbEk0eudEzTkgdWiBRG2FhpY7ZVWfW94dHMF3GvFy6lu3mHkuD6BuqDOSzJ XXMnOKNTGDrfySkIW7pr1g0oFIgKP8T8eNP9BscurufVdPQbe/wsg0lxGzmBi8TLkrUa ErHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=z5H2WYJqxxvcbTNTDZKBUv7lLx7tpDxv+9BvccHcUd0=; b=BcTNwjiPdEUVljXbiiYvk6ctBvIoXQ1b43RRUv8FSxbmipQ750tzf/vnc28O7trOfm vf2pZAxGMTTkRiS5C1nIflZifzrG6huG2XxbBtmgk+aK1c2Pd+Z/vZVPnU3e2JF8aZ8R /WWEdtQx3ZQmqdsTJp4PsckMPeinqd+poTzrlIKagX1Rjy5Dlb8wkV2BQtpJ5o5wrGws 9w2eYXXw4koIhV7Oboil5kOcbxCnUc6fLNz8854ptODFS4OHIfKffo2Lu4dDnrbzAV5H OzjOHhIxp/cn5wPYGwFcweVL01lkFBFp0CjjY4/9QgnIo5uUKQv2Yh/r750UcAqp5XDB 8n+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=dXwGvca2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z10-20020aa7958a000000b0058e0b9c90casi758553pfj.236.2023.02.10.04.23.30; Fri, 10 Feb 2023 04:23:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=dXwGvca2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232317AbjBJMRt (ORCPT + 99 others); Fri, 10 Feb 2023 07:17:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40540 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231985AbjBJMRp (ORCPT ); Fri, 10 Feb 2023 07:17:45 -0500 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A7A7D721E2; Fri, 10 Feb 2023 04:17:43 -0800 (PST) Received: by mail-wm1-x332.google.com with SMTP id m16-20020a05600c3b1000b003dc4050c94aso3916242wms.4; Fri, 10 Feb 2023 04:17:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=z5H2WYJqxxvcbTNTDZKBUv7lLx7tpDxv+9BvccHcUd0=; b=dXwGvca2bsAuNrarrHAodq0i0YeN3+feaHKC3tV7+jF6KqI++zLgqMNf0uiASKHdEN 76xwvMUzyU9qJmBLrpZGEWENJu1Yy5rcR/yTy3wJVhor+r7DoAkFcEuMowKdIBqw38Xx acPugvhqKOFNO6SWjw3BVmB7Q8F3V/GEtTVOKALdXM3I6qF8pSKfHozWcVMeFk4bBp/b /D1dPm/155bK8guJQ1l7Tvpk9s6c6lVGBaAEcjMWZ+sJgCLUBAmNduorahAcZDWrncZU A/zOPSyMwu9WfDYcMHBXdvZq064UIwPdyR4LSviInFDBG61UD1nz1QCbE4TlBHWwHpmd RmRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=z5H2WYJqxxvcbTNTDZKBUv7lLx7tpDxv+9BvccHcUd0=; b=iDB6lbma+QTMCTvmyw2cbRyquVXcPtuycZ7fKjBVWEeQH5d+j5taOmG5kX4aTD0YD9 GwYFqvikB9AChnSCFrdxjsqTyTU3W4nSXRnrwsQdnFF8ah/9UB7ZDrYKeM6reCOKLtFT eBhgwPlUJp1SA2fDrFWnnMnpJBeDZ8w9m3iYIdn5Y7uGGH5Tctn4gxi8Qru3ZmqyYcNT IY9nl261zTUH4fipO7hKozCLhpLSA9ay5FXliObHgeIcbRPc8+4NlWQEr0RZNXaZheAx tO9m3dsmpxshJ3RL1vNfpNXCLjnt2SMrX0dw1+Kfeqi1PzZgZJOUHvXgiXJWNJLHBYqE woSQ== X-Gm-Message-State: AO0yUKUG0Wn7J984PgX01G2Gqkr5Hi7+Bp+8pl+o6izy/cBedVuzn31j +wF8UGTuMGv+yXQUP9kc7hfZM4Y5axY= X-Received: by 2002:a05:600c:2e95:b0:3da:50b0:e96a with SMTP id p21-20020a05600c2e9500b003da50b0e96amr12732785wmn.29.1676031461750; Fri, 10 Feb 2023 04:17:41 -0800 (PST) Received: from localhost.localdomain (23.red-88-10-60.dynamicip.rima-tde.net. [88.10.60.23]) by smtp.gmail.com with ESMTPSA id p13-20020a05600c468d00b003e001afa274sm5359820wmo.2.2023.02.10.04.17.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Feb 2023 04:17:41 -0800 (PST) From: Sergio Paracuellos To: linux-watchdog@vger.kernel.org Cc: wim@linux-watchdog.org, linux@roeck-us.net, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, matthias.bgg@gmail.com, arinc.unal@arinc9.com, tsbogend@alpha.franken.de, p.zabel@pengutronix.de, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-mips@vger.kernel.org Subject: [PATCH v2 3/4] watchdog: mt7621-wdt: avoid static global declarations Date: Fri, 10 Feb 2023 13:17:34 +0100 Message-Id: <20230210121735.639089-4-sergio.paracuellos@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230210121735.639089-1-sergio.paracuellos@gmail.com> References: <20230210121735.639089-1-sergio.paracuellos@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757446744830893982?= X-GMAIL-MSGID: =?utf-8?q?1757446744830893982?= Instead of using static global definitions in driver code, refactor code introducing a new watchdog driver data structure and use it along the code. Signed-off-by: Sergio Paracuellos --- drivers/watchdog/mt7621_wdt.c | 104 ++++++++++++++++++++++------------ 1 file changed, 67 insertions(+), 37 deletions(-) diff --git a/drivers/watchdog/mt7621_wdt.c b/drivers/watchdog/mt7621_wdt.c index a8aa3522c..f1c702971 100644 --- a/drivers/watchdog/mt7621_wdt.c +++ b/drivers/watchdog/mt7621_wdt.c @@ -31,8 +31,11 @@ #define TMR1CTL_RESTART BIT(9) #define TMR1CTL_PRESCALE_SHIFT 16 -static void __iomem *mt7621_wdt_base; -static struct reset_control *mt7621_wdt_reset; +struct mt7621_wdt_data { + void __iomem *base; + struct reset_control *rst; + struct watchdog_device wdt; +}; static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); @@ -40,27 +43,31 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); -static inline void rt_wdt_w32(unsigned reg, u32 val) +static inline void rt_wdt_w32(void __iomem *base, unsigned reg, u32 val) { - iowrite32(val, mt7621_wdt_base + reg); + iowrite32(val, base + reg); } -static inline u32 rt_wdt_r32(unsigned reg) +static inline u32 rt_wdt_r32(void __iomem *base, unsigned reg) { - return ioread32(mt7621_wdt_base + reg); + return ioread32(base + reg); } static int mt7621_wdt_ping(struct watchdog_device *w) { - rt_wdt_w32(TIMER_REG_TMRSTAT, TMR1CTL_RESTART); + struct mt7621_wdt_data *drvdata = watchdog_get_drvdata(w); + + rt_wdt_w32(drvdata->base, TIMER_REG_TMRSTAT, TMR1CTL_RESTART); return 0; } static int mt7621_wdt_set_timeout(struct watchdog_device *w, unsigned int t) { + struct mt7621_wdt_data *drvdata = watchdog_get_drvdata(w); + w->timeout = t; - rt_wdt_w32(TIMER_REG_TMR1LOAD, t * 1000); + rt_wdt_w32(drvdata->base, TIMER_REG_TMR1LOAD, t * 1000); mt7621_wdt_ping(w); return 0; @@ -68,29 +75,31 @@ static int mt7621_wdt_set_timeout(struct watchdog_device *w, unsigned int t) static int mt7621_wdt_start(struct watchdog_device *w) { + struct mt7621_wdt_data *drvdata = watchdog_get_drvdata(w); u32 t; /* set the prescaler to 1ms == 1000us */ - rt_wdt_w32(TIMER_REG_TMR1CTL, 1000 << TMR1CTL_PRESCALE_SHIFT); + rt_wdt_w32(drvdata->base, TIMER_REG_TMR1CTL, 1000 << TMR1CTL_PRESCALE_SHIFT); mt7621_wdt_set_timeout(w, w->timeout); - t = rt_wdt_r32(TIMER_REG_TMR1CTL); + t = rt_wdt_r32(drvdata->base, TIMER_REG_TMR1CTL); t |= TMR1CTL_ENABLE; - rt_wdt_w32(TIMER_REG_TMR1CTL, t); + rt_wdt_w32(drvdata->base, TIMER_REG_TMR1CTL, t); return 0; } static int mt7621_wdt_stop(struct watchdog_device *w) { + struct mt7621_wdt_data *drvdata = watchdog_get_drvdata(w); u32 t; mt7621_wdt_ping(w); - t = rt_wdt_r32(TIMER_REG_TMR1CTL); + t = rt_wdt_r32(drvdata->base, TIMER_REG_TMR1CTL); t &= ~TMR1CTL_ENABLE; - rt_wdt_w32(TIMER_REG_TMR1CTL, t); + rt_wdt_w32(drvdata->base, TIMER_REG_TMR1CTL, t); return 0; } @@ -105,7 +114,9 @@ static int mt7621_wdt_bootcause(void) static int mt7621_wdt_is_running(struct watchdog_device *w) { - return !!(rt_wdt_r32(TIMER_REG_TMR1CTL) & TMR1CTL_ENABLE); + struct mt7621_wdt_data *drvdata = watchdog_get_drvdata(w); + + return !!(rt_wdt_r32(drvdata->base, TIMER_REG_TMR1CTL) & TMR1CTL_ENABLE); } static const struct watchdog_info mt7621_wdt_info = { @@ -121,30 +132,39 @@ static const struct watchdog_ops mt7621_wdt_ops = { .set_timeout = mt7621_wdt_set_timeout, }; -static struct watchdog_device mt7621_wdt_dev = { - .info = &mt7621_wdt_info, - .ops = &mt7621_wdt_ops, - .min_timeout = 1, - .max_timeout = 0xfffful / 1000, -}; - static int mt7621_wdt_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; - mt7621_wdt_base = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(mt7621_wdt_base)) - return PTR_ERR(mt7621_wdt_base); + struct watchdog_device *mt7621_wdt; + struct mt7621_wdt_data *drvdata; + int err; + + drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); + if (!drvdata) + return -ENOMEM; + + drvdata->base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(drvdata->base)) + return PTR_ERR(drvdata->base); - mt7621_wdt_reset = devm_reset_control_get_exclusive(dev, NULL); - if (!IS_ERR(mt7621_wdt_reset)) - reset_control_deassert(mt7621_wdt_reset); + drvdata->rst = devm_reset_control_get_exclusive(dev, NULL); + if (!IS_ERR(drvdata->rst)) + reset_control_deassert(drvdata->rst); - mt7621_wdt_dev.bootstatus = mt7621_wdt_bootcause(); + mt7621_wdt = &drvdata->wdt; + mt7621_wdt->info = &mt7621_wdt_info; + mt7621_wdt->ops = &mt7621_wdt_ops; + mt7621_wdt->min_timeout = 1; + mt7621_wdt->max_timeout = 0xfffful / 1000; + mt7621_wdt->parent = dev; - watchdog_init_timeout(&mt7621_wdt_dev, mt7621_wdt_dev.max_timeout, - dev); - watchdog_set_nowayout(&mt7621_wdt_dev, nowayout); - if (mt7621_wdt_is_running(&mt7621_wdt_dev)) { + mt7621_wdt->bootstatus = mt7621_wdt_bootcause(); + + watchdog_init_timeout(mt7621_wdt, mt7621_wdt->max_timeout, dev); + watchdog_set_nowayout(mt7621_wdt, nowayout); + watchdog_set_drvdata(mt7621_wdt, drvdata); + + if (mt7621_wdt_is_running(mt7621_wdt)) { /* * Make sure to apply timeout from watchdog core, taking * the prescaler of this driver here into account (the @@ -154,17 +174,27 @@ static int mt7621_wdt_probe(struct platform_device *pdev) * we first disable the watchdog, set the new prescaler * and timeout, and then re-enable the watchdog. */ - mt7621_wdt_stop(&mt7621_wdt_dev); - mt7621_wdt_start(&mt7621_wdt_dev); - set_bit(WDOG_HW_RUNNING, &mt7621_wdt_dev.status); + mt7621_wdt_stop(mt7621_wdt); + mt7621_wdt_start(mt7621_wdt); + set_bit(WDOG_HW_RUNNING, &mt7621_wdt->status); + } + + err = devm_watchdog_register_device(dev, &drvdata->wdt); + if (err) { + dev_err(dev, "Error registering watchdog device\n"); + return err; } - return devm_watchdog_register_device(dev, &mt7621_wdt_dev); + platform_set_drvdata(pdev, drvdata); + + return 0; } static void mt7621_wdt_shutdown(struct platform_device *pdev) { - mt7621_wdt_stop(&mt7621_wdt_dev); + struct mt7621_wdt_data *drvdata = platform_get_drvdata(pdev); + + mt7621_wdt_stop(&drvdata->wdt); } static const struct of_device_id mt7621_wdt_match[] = {