From mboxrd@z Thu Jan 1 00:00:00 1970 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 24158C43217 for ; Mon, 17 Jan 2022 17:06:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242591AbiAQRGx (ORCPT ); Mon, 17 Jan 2022 12:06:53 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:51060 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242700AbiAQRE7 (ORCPT ); Mon, 17 Jan 2022 12:04:59 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 286CCB81145; Mon, 17 Jan 2022 17:04:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 94CE8C36AE3; Mon, 17 Jan 2022 17:04:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642439096; bh=cCH+wsunIOYgt6c9awmw/NhvgA4kvLznvou4Vng1IXM=; h=From:To:Cc:Subject:Date:From; b=V5MhqlTIDrJ5sJBSXGyBUyLHGPjRoSdxB5JR5dCMZGHWS+ZhxjTyaQfLujJQAbRIi R4dqmYi6bKFAOOTCKLLW66OnUy1khYUE1pfIFBVBNRpx30oiferxp7JJ4cj/dOyxfh ffaL4Ra+1uc4xsBaY2nVywcmszVXXzh93uv3U55IWUxpzERwDYhlAP6XJsjLYDdB69 W61a/ViAA1X8Bboi/Q/i4ONE5FTI90qKsqc+99zIXwtn5rZ6Fn80ZkfAHN4rWhkcfk Lwtw3ieX3UR9jwz0/0pwO4DUzFzgKK3dI/0ew6yHObg95Tk9vM3iw6z4ENaivkAKNr D+EPhCqaZSdww== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Changcheng Deng , Zeal Robot , Abel Vesa , Sasha Levin , mturquette@baylibre.com, sboyd@kernel.org, shawnguo@kernel.org, linux-clk@vger.kernel.org, linux-imx@nxp.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.4 01/21] clk: imx: Use div64_ul instead of do_div Date: Mon, 17 Jan 2022 12:04:33 -0500 Message-Id: <20220117170454.1472347-1-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Changcheng Deng [ Upstream commit c1b6ad9a902539f9c037b6b3c35cb134c5724022 ] do_div() does a 64-by-32 division. Here the divisor is an unsigned long which on some platforms is 64 bit wide. So use div64_ul instead of do_div to avoid a possible truncation. Reported-by: Zeal Robot Signed-off-by: Changcheng Deng Reviewed-by: Abel Vesa Link: https://lore.kernel.org/r/20211118080634.165275-1-deng.changcheng@zte.com.cn Signed-off-by: Abel Vesa Signed-off-by: Sasha Levin --- drivers/clk/imx/clk-pllv3.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/clk/imx/clk-pllv3.c b/drivers/clk/imx/clk-pllv3.c index df91a8244fb4d..c9929d52402b4 100644 --- a/drivers/clk/imx/clk-pllv3.c +++ b/drivers/clk/imx/clk-pllv3.c @@ -250,7 +250,7 @@ static long clk_pllv3_av_round_rate(struct clk_hw *hw, unsigned long rate, div = rate / parent_rate; temp64 = (u64) (rate - div * parent_rate); temp64 *= mfd; - do_div(temp64, parent_rate); + temp64 = div64_ul(temp64, parent_rate); mfn = temp64; temp64 = (u64)parent_rate; @@ -280,7 +280,7 @@ static int clk_pllv3_av_set_rate(struct clk_hw *hw, unsigned long rate, div = rate / parent_rate; temp64 = (u64) (rate - div * parent_rate); temp64 *= mfd; - do_div(temp64, parent_rate); + temp64 = div64_ul(temp64, parent_rate); mfn = temp64; val = readl_relaxed(pll->base); @@ -337,7 +337,7 @@ static struct clk_pllv3_vf610_mf clk_pllv3_vf610_rate_to_mf( /* rate = parent_rate * (mfi + mfn/mfd) */ temp64 = rate - parent_rate * mf.mfi; temp64 *= mf.mfd; - do_div(temp64, parent_rate); + temp64 = div64_ul(temp64, parent_rate); mf.mfn = temp64; } -- 2.34.1