Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp3777562pxv; Mon, 19 Jul 2021 08:30:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzKdvQzrnRMxjZq9VZtiG3BDMvJDvGmjcY+7Jm1d6HjgjdTrgTeMaNkhJditqkQHjStmMXQ X-Received: by 2002:a92:d80c:: with SMTP id y12mr17769365ilm.30.1626708655922; Mon, 19 Jul 2021 08:30:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626708655; cv=none; d=google.com; s=arc-20160816; b=JyuuihP8efbJxsGKPjMZFVhWJtbtJqpqz/Tv/+R/qmFs7340+hXLeczi/+MYIzsscV F7g0CUcJbUF0FtCd/68+40NYKIfz+9hL0w50qQsu5nvHzGduaEJPCFqDfGByZ2EcaZED RvcuKJR1gJgEORFQBawoWZwIEHa4SASP9ABRJrzC01el3kTcKCOFg+PD4K0+6jXleX43 bDLka1U+dDz8Ts9ArwSC7CGXc8A93EgqF3PC39ISc6oyiGYthlD2pAt3Cr9G7FBL8gU5 RJdo8zFxopx64LTTIiU5fiHV9Ft1lKxa/JXKuKfa1r9cg7giL2kkF7V18QGXMwa1/j91 hNvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=q5J0eTogokohBaQe+9/YExz1kQCS85c7h3FJJHIHOhU=; b=fF68xm06zBjVNJ9GkuB3ed1zZTJPiSvDxiXxmIbUBDjNkcHYUbHUoh8yEqe1OPC4oe lSjqqoHLCCWKcI3ISn3reKRbyhbxBrdXZc2HkTY9z3QAx9nMWtcqDCa0HgyiYwAw3OCm qkNMnpONiMKz9I3D84nG5ckGOvoxc7DDNu94tLmER76S4dHDcQoreIoQpPmXH9YyPeGU RZF3VQEGFfB2IhhBtG6CBq3kNcSXnLXeIcNhd0baGpILP5RERx4iVjM6l08qrAmGh44N yDLaF7KQHnDDWPbD0nWpqAbbP0DU4rfaSsoPSDc/kkbG85ZYouiM7Swx4j6/NLZ52sMA kekQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=XvajK87v; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z9si21087793ilu.28.2021.07.19.08.30.43; Mon, 19 Jul 2021 08:30:55 -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=@linuxfoundation.org header.s=korg header.b=XvajK87v; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344417AbhGSOss (ORCPT + 99 others); Mon, 19 Jul 2021 10:48:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:46720 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243793AbhGSOd6 (ORCPT ); Mon, 19 Jul 2021 10:33:58 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id DE5136124C; Mon, 19 Jul 2021 15:13:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626707597; bh=XQCY9+AJ5ndMmYvPR15VS9nWHiumdO1wsM96Mx27Wzk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XvajK87vtF01PGDzXaEvPfxT0CFt44spCJ+mCl4QWujFArHfNvZ+6u2jE2JMzE6G4 5u+Lg/oZ6uPDIYg1YIvMUhpXhc/jG+kbxaK4dpXqvcX69ouQBigxhy7vaGCFs8daDo BlcFEvX3HadSgTqzYKvwXRgEpNjzGKFrUihM24Lw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Amithash Prasad , Tao Ren , Guenter Roeck , Wim Van Sebroeck , Sasha Levin Subject: [PATCH 4.9 228/245] watchdog: aspeed: fix hardware timeout calculation Date: Mon, 19 Jul 2021 16:52:50 +0200 Message-Id: <20210719144947.759785112@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144940.288257948@linuxfoundation.org> References: <20210719144940.288257948@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tao Ren [ Upstream commit e7dc481c92060f9ce872878b0b7a08c24713a7e5 ] Fix hardware timeout calculation in aspeed_wdt_set_timeout function to ensure the reload value does not exceed the hardware limit. Fixes: efa859f7d786 ("watchdog: Add Aspeed watchdog driver") Reported-by: Amithash Prasad Signed-off-by: Tao Ren Reviewed-by: Guenter Roeck Link: https://lore.kernel.org/r/20210417034249.5978-1-rentao.bupt@gmail.com Signed-off-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck Signed-off-by: Sasha Levin --- drivers/watchdog/aspeed_wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c index f5ad8023c2e6..1c47e6345b57 100644 --- a/drivers/watchdog/aspeed_wdt.c +++ b/drivers/watchdog/aspeed_wdt.c @@ -100,7 +100,7 @@ static int aspeed_wdt_set_timeout(struct watchdog_device *wdd, wdd->timeout = timeout; - actual = min(timeout, wdd->max_hw_heartbeat_ms * 1000); + actual = min(timeout, wdd->max_hw_heartbeat_ms / 1000); writel(actual * WDT_RATE_1MHZ, wdt->base + WDT_RELOAD_VALUE); writel(WDT_RESTART_MAGIC, wdt->base + WDT_RESTART); -- 2.30.2