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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 33492C433F5 for ; Mon, 14 Feb 2022 15:37:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:References :In-Reply-To:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ZfcwinXdtmPEE/9fcIXMfJ1EY5B/ER3ugRtaw+PA2vw=; b=M1kYE0nFZIUKBL ttJP1XRWtOrgXpJrgg7zzCl7sWmHqHX7G3K1Wa/EyEcYQYc406QiN+MOKXTfciEqE7dHNT5hxQz0w wNt/R6yEzUgbyg4WAhaO3b5ro2bUKviM4i/K8LwBggNbqQwFTSH1+zEQaU2zvgiBNzOGZLRECQI4O +BtptFmeTmZA0JitWfJLSqCH0Ik+gFIv3/kBX8PiOfzH8sirfJcoU7otNc0KASVMRy3bi4fKoItk0 h97kfzd/5HSIYtdQc1SiRRwkXYVlX4oiSkv7F2LuvLx7Bjoyri0W27zOcxJYw+MyWD1N9CJGnKwiS qY4q5bZH3BvkATzXk1Zg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJdOb-00Frhv-Ft; Mon, 14 Feb 2022 15:36:09 +0000 Received: from relay8-d.mail.gandi.net ([2001:4b98:dc4:8::228]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJdOW-00Frh6-Ul for linux-arm-kernel@lists.infradead.org; Mon, 14 Feb 2022 15:36:06 +0000 Received: (Authenticated sender: gregory.clement@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id E74B61BF206; Mon, 14 Feb 2022 15:36:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1644852963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=wZaVsNZfL1Y9JFue2k1wM/baHSjDOG975omNd7JZ0b8=; b=aqQuBbvuyYLqCNZtSOtTuL3CX+GcC3c1knhe2FBkGI27DstNgcmIo8dkzUj/I2g4J8TYyF EhbnU/edAwqFoVwmDRxyHAECs2UI4JIpwRIBIRaU/UeZD9p/osq9HR9WlAb03yBwTuZM2b w1tvyXusl4cS7GwmsD0ueu6zvHf1OLII2BSkzggnWkFOmV7YZECIm0zYRwfumU51KdgTS+ NnmMuX9PDCkZBoGIjmXxUU1K2IiL4oZ4VFt0wOP7pGqJOP8oOq3I6gOLHbE0Ei7nhNgR00 3LwTisFaYjlmxha4VWUbVHCjnOm0FeGnUBZzBFBUpOXmMFvASN+ABniCj/HzNg== From: Gregory CLEMENT To: Chris Packham , andrew@lunn.ch, robh+dt@kernel.org, wim@linux-watchdog.org, linux@roeck-us.net Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org, Chris Packham Subject: Re: [PATCH 2/2] watchdog: orion_wdt: support pretimeout on Armada-XP In-Reply-To: <20220211003257.2037332-3-chris.packham@alliedtelesis.co.nz> References: <20220211003257.2037332-1-chris.packham@alliedtelesis.co.nz> <20220211003257.2037332-3-chris.packham@alliedtelesis.co.nz> Date: Mon, 14 Feb 2022 16:36:01 +0100 Message-ID: <87r185jw9q.fsf@BL-laptop> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220214_073605_167574_D3F464B5 X-CRM114-Status: GOOD ( 15.78 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Chris Packham writes: > Commit e07a4c79ca75 ("watchdog: orion_wdt: use timer1 as a pretimeout") > added support for a pretimeout on Armada-38x variants. Because the > Armada-XP variants use armada370_start/armada370_stop (due to missing an > explicit RSTOUT mask bit for the watchdog). Add the required pretimeout > support to armada370_start/armada370_stop for Armada-XP. > > Signed-off-by: Chris Packham Reviewed-by: Gregory CLEMENT Thanks, Gregory > --- > drivers/watchdog/orion_wdt.c | 13 +++++++++---- > 1 file changed, 9 insertions(+), 4 deletions(-) > > diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c > index 127eefc9161d..e25e6bf4647f 100644 > --- a/drivers/watchdog/orion_wdt.c > +++ b/drivers/watchdog/orion_wdt.c > @@ -238,8 +238,10 @@ static int armada370_start(struct watchdog_device *wdt_dev) > atomic_io_modify(dev->reg + TIMER_A370_STATUS, WDT_A370_EXPIRED, 0); > > /* Enable watchdog timer */ > - atomic_io_modify(dev->reg + TIMER_CTRL, dev->data->wdt_enable_bit, > - dev->data->wdt_enable_bit); > + reg = dev->data->wdt_enable_bit; > + if (dev->wdt.info->options & WDIOF_PRETIMEOUT) > + reg |= TIMER1_ENABLE_BIT; > + atomic_io_modify(dev->reg + TIMER_CTRL, reg, reg); > > /* Enable reset on watchdog */ > reg = readl(dev->rstout); > @@ -312,7 +314,7 @@ static int armada375_stop(struct watchdog_device *wdt_dev) > static int armada370_stop(struct watchdog_device *wdt_dev) > { > struct orion_watchdog *dev = watchdog_get_drvdata(wdt_dev); > - u32 reg; > + u32 reg, mask; > > /* Disable reset on watchdog */ > reg = readl(dev->rstout); > @@ -320,7 +322,10 @@ static int armada370_stop(struct watchdog_device *wdt_dev) > writel(reg, dev->rstout); > > /* Disable watchdog timer */ > - atomic_io_modify(dev->reg + TIMER_CTRL, dev->data->wdt_enable_bit, 0); > + mask = dev->data->wdt_enable_bit; > + if (wdt_dev->info->options & WDIOF_PRETIMEOUT) > + mask |= TIMER1_ENABLE_BIT; > + atomic_io_modify(dev->reg + TIMER_CTRL, mask, 0); > > return 0; > } > -- > 2.35.1 > -- Gregory Clement, Bootlin Embedded Linux and Kernel engineering http://bootlin.com _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel