Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp3890486pxv; Mon, 19 Jul 2021 11:13:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzTWskDOqVmUg9h3U4rf0BIDbAhKORxVXyWEP2ctGfwgzXpRw1h/giHPhQJ3KJB9KVHIxhZ X-Received: by 2002:a92:c849:: with SMTP id b9mr17977972ilq.63.1626718418280; Mon, 19 Jul 2021 11:13:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626718418; cv=none; d=google.com; s=arc-20160816; b=F2aB0Uq58mGXWhYaWisyFQfC02li5Gv7GqfgD2QbOVfKPdTBp2qWBQI0qI18r2E2Xg Kas3KF5KS/QVyHNS45hjbDQvJftw6zYoGVtXAQC77xMp/aJmxYgFUSPUk4KSacC9AEW7 opOQNV/jEZxEAZo6pDz16ifEEsgJSXueI6skJeQO7LAWMUv4b4kU9VvJY1wxBBHMqOQQ NNRtqi6Q8eYp+6IkvFVCcxhsq45KZz4ec1octr7Rk5cZoU0d4EHJ3uYbitWG+4QJBD+/ mW6oMvjygaeye2ChRQvFaMLvdDAtLcJmJinOH/0WbsycOf7+cbjP28/y/rD3Qe110ljK vaoA== 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=xzouSbL8tAgsBTE/e+ZbqZ+wFeebFgxqt+pS28/Z/gw=; b=BjFnDxlVFwG3yW/hZQ+fi2rmaeNgelzXa7BWqyGS+WWT/bY1sLoAkuF8lZKzb88LxX N+A7QBcP15U54M8a+k+abLViPesifKm6/M7RfJrGuUgouvUET+21JkIUo78vwBt/8NqK soHz2L+DLXEZxmMhS2CEglcEcfRcxZ+uUlHf2kNC1ia7uxn3dBtAJrtPF2sCVz/WBFwS n0oGgV8n7hYt8IM4y6QdYai9uCg0g2HMhXvC24lAk7YJ9Ew06/cRUuqO6gSFu5Uj6t+C s2WbQEqIshw/A1t/cGurDuB4N7fGD23tJy77NP2+9qCGsk3Y79rNLbhcOSrdWTCylLW0 NV3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=YEEeVBbi; 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 s4si22429278ilv.54.2021.07.19.11.13.26; Mon, 19 Jul 2021 11:13:38 -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=YEEeVBbi; 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 S1351729AbhGSRaF (ORCPT + 99 others); Mon, 19 Jul 2021 13:30:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:47918 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346404AbhGSPrO (ORCPT ); Mon, 19 Jul 2021 11:47:14 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1CC0D613D4; Mon, 19 Jul 2021 16:27:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626712043; bh=YeRPjHzK5EX/g2s1sPPjUmg37Dt96+T3QGH7KXDyeJk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YEEeVBbim/w49lSFiU5DqRVBYjFuKOwGidsyQ9OTclHL3p0aYcdGyn2Oi71bI5+52 7VkQTFEXxJx3q6QUpWwp2RpvJCazw3oRY6XUkBg+VwrpQCUsCcADVQ9ukEoxpOnga5 jKqHUcM6ZyekUVCZ0BDvXXA0HampzDumVX1U37LA= 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 5.12 195/292] watchdog: aspeed: fix hardware timeout calculation Date: Mon, 19 Jul 2021 16:54:17 +0200 Message-Id: <20210719144948.904727508@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144942.514164272@linuxfoundation.org> References: <20210719144942.514164272@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 7e00960651fa..507fd815d767 100644 --- a/drivers/watchdog/aspeed_wdt.c +++ b/drivers/watchdog/aspeed_wdt.c @@ -147,7 +147,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