From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D0BA75304D1; Wed, 23 Sep 2026 14:23:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790173391; cv=none; b=NW1FfhNYYopTr05LK0w+R3fMQbPsyN6f5dxFJhh8xaHR/5fOTweeSXWpCu4LR78LPnE2z8TWr3CreWbd8mWCV1eY1paMqVSLl9mmhaT3jPWgUhsiBi1VZRLiSOsG6+/TrklVIZrLnE0cy/b836cLYlU+WHhLVDnczxkBripU6w0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790173391; c=relaxed/simple; bh=Q0r47aaheG5FShJwGaBDnq/gEsiT1g47oW/3qGvWS4c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=mf6+etlFz2Z+4db3yqRuEAuMQvhzQjEYJmcPRXJTWItC0HDp6LcZI38W+KKQhz6zEMgvs72ttqHhmESxkTb5OuxyTM6CFIDxSb1Jc9Q5saoikEMG+aLf/lk4aONMuMOEJrJ/hwoZuzo7uaYLP3uG8iudRTCgXV/mGmTwPSji16A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=YhUDqyvT; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="YhUDqyvT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2E5501F00893; Wed, 23 Sep 2026 14:23:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790173390; bh=UWonb80z2L/BCtBxQKgSZdS9mkh4msKngPClMG8Dq9s=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=YhUDqyvTjda6Vh+HDwlXj2wS1iEfs8DA7Jo145+zEVUaSCMRePJWGnxb3ACVu+W7n OEqFnZKOX3nKRq1Qa3TnLUQ8WZ01uUsOK6wj7/vnSmCMdwBfe0zTV6TXsY8mt8kuQS vZEgx8hvvr9BYoludmwMQ8xTYqAXy/jCZk4EJu6Q= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Li Jun , Guenter Roeck , Sasha Levin Subject: [PATCH 7.2 232/438] watchdog: da9062: fix suspend/resume handling of HW_RUNNING watchdog Date: Wed, 23 Sep 2026 16:04:13 +0200 Message-ID: <20260923140650.776544711@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260923140644.756254324@linuxfoundation.org> References: <20260923140644.756254324@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 7.2-stable review patch. If anyone has any objections, please let me know. ------------------ From: Li Jun [ Upstream commit 5071122bf5a628494db16d98d253f622a5aab074 ] da9062_wdt_suspend() and da9062_wdt_resume() only check watchdog_active(), when the watchdog is left running by the driver sets WDOG_HW_RUNNING in da9062_wdt_probe() but userspace never opens the device, so WDOG_ACTIVE remains cleared, the wdt_disable() will not be executed in da9062_wdt_suspend. In this case, the suspend callback is a no-op and the watchdog keeps counting during system suspend, leading to an unexpected system reset. Check WDOG_HW_RUNNING and wdt->wdd，can fix this issue. Fixes: f6c98b08381c7 ("watchdog: da9062: add power management ops") Cs: stable@vger.kernel.org Signed-off-by: Li Jun Link: https://patch.msgid.link/20260914062353.582205-1-lijun01@kylinos.cn Signed-off-by: Guenter Roeck Signed-off-by: Sasha Levin --- drivers/watchdog/da9062_wdt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/watchdog/da9062_wdt.c b/drivers/watchdog/da9062_wdt.c index 426962547df16..4d558652e9e71 100644 --- a/drivers/watchdog/da9062_wdt.c +++ b/drivers/watchdog/da9062_wdt.c @@ -256,7 +256,7 @@ static int __maybe_unused da9062_wdt_suspend(struct device *dev) if (!wdt->use_sw_pm) return 0; - if (watchdog_active(wdd)) + if (watchdog_active(wdd) || watchdog_hw_running(wdd)) return da9062_wdt_stop(wdd); return 0; @@ -270,7 +270,7 @@ static int __maybe_unused da9062_wdt_resume(struct device *dev) if (!wdt->use_sw_pm) return 0; - if (watchdog_active(wdd)) + if (watchdog_active(wdd) || watchdog_hw_running(wdd)) return da9062_wdt_start(wdd); return 0; -- 2.53.0