Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp3840478pxv; Mon, 19 Jul 2021 10:00:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwOL3CFFoOcD6TUWjNWQw0PE/BPZOMwhOSwmRlkDqy5StKk99Va2d0kHSBO57QbRSZGOkc/ X-Received: by 2002:a6b:d00b:: with SMTP id x11mr19655124ioa.167.1626713954287; Mon, 19 Jul 2021 09:59:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626713954; cv=none; d=google.com; s=arc-20160816; b=YJXSuBECePySNb0ZnRVC5bvxNhQksxcmi5m3C+5AXK7CPdqkU1z58SAik8dRtqEhD8 uoPWZzZGs3owIcbXn6LlyyAVkKFcr3ChRJOuoGFxN3cTtkjbsY/uXcy/i7nuo5tT/iDq yUWGm3YWp6rmi/6c6H3gsWIEiGP8cql5Nj99pX/z3B7uiUhy1Wb9Wc5O6G7SqyriL/HT n1UXiTmRt2eYXnNlZPGbqIOrfKCGrcM6OVRxcgtiWDxcQYVuw0DUfvbaUz8TRTMfcST7 KNMfRmS2VlXAajJrGTMT9KjAWMOh+HLjLz1NJaGSJXP70dFjoZbPBNYuSwY/077LxVFp eAwA== 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=09SgTHr14sc3dCi4gG65lA7Z6RnAHJdrFD8W+pWH9bGiGz46N/c4QJFDpks1Az9OdY ZzO13H6ly8WiwSO/dmCZbr4zhVc1Y83cI+SPauj0KXK7H3dWKgjH5zhaa0IvT9nmmxFZ 1/yDNN86U2hzMFcxA73PVsbJnAKBjVvH48rUV78RAv1t4VCOQ+S2Eh54W4yf9j5PLSPN cDcgqxdkV0pvNcVE4tPAkJen7pK9QsW+7KIvROBU91rn05l5MKN0I8n8D6Wmqq1fyPB9 USd1SVJyLiYtQaJD8SRpvkQ6uIBlxmK249ubuk/Do80IFlNPU2tW93vKKsNAkHclMLfu CpRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=UKY9qVnB; 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 x19si19857033ioa.74.2021.07.19.09.59.02; Mon, 19 Jul 2021 09:59:14 -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=UKY9qVnB; 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 S1352458AbhGSQOC (ORCPT + 99 others); Mon, 19 Jul 2021 12:14:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:41086 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345909AbhGSPJp (ORCPT ); Mon, 19 Jul 2021 11:09:45 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3F06461249; Mon, 19 Jul 2021 15:49:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626709798; bh=YeRPjHzK5EX/g2s1sPPjUmg37Dt96+T3QGH7KXDyeJk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UKY9qVnBhaGn4+YEJVxTfcxvAzd/DJbJSLIScyhKFpNh+GoWDHRQIoP4xmOpq8IIG SqLE7TKdYvWeeTr4ex+hEEo4sysRmuSHYdJAz8OmM2iyybebA70YuzOEp4QpePfQ8t /5XxgL4I/hyc+wIIYLm2eiYm9nnLHVu+a/p2+Wgg= 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.4 103/149] watchdog: aspeed: fix hardware timeout calculation Date: Mon, 19 Jul 2021 16:53:31 +0200 Message-Id: <20210719144925.787019534@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144901.370365147@linuxfoundation.org> References: <20210719144901.370365147@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