From patchwork Fri Feb 10 12:17:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergio Paracuellos X-Patchwork-Id: 13135749 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50C66C64EC5 for ; Fri, 10 Feb 2023 12:17:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232236AbjBJMRm (ORCPT ); Fri, 10 Feb 2023 07:17:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231978AbjBJMRl (ORCPT ); Fri, 10 Feb 2023 07:17:41 -0500 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 831DC6E578; Fri, 10 Feb 2023 04:17:40 -0800 (PST) Received: by mail-wm1-x32a.google.com with SMTP id f23-20020a05600c491700b003dff4480a17so5346805wmp.1; Fri, 10 Feb 2023 04:17:40 -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=7iAq1Y15dNDe23a7+ggQXaAwsjH6+BmLH7b26udO+js=; b=XLZLhg9MahUcvhUYp+OMOVmOx3yquF29MiBO1HJJdg39QTDimNxnNh4+T35D5yXwHr Lc2g+XDBEZ05+pzHujhA3QYe4MDzrvtbeZNWA+ReMhYmaFk3z7oiijNE1kNajA9NNt+h Zj/2xRq0qGQCguRRlV2UpTQFffp5ALDy8FRDn5lDJQzr279mm0PuS02k1JlYvsHWcO/3 YcIdSFJTzZDhzA5rVlkaHX8mCARDMFZB2ZWlSSprWUz7PI8KnU8qLNPHJ0M1+tKyZwp+ YKQBAAACZ12TQrWlUvLUMNRhOSIGAbcJRI5DUR4nbNAfVLeRAxcljlU55oZTKMtwuXHD QYIA== 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=7iAq1Y15dNDe23a7+ggQXaAwsjH6+BmLH7b26udO+js=; b=1zBTVJE/1dg2kHzI2aTkjTCom729PO9m6ZOjsDcj9CjKhmzVfVFJmj1rsAquwYyTpX s00zdHRT+B9GQZe8gY59QUFQ06hfot5/xN6mnk97E67pwzuZSxGwe6sMf+57mhab05vQ 6DKSbZZPrgt4jhwB/eiI+5vKxJrcHe1OXLWlD3HrSIJkhJvjIrRy8/ceM1ugton4kMti VSzAlxy8WWF7ZcF2mIA++99EqhMAAtwTeTqzdsn/BEgjfdVPIMDWjmdRPtnCifIh/2qE iMjVUT7lpqRnn365KL72Y0irYbUopK+G51pmq2k3mON6E/lrRv1IuZeLSCQfZZV+vrDO gf+w== X-Gm-Message-State: AO0yUKUKNnl5JWLZxb6txQgFG+esvL6HZ7cks0VGIDq6QNjdQfpPazzI +rSxd3HvpeeVwJ4e1Pz4AccnBDHEtoA= X-Google-Smtp-Source: AK7set+kmIYCGxAp6RnznShw26E0vfGxQ7sS/CEH+BApiEkE4cpiryC2AZOwvyW/0Ddn4KmrQ0bx9Q== X-Received: by 2002:a05:600c:1708:b0:3de:e8c5:d826 with SMTP id c8-20020a05600c170800b003dee8c5d826mr12737533wmn.28.1676031458715; Fri, 10 Feb 2023 04:17:38 -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.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Feb 2023 04:17:38 -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 1/4] dt-bindings: watchdog: mt7621-wdt: add phandle to access system controller registers Date: Fri, 10 Feb 2023 13:17:32 +0100 Message-Id: <20230210121735.639089-2-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 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org MT7621 SoC provides a system controller node for accessing to some registers. Add a phandle in this node to avoid using MIPS related arch operations and includes in watchdog driver code. Signed-off-by: Sergio Paracuellos --- .../devicetree/bindings/watchdog/mediatek,mt7621-wdt.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Documentation/devicetree/bindings/watchdog/mediatek,mt7621-wdt.yaml b/Documentation/devicetree/bindings/watchdog/mediatek,mt7621-wdt.yaml index b2b17fdf4..cc701e920 100644 --- a/Documentation/devicetree/bindings/watchdog/mediatek,mt7621-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/mediatek,mt7621-wdt.yaml @@ -19,6 +19,12 @@ properties: reg: maxItems: 1 + ralink,sysctl: + $ref: /schemas/types.yaml#/definitions/phandle + description: + phandle to system controller 'sysc' syscon node which + controls system registers + required: - compatible - reg @@ -30,4 +36,5 @@ examples: watchdog@100 { compatible = "mediatek,mt7621-wdt"; reg = <0x100 0x100>; + ralink,sysctl = <&sysc>; }; From patchwork Fri Feb 10 12:17:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergio Paracuellos X-Patchwork-Id: 13135750 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 78A2AC05027 for ; Fri, 10 Feb 2023 12:17:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232283AbjBJMRo (ORCPT ); Fri, 10 Feb 2023 07:17:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40496 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232262AbjBJMRn (ORCPT ); Fri, 10 Feb 2023 07:17:43 -0500 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 325CC2595D; Fri, 10 Feb 2023 04:17:42 -0800 (PST) Received: by mail-wm1-x336.google.com with SMTP id z13so3697204wmp.2; Fri, 10 Feb 2023 04:17:42 -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=7dxleiWgtxlgcGySHoGsINCTVEVOCZFH0ndRwgqvbJw=; b=WnDjBwWztshSFL6gZfGUAjtyHcbNgWciDJls3TQfbMe9fe1ZOlImrD+8VqDckH/7dZ HCfzkqOYQU2q9vvrDHL4PAJtEI3CT4yQ1pzOhqa7ygHkfyUOCdd1KGzyAmdeNnvmauf6 Oh2O0dtIubhbg6UnSajTYtFWlNPLihc/DAQ0gC7Hv/XPvds7q8Xq82qkg9YqH7WxzN7F Pw2exOoLBy34jsIPY8NnN2dTjtgh0JvO4M0BbDpwn0XcvmpLVJgNu5gYK541lDwJ9wWS rUB1FIuEivi8Tv40wE5jjN1pi/jyrcgI9yCVEFdvDqOVjoqRRDsREO4V5QcelDKPC/R3 tKlA== 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=7dxleiWgtxlgcGySHoGsINCTVEVOCZFH0ndRwgqvbJw=; b=KY/GYYqVGzA6mHkQWh1+bJd9D6uXFC7sEPElWYPwPwr+I/NHVutEOmls3hIA+hXbco MglXNvqGGKnBlplT6vtlGNFli9nSVKBWvzajMYGfHIbj7IVm/ZqF0NCddZR2+JOopO6A f+NZC6npRiJsx3uvPIW3JbJLk22x7QCo2iXxKDttucu4r/8wv76QUo26TAIpjbMsrY4x C4j51YzT7ADchhTnpo3GauiDx8/yFaA+AoTLbnLX0fzkcpzUTTYxZ/rbPMCazrTwqZVB D1TXG6bv7iShnpmWHzU9+/FdGGRvWJ+Dl3cxt967A6uj/MC+Tq1MQAQVG/d0HD1Wr2hx t1yg== X-Gm-Message-State: AO0yUKWSP5hCT2fF6bLRV6QTd1eQ6QkLClzIMrTUWTivydfM8scWrjnv S7KWZ08jMgqIqogSiIagxSiW/Xv9fyk= X-Google-Smtp-Source: AK7set9+rtgGHxmuw36z3r4F2dbl5bRVtNH0uYL8B5IWGLs+WxPJpKe6f+Bkg06yo/IPeHtfR28yrw== X-Received: by 2002:a05:600c:4383:b0:3df:f7f1:4fbe with SMTP id e3-20020a05600c438300b003dff7f14fbemr12787127wmn.1.1676031460433; Fri, 10 Feb 2023 04:17:40 -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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Feb 2023 04:17:39 -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 2/4] mips: dts: ralink: mt7621: add phandle to system controller node for watchdog Date: Fri, 10 Feb 2023 13:17:33 +0100 Message-Id: <20230210121735.639089-3-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 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org To allow to access system controller registers from watchdog driver code add a phandle in the watchdog 'wdt' node. This avoid using arch dependent operations in driver code. Signed-off-by: Sergio Paracuellos --- arch/mips/boot/dts/ralink/mt7621.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/mips/boot/dts/ralink/mt7621.dtsi b/arch/mips/boot/dts/ralink/mt7621.dtsi index 5ca40fd21..1a1c017d7 100644 --- a/arch/mips/boot/dts/ralink/mt7621.dtsi +++ b/arch/mips/boot/dts/ralink/mt7621.dtsi @@ -73,6 +73,7 @@ sysc: syscon@0 { wdt: wdt@100 { compatible = "mediatek,mt7621-wdt"; reg = <0x100 0x100>; + ralink,sysctl = <&sysc>; }; gpio: gpio@600 { 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: 13135751 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA4BCC636CD for ; Fri, 10 Feb 2023 12:17:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232267AbjBJMRq (ORCPT ); Fri, 10 Feb 2023 07:17:46 -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-Google-Smtp-Source: AK7set+IE4MD8p8bTKPfWdEcUr21W/Wm+2WJBhtIy2Jcr/nxoNN2iCW/Rom+iO0AyP5ti41+8qdpEQ== 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 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org 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[] = { From patchwork Fri Feb 10 12:17:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergio Paracuellos X-Patchwork-Id: 13135752 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A820C64EC4 for ; Fri, 10 Feb 2023 12:17:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232308AbjBJMRr (ORCPT ); Fri, 10 Feb 2023 07:17:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40566 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231893AbjBJMRq (ORCPT ); Fri, 10 Feb 2023 07:17:46 -0500 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C41CD7289B; Fri, 10 Feb 2023 04:17:44 -0800 (PST) Received: by mail-wm1-x334.google.com with SMTP id m16-20020a05600c3b1000b003dc4050c94aso3916277wms.4; Fri, 10 Feb 2023 04:17:44 -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=85Jcqp/n5GNk4Jt2RN2nNjpswbRqJZ3Mt7tqEL5Vzsk=; b=KU4zhpdKF64gnPrZSYtRctPRLhs18rAmuzm73jQWx1HnMfCJmhcCsD+puNvmFx+wTM 5hXWGs2wYVB6tzARbIFZfdIZJs2E5L1ikjnoRMy/8mlq52h69ra1WH7cB/ScK+hyUtns UmIHo3Qx996o1d4Y4+ExP0Kemq34n0F8Z9U9krPtWLpi6+z04spnIPlebMOe5m//ZtZB OUJSgL44cDCq8MsKd+lYeFqcBXrVCtuT1K4BIGziyzMr57rcHLMsaMe98/WF+XvDjYCY KksOnWAtCKu8o1xCcdAVGHl/BgRAbAbGGII6aFreadXRE9xpjdGPVyggPsFjDeYV/oeo sJSQ== 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=85Jcqp/n5GNk4Jt2RN2nNjpswbRqJZ3Mt7tqEL5Vzsk=; b=5VQuAvjQOE/9Fvx6qKrDiTDSzzKEmoVw/9lXxpkG5oA0YVFpubtl0IoUpJg7U83Yym 3ouwE1cXR+EFWPgg9eawFNeyKOZj0ZBsisVxQWCXh6W0WusKPcjctlwW+43N6aj7AD89 gcOsG43DJDXFQ1oZqnq8o+6rQxJ3zR3SUa+il9qzOVUcNm3+Z1wGYHCifV9WW1felrjA AeGS9tkQ3WEkhL7YQFDEb3/tIxtK8kc5FUD+8gI8PkTt/4q77fWjiIPhMBOd41z6cTJI y/3dchTFPxpZdZUNhdt4w+M0AcLAaYOKDHeJR+AWJ6juIu8P6uZsaQNshR/i97gBjXWk mzRQ== X-Gm-Message-State: AO0yUKV4zDZwVX9D/keOjchd7eGw5R7SQmSjDsw1+9F8j8fhs/x7UjX1 EtcTtZKCy64VTE9cVTlgBUqyLhkHULw= X-Google-Smtp-Source: AK7set+qS6x4BJ+LtKe95F/2SO4xZ8r/N6WDScelOSSAg3g2uSEJKjzn5Lnq9yVuJJ9xzfPxkUroEw== X-Received: by 2002:a05:600c:1887:b0:3dc:4318:d00d with SMTP id x7-20020a05600c188700b003dc4318d00dmr12224825wmp.11.1676031462935; Fri, 10 Feb 2023 04:17:42 -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.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Feb 2023 04:17:42 -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 4/4] watchdog: mt7621-wdt: avoid ralink architecture dependent code Date: Fri, 10 Feb 2023 13:17:35 +0100 Message-Id: <20230210121735.639089-5-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 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org MT7621 SoC has a system controller node. Watchdog need to access to reset status register. Ralink architecture and related driver are old and from the beggining they are using some architecture dependent operations for accessing this shared registers through 'asm/mach-ralink/ralink_regs.h' header file. However this is not ideal from a driver perspective which can just access to the system controller registers in an arch independent way using regmap syscon APIs. Update Kconfig accordingly to select new added dependencies and allow driver to be compile tested. Signed-off-by: Sergio Paracuellos --- drivers/watchdog/Kconfig | 2 ++ drivers/watchdog/mt7621_wdt.c | 19 ++++++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index b64bc49c7..0759de670 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -1865,6 +1865,8 @@ config GXP_WATCHDOG config MT7621_WDT tristate "Mediatek SoC watchdog" select WATCHDOG_CORE + select REGMAP_MMIO + select MFD_SYSCON depends on SOC_MT7620 || SOC_MT7621 help Hardware driver for the Mediatek/Ralink MT7621/8 SoC Watchdog Timer. diff --git a/drivers/watchdog/mt7621_wdt.c b/drivers/watchdog/mt7621_wdt.c index f1c702971..a7480fd2b 100644 --- a/drivers/watchdog/mt7621_wdt.c +++ b/drivers/watchdog/mt7621_wdt.c @@ -15,8 +15,8 @@ #include #include #include - -#include +#include +#include #define SYSC_RSTSTAT 0x38 #define WDT_RST_CAUSE BIT(1) @@ -34,6 +34,7 @@ struct mt7621_wdt_data { void __iomem *base; struct reset_control *rst; + struct regmap *sysc; struct watchdog_device wdt; }; @@ -104,9 +105,12 @@ static int mt7621_wdt_stop(struct watchdog_device *w) return 0; } -static int mt7621_wdt_bootcause(void) +static int mt7621_wdt_bootcause(struct mt7621_wdt_data *d) { - if (rt_sysc_r32(SYSC_RSTSTAT) & WDT_RST_CAUSE) + u32 val; + + regmap_read(d->sysc, SYSC_RSTSTAT, &val); + if (val & WDT_RST_CAUSE) return WDIOF_CARDRESET; return 0; @@ -134,6 +138,7 @@ static const struct watchdog_ops mt7621_wdt_ops = { static int mt7621_wdt_probe(struct platform_device *pdev) { + struct device_node *np = pdev->dev.of_node; struct device *dev = &pdev->dev; struct watchdog_device *mt7621_wdt; struct mt7621_wdt_data *drvdata; @@ -143,6 +148,10 @@ static int mt7621_wdt_probe(struct platform_device *pdev) if (!drvdata) return -ENOMEM; + drvdata->sysc = syscon_regmap_lookup_by_phandle(np, "ralink,sysctl"); + if (IS_ERR(drvdata->sysc)) + return PTR_ERR(drvdata->sysc); + drvdata->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(drvdata->base)) return PTR_ERR(drvdata->base); @@ -158,7 +167,7 @@ static int mt7621_wdt_probe(struct platform_device *pdev) mt7621_wdt->max_timeout = 0xfffful / 1000; mt7621_wdt->parent = dev; - mt7621_wdt->bootstatus = mt7621_wdt_bootcause(); + mt7621_wdt->bootstatus = mt7621_wdt_bootcause(drvdata); watchdog_init_timeout(mt7621_wdt, mt7621_wdt->max_timeout, dev); watchdog_set_nowayout(mt7621_wdt, nowayout);