From patchwork Wed Feb 8 08:37:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Cherian X-Patchwork-Id: 652671 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7557CC05027 for ; Wed, 8 Feb 2023 08:38:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230291AbjBHIiP (ORCPT ); Wed, 8 Feb 2023 03:38:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229712AbjBHIiO (ORCPT ); Wed, 8 Feb 2023 03:38:14 -0500 Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1FBE51ADE0; Wed, 8 Feb 2023 00:38:09 -0800 (PST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3188522C028012; Wed, 8 Feb 2023 00:37:50 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=FWDZAph1aUJdfRRes0C3lVLtgy216Pn86srzZbWvq7M=; b=DG44PIZVsxlGNnb58cDlAtAwelakQV+klawhh4aFS7ZnLPxtFEnli65RIGd9rcUyBpqR Lk+QAegSK1rjnmKviJ2CXL4qxyJUvYucGzEWDvl/oQzaixgoC0BZu5SzH6sxYTXqZPV2 9kso5OajvvunyQJLmEd0t6LXjE6Ym7CFpojT5b+AbnAJg1aUGi0i8kNS4NYf9Zv8UGT/ Heu1Qtdg8FelhRbnmuc0ziX9KVWgsWvwJfcY2TAMSms2rkxpkpuu9ntdhs0UBztX5/j/ A+CQbjLG/Vkks5yEjD07LY+NBcFR3V0AYmf+8ZUWBxGKe/pGUKQJagXb8krZdH0kwadL 2A== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3nkdyrvbyt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 08 Feb 2023 00:37:49 -0800 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Wed, 8 Feb 2023 00:37:48 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.42 via Frontend Transport; Wed, 8 Feb 2023 00:37:48 -0800 Received: from tx2-sever.caveonetworks.com (unknown [10.110.141.15]) by maili.marvell.com (Postfix) with ESMTP id E59BA5B6925; Wed, 8 Feb 2023 00:37:47 -0800 (PST) From: George Cherian To: , , CC: , , "George Cherian" Subject: [PATCH v2] watchdog: sbsa_wdog: Make sure the timeout programming is within the limits Date: Wed, 8 Feb 2023 08:37:36 +0000 Message-ID: <20230208083736.1237256-1-george.cherian@marvell.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: ULaR2B_LlbXikqaY_B4IH4RuQXBb2IgU X-Proofpoint-GUID: ULaR2B_LlbXikqaY_B4IH4RuQXBb2IgU X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-02-08_03,2023-02-06_03,2022-06-22_01 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org Make sure to honour the max_hw_heartbeat_ms while programming the timeout value to WOR. Clamp the timeout passed to sbsa_gwdt_set_timeout() to make sure the programmed value is within the permissible range. Fixes: abd3ac7902fb ("watchdog: sbsa: Support architecture version 1") Signed-off-by: George Cherian --- drivers/watchdog/sbsa_gwdt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c index 9791c74aebd4..ee1039a652f1 100644 --- a/drivers/watchdog/sbsa_gwdt.c +++ b/drivers/watchdog/sbsa_gwdt.c @@ -149,6 +149,7 @@ static int sbsa_gwdt_set_timeout(struct watchdog_device *wdd, { struct sbsa_gwdt *gwdt = watchdog_get_drvdata(wdd); + timeout = clamp_t(unsigned int, timeout, 1, wdd->max_hw_heartbeat_ms / 1000); wdd->timeout = timeout; if (action)