Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1761526ybz; Sat, 18 Apr 2020 07:58:28 -0700 (PDT) X-Google-Smtp-Source: APiQypKkLBfe/b1aiiCms9GrnerWuM5TxTZIz2pH7LmoEe9pUiE3m+coMXMbOJ7mo9LMjVGNNBGz X-Received: by 2002:a17:907:4365:: with SMTP id nd5mr6801570ejb.231.1587221908728; Sat, 18 Apr 2020 07:58:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587221908; cv=none; d=google.com; s=arc-20160816; b=XAIGpmqL9xmn7moHoyPQooATLhX+3hGeWsqwNd+c62DBqSkj1B1rS5+si3bCL1zdyR RDEb/XlFpKD6kru0lFLC9Of+rSAun/mpLsJri4wU6TTfzT9XNH1uiJgc+OjLM1IhAbTw KMgS+HP6tnz5AsoPywVGsxZ8RvyEXsEEBGtbO/HsXl6A4qO4ZBCVjIHRw+RGQ4D8eEOg iaHEtsjnC54SqrG2o3GMfb56JyBcbPVToi0+vjfVFWXskwQNO80OXIYuHHDsGJ2RHqdn 5trECAQ/mOJXxA3P0ahyw1Oe1WZ97Eg3al2HM3ZyrsU7+c/BI8RZYHcMCT0ltPkpcHn7 +0zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=KY2pdY64AqMUz07qZVOtHuV6sBcW4WcSbdRoNeb6Hk4=; b=suKulhc123t6+Ef1WRWvB+D54Il9x16vE5WR/cIzYRnC1XdFR2+CCsJab5xXlzlF0D LwrJ1xMxS7BfCqHXMRH3vc7hvTp/ilb5EVZ9G1J6MYzrd8G3Hp0mcYz5LUzLmMqdJp3i 5Z8Hs/ouZg3Aru83yiLkKlB6XEVGpXh+4nh0YfWaBpvDhmFCSdUa/p+6+afZxa0eBaI+ lsakGq+f1utj/F05ajpzEZsKMSUI7BFqeJkugfhWr2+6HFZZxW/TH4scgpfdxTa8yKEv 9YGMTExEgkSozwzXoAN0L7r+W9evg0/X+4PC4hlz0gOUZr8nOV7qNUZmvsCeRu7H/zOy ImqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zqWWJIrJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v5si13518812ejx.10.2020.04.18.07.58.06; Sat, 18 Apr 2020 07:58:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zqWWJIrJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726779AbgDROkx (ORCPT + 99 others); Sat, 18 Apr 2020 10:40:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:49334 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726748AbgDROkw (ORCPT ); Sat, 18 Apr 2020 10:40:52 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2376D21974; Sat, 18 Apr 2020 14:40:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587220851; bh=mNN3goFAdj6cbIOVlz0S+XGlyz6dKS6SjydtWTzaTLw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zqWWJIrJtNGA+JF+eLHsfwxolcnWcKYhB/ecEDoHMEjA4c5iPBroW7MiwWIcSx6ab vQhQmGMC6u5U4kRd0+UoMuw7DLnefnrNmVw3gtXicccgXToor6FlmG94WVw5SkXvdP LrtTYI9k6cqfQrlrX/yZGl7UG96/KdV1Q2+QDJpY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tero Kristo , Guenter Roeck , Wim Van Sebroeck , Sasha Levin , linux-watchdog@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 03/78] watchdog: reset last_hw_keepalive time at start Date: Sat, 18 Apr 2020 10:39:32 -0400 Message-Id: <20200418144047.9013-3-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200418144047.9013-1-sashal@kernel.org> References: <20200418144047.9013-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tero Kristo [ Upstream commit 982bb70517aef2225bad1d802887b733db492cc0 ] Currently the watchdog core does not initialize the last_hw_keepalive time during watchdog startup. This will cause the watchdog to be pinged immediately if enough time has passed from the system boot-up time, and some types of watchdogs like K3 RTI does not like this. To avoid the issue, setup the last_hw_keepalive time during watchdog startup. Signed-off-by: Tero Kristo Reviewed-by: Guenter Roeck Link: https://lore.kernel.org/r/20200302200426.6492-3-t-kristo@ti.com Signed-off-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck Signed-off-by: Sasha Levin --- drivers/watchdog/watchdog_dev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c index ce04edc69e5f0..c4147e93aa7d4 100644 --- a/drivers/watchdog/watchdog_dev.c +++ b/drivers/watchdog/watchdog_dev.c @@ -282,6 +282,7 @@ static int watchdog_start(struct watchdog_device *wdd) if (err == 0) { set_bit(WDOG_ACTIVE, &wdd->status); wd_data->last_keepalive = started_at; + wd_data->last_hw_keepalive = started_at; watchdog_update_worker(wdd); } -- 2.20.1