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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham 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 9D742C432C0 for ; Mon, 2 Dec 2019 13:02:44 +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 710F7206E1 for ; Mon, 2 Dec 2019 13:02:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="eDI7dV15" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 710F7206E1 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=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-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=OtnENns92S25QUAA8L+098eiI/BtOaHYyotnUEjyfWY=; b=eDI7dV15mufLz1 mmYJ8B7OQzkI4zyzeUDWcYNQCkNuQ64ZOtzMCqQnRk3mOqbQtJFyBilgOBTMPurQrjHI7/croE+M5 7YaEji/o5lrwtIK6GDIgZQxyBS6dnxKUT8ooi9Oaj2y+oixCcEp+wMRsiZ/wnBZN0hvC+iFWhtYmz JebfJpYwrvRTMalMyltAQmtP0/qVZkXkitULE646TGEl8nntZe2OLu1YjyboEDDtJSW6E1BEDBaUl xRQEBdiF4wCnibaDL5/O22NtgjIEkoWSya3f0ecLo/AVdqaMRaCZJf5CaQi3zm2Sxk5VMxi12EMGf sE6Ab7RZct1aZKCtPqCA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iblLf-0004QZ-Ig; Mon, 02 Dec 2019 13:02:43 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iblLa-0004I7-Ce for linux-mediatek@lists.infradead.org; Mon, 02 Dec 2019 13:02:40 +0000 Received: from lupine.hi.pengutronix.de ([2001:67c:670:100:3ad5:47ff:feaf:1a17] helo=lupine) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1iblLB-0005vk-3o; Mon, 02 Dec 2019 14:02:13 +0100 Message-ID: <88994e7445df8b2d98f3548e2043eb29bf5fa95f.camel@pengutronix.de> Subject: Re: [PATCH v5 2/2] watchdog: mtk_wdt: mt8183: Add reset controller From: Philipp Zabel To: Yong Liang Date: Mon, 02 Dec 2019 14:02:11 +0100 In-Reply-To: <1575016588.7013.8.camel@mhfsdcap03> References: <20191125061627.GA7313@roeck-us.net> <1575016588.7013.8.camel@mhfsdcap03> User-Agent: Evolution 3.30.5-1.1 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:67c:670:100:3ad5:47ff:feaf:1a17 X-SA-Exim-Mail-From: p.zabel@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-mediatek@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191202_050238_436451_727FB56E X-CRM114-Status: GOOD ( 24.80 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "mark.rutland@arm.com" , "alsa-devel@alsa-project.org" , "broonie@kernel.org" , "lgirdwood@gmail.com" , Jiaxin Yu =?UTF-8?Q?=28=E4=BF=9E=E5=AE=B6=E9=91=AB=29?= , "perex@perex.cz" , "tzungbi@google.com" , "robh+dt@kernel.org" , "linux-mediatek@lists.infradead.org" , "linux-arm-kernel@lists.infradead.org" , Eason Yen =?UTF-8?Q?=28=E9=A1=8F=E5=BB=B7=E4=BB=BB=29?= , Yingjoe Chen =?UTF-8?Q?=28=E9=99=B3=E8=8B=B1=E6=B4=B2=29?= , "wim@linux-watchdog.org" , Guenter Roeck Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org On Fri, 2019-11-29 at 16:36 +0800, Yong Liang wrote: > On Mon, 2019-11-25 at 17:51 +0800, Philipp Zabel wrote: > > On Sun, 2019-11-24 at 22:16 -0800, Guenter Roeck wrote: > > > On Mon, Nov 25, 2019 at 11:03:50AM +0800, Jiaxin Yu wrote: > > > > From: "yong.liang" > > > > > > > > Add reset controller API in watchdog driver. > > > > Besides watchdog, MTK toprgu module also provide sub-system (eg, audio, > > > > camera, codec and connectivity) software reset functionality. > > > > > > > > Signed-off-by: yong.liang > > > > Signed-off-by: jiaxin.yu > > > > Reviewed-by: Yingjoe Chen > > > > --- > > > > drivers/watchdog/Kconfig | 1 + > > > > drivers/watchdog/mtk_wdt.c | 111 ++++++++++++++++++++++++++++++++++++- > > > > 2 files changed, 111 insertions(+), 1 deletion(-) > > > > > > > > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig > > > > index 2e07caab9db2..629249fe5305 100644 > > > > --- a/drivers/watchdog/Kconfig > > > > +++ b/drivers/watchdog/Kconfig > > > > @@ -717,6 +717,7 @@ config MEDIATEK_WATCHDOG > > > > tristate "Mediatek SoCs watchdog support" > > > > depends on ARCH_MEDIATEK || COMPILE_TEST > > > > select WATCHDOG_CORE > > > > + select RESET_CONTROLLER > > > > help > > > > Say Y here to include support for the watchdog timer > > > > in Mediatek SoCs. > > > > diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c > > > > index 9c3d0033260d..d29484c7940a 100644 > > > > --- a/drivers/watchdog/mtk_wdt.c > > > > +++ b/drivers/watchdog/mtk_wdt.c > > > > @@ -9,6 +9,9 @@ > > > > * Based on sunxi_wdt.c > > > > */ > > > > > > > > +#include > > > > +#include > > > > +#include > > > > #include > > > > #include > > > > #include > > > > @@ -16,10 +19,12 @@ > > > > #include > > > > #include > > > > #include > > > > +#include > > > > #include > > > > +#include > > > > +#include > > > > #include > > > > #include > > > > -#include > > > > > > > > #define WDT_MAX_TIMEOUT 31 > > > > #define WDT_MIN_TIMEOUT 1 > > > > @@ -44,6 +49,9 @@ > > > > #define WDT_SWRST 0x14 > > > > #define WDT_SWRST_KEY 0x1209 > > > > > > > > +#define WDT_SWSYSRST 0x18U > > > > +#define WDT_SWSYS_RST_KEY 0x88000000 > > > > + > > > > #define DRV_NAME "mtk-wdt" > > > > #define DRV_VERSION "1.0" > > > > > > > > @@ -53,8 +61,99 @@ static unsigned int timeout; > > > > struct mtk_wdt_dev { > > > > struct watchdog_device wdt_dev; > > > > void __iomem *wdt_base; > > > > + spinlock_t lock; /* protects WDT_SWSYSRST reg */ > > > > + struct reset_controller_dev rcdev; > > > > +}; > > > > + > > > > +struct mtk_wdt_data { > > > > + int sw_rst_num; > > > > }; > > > > > > > > +static const struct mtk_wdt_data mt2712_data = { > > > > + .sw_rst_num = MT2712_TOPRGU_SW_RST_NUM, > > > > +}; > > > > + > > > > +static const struct mtk_wdt_data mt8183_data = { > > > > + .sw_rst_num = MT8183_TOPRGU_SW_RST_NUM, > > > > +}; > > > > > > The number of resets can be set in .data directly; there is no need > > > for the structures. > > We want to put all properities in mtxxxx-resets.h and it easy to > manager. If there are new properity in the feture, we can put it in > mtk_wdt_data mtxxxx_data Do you expect there will be more properties in the future? > > > > +static int toprgu_reset_deassert(struct reset_controller_dev *rcdev, > > > > + unsigned long id) > > > > +{ > > > > + unsigned int tmp; > > > > + unsigned long flags; > > > > + struct mtk_wdt_dev *data = > > > > + container_of(rcdev, struct mtk_wdt_dev, rcdev); > > > > + > > > > + spin_lock_irqsave(&data->lock, flags); > > > > + > > > > + tmp = __raw_readl(data->wdt_base + WDT_SWSYSRST); > > > > + tmp &= ~BIT(id); > > > > + tmp |= WDT_SWSYS_RST_KEY; > > > > + writel(tmp, data->wdt_base + WDT_SWSYSRST); > > > > + > > > > + spin_unlock_irqrestore(&data->lock, flags); > > > > + > > > > + return 0; > > > > +} > > > > > > There is a lot of duplication in those functions. Only one line > > > is different. I think this is a good example where a helper function > > > with an additional argument indicating set or reset would be helpful. > > > > .assert and .dessert are two numbers of struct reset_control_ops. > I think it's better to define both of them. The suggestion was to have two very short _assert and _deassert functions that only contain a single call to a common helper function. See the reset-a10sr.c driver for an example. regards Philipp _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek