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 66E5644AB6A; Tue, 21 Jul 2026 21:19:28 +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=1784668769; cv=none; b=ZBipfW5Fi00cX8c9Q0UK01tqeo8mtZ6CRvpnWOvLffz7+HZ6xx8gZMX7w8tJ0+yKVsG9JL1zmAzvLDRr8ekAvwywHHBpOOwjMfyKoc37SxZjemn1rBYPNyKtBsoQxzvxsq8iQVWwhnE1JDZvSmSzwzPQmsQU3ebvGJGmZGyG/CA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784668769; c=relaxed/simple; bh=vfasnWLEc4hBhpiFIZZERUksM1TZ3lCClbpA1+5A6k4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IT7ZvaiFAH02yfCoCjyy8vl/M5jXVh0kY9+/GyB8m21da74USgp0HJCMVUEnvCOgY7/2afPJ53c9lfPPw0I4Ke0qN/oTyp/A8EDiJA5zX4/KBzVj29gYJyFiezO+cj+X0IZS4Wkw6BTVyRvkeFrw8AmdY6ctHEXy/BgO0gGSRFU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=vgjPLbw+; 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="vgjPLbw+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D3CBA1F000E9; Tue, 21 Jul 2026 21:19:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784668768; bh=0hffDQeFpQm7UWpmsu05qStknGureOxHc2+ks/+yNgM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=vgjPLbw+Tx5OvzK4WPCHOzMUiXZwTac6MsI+RFwpWHbAUuYbhWYrrJs1qQWFmbU5H FfUujPFpGiTnHBt2JD420PZ6l363urYA8ti7zSX7Fn+wX1tHMRiiox/o2ShI//7nJ+ oNB+CWgeuWlYQKE656sIhJQ7U80zv+aJrOAzanTQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Michael Turquette , Stephen Boyd , linux-clk@vger.kernel.org, Cristian Marussi , Florian Fainelli , Geert Uytterhoeven , Brian Masney , Sudeep Holla , Sasha Levin Subject: [PATCH 6.1 0302/1067] clk: scmi: Fix clock rate rounding Date: Tue, 21 Jul 2026 17:15:03 +0200 Message-ID: <20260721152431.354001593@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152424.521567757@linuxfoundation.org> References: <20260721152424.521567757@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-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Cristian Marussi [ Upstream commit d0c81a38d06d446d341532700b3a4a43d3b00eb1 ] While the do_div() helper used for rounding expects its divisor argument to be a 32bits quantity, the currently provided divisor parameter is a 64bit value that, as a consequence, is silently truncated and a possible source of bugs. Fix by using the proper div64_ul helper. Cc: Michael Turquette Cc: Stephen Boyd Cc: linux-clk@vger.kernel.org Fixes: 7a8655e19bdb ("clk: scmi: Fix the rounding of clock rate") Signed-off-by: Cristian Marussi Tested-by: Florian Fainelli Tested-by: Geert Uytterhoeven Link: https://patch.msgid.link/20260508153300.2224715-2-cristian.marussi@arm.com Reviewed-by: Brian Masney Signed-off-by: Sudeep Holla Signed-off-by: Sasha Levin --- drivers/clk/clk-scmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clk/clk-scmi.c b/drivers/clk/clk-scmi.c index fdec715c9ba9b3..096b0691661961 100644 --- a/drivers/clk/clk-scmi.c +++ b/drivers/clk/clk-scmi.c @@ -9,9 +9,9 @@ #include #include #include +#include #include #include -#include static const struct scmi_clk_proto_ops *scmi_proto_clk_ops; @@ -61,7 +61,7 @@ static long scmi_clk_round_rate(struct clk_hw *hw, unsigned long rate, ftmp = rate - fmin; ftmp += clk->info->range.step_size - 1; /* to round up */ - do_div(ftmp, clk->info->range.step_size); + ftmp = div64_ul(ftmp, clk->info->range.step_size); return ftmp * clk->info->range.step_size + fmin; } -- 2.53.0