Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Liu Ying <victor.liu@nxp.com>
To:     linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
        linux-kernel@vger.kernel.org
Cc:     Abel Vesa <abel.vesa@nxp.com>,
        Michael Turquette <mturquette@baylibre.com>,
        Stephen Boyd <sboyd@kernel.org>,
        Shawn Guo <shawnguo@kernel.org>,
        Sascha Hauer <s.hauer@pengutronix.de>,
        Pengutronix Kernel Team <kernel@pengutronix.de>,
        Fabio Estevam <festevam@gmail.com>,
        NXP Linux Team <linux-imx@nxp.com>,
        Peng Fan <peng.fan@nxp.com>
Subject: [PATCH] clk: imx: clk-fracn-gppll: Return rate in rate table properly in ->recalc_rate()
Date:   Sun, 29 May 2022 15:11:56 +0800
Message-Id: <20220529071156.2511568-1-victor.liu@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?f7wS9IHuBW/qZ4mousPz/8mEyQtmA0tjIguRO70FdQSrZRp9HgVAZ/HPt98t?=
 =?us-ascii?Q?c8qcJGvVTj0GbkK9Q7MhdWrxb7+HmHZzS5RyIVLEc3hJxGpc0uIHayAG794l?=
 =?us-ascii?Q?wOiz07uo/ZQO8CxnEywNil/ajpOCzxA7Fl1usishnVoz7XiDfr2alA+sGm7r?=
 =?us-ascii?Q?PkgNxT7TaFqAH3pDHab4BnEdZTTfM0mr2WI1VVZgaRj34sIG65T/CVlRgRaV?=
 =?us-ascii?Q?xTMqqO/fI/k5T293Cw6ijZ9qc4SE9bGLBE3EBgKH8dmyDJubylJfJwvQJBtj?=
 =?us-ascii?Q?d+n85G3peTxEsz0DGIy9i0ktItvJ2ZlfswZ1PbDKG37F9v9r/YZRoiNQeIfI?=
 =?us-ascii?Q?0Hih1HemMiaUCMXzN1SEZ0Atjmv/my3M/terwrZsjiwCIputFYlQRAcf5iZu?=
 =?us-ascii?Q?+uXJzBbqsBvz3aWL2lADoro5+ATo+bhpCMuAbkhEiFHVJpiVh4Yrx4JZ2FjF?=
 =?us-ascii?Q?V3Bp5U3aQmPwnij7KLE1L5F3v8L7emC2UC+tfxtMjm5QGPAvW50A7RWmOGCr?=
 =?us-ascii?Q?V4UuaAiZM3dlnyXiikranbl6N7hiiFBqwj+DbYYvTwmBIofr167ScOXHiEr3?=
 =?us-ascii?Q?CkR5ys11xx9QuiNBtxdqYNgvYVihetInpJXIWTUfuE/0lECzR/Xc7FPnIYNW?=
 =?us-ascii?Q?DhovxGJFzw/bAsBvRfqL/hYIUdxbG3eQyQ2uBIHb/dM5aLSxO7JHDs8OpSaJ?=
 =?us-ascii?Q?j38oDkuT1OZxmvouwV043BlugEkadLS7TO73blCm85dVPbBH3WRL06z8gN4i?=
 =?us-ascii?Q?zxfDHmIGWcZv9FQcE8C43T1155N8LUjAbIoxk8NSWrHKdkfg/+Rp/HdPDfan?=
 =?us-ascii?Q?y0EZIngdRLREwEj3biMvfaOe5RBSTYg4MhZYZv3ZAGJmryDBqr1P+y4PRjzR?=
 =?us-ascii?Q?0eUYUc+2qO7oxrAYI4LKj4xJcHrnAEHsDuEc7lwf3+BkW2bqE7//YUbIjKZV?=
 =?us-ascii?Q?xfSnaBMd+elPWNPiWZJVOnUPVaMv5q4y08fEafFscDlD2RXXtimPXbyTz3/E?=
 =?us-ascii?Q?chwf1f+UV90BbZQI7d2bIu5XpPbG0d9Z0oPcMbuSWGqQwUf0TNh8QqzqV/jC?=
 =?us-ascii?Q?8YXS2xZP7LZXt4lutLRfZtpiEYKmzgEtfFy5RYy80lfnfN8q7B2DZzwHHMyz?=
 =?us-ascii?Q?EFORrOzs/eBn7vthmLBcE/KqQbwV7AtkNyhGrKNULEueV9eOk3vEV9aSzNEe?=
 =?us-ascii?Q?42gt+xuviP9mLzAOtToXQlm9Om6lBcK5LZ2xHvtoJ9azuCbc6WmTFZEiRkw9?=
 =?us-ascii?Q?mubSPkfD4Z+rIxpHkyHfk9TM1u8FfRolzEtN+hYcer05Krj82c1kFXNfiAes?=
 =?us-ascii?Q?Pq7gugaGyYax7ciWfXS4Lh2zCejXRZr6xOvmdc09h3BfLaq3IEsy716N9oQY?=
 =?us-ascii?Q?IugFshAPYnPRAjM9iTnfYNgAgMC+MlrkWzQeEjtZSg1mMFrBimaLw9SUEArh?=
 =?us-ascii?Q?I8dEuBOWcFgOvOeF3ks+oJA0aCqIJegBriCopWYpbWA5rE5shSAh97YUTCZB?=
 =?us-ascii?Q?RcHoyzvyq3RLe7AC/zsjylU6iCZAG4PT23bnDmqP1o0oj/N05ZtG+vIrfGeX?=
 =?us-ascii?Q?009q1wAqTsgQxGsmhliCFRgnG8Chdc14NJWIfDUUkuRLH1uK8RkiEl8wcMuq?=
 =?us-ascii?Q?QCyXVMjqkZw8Es7gU1owhB7D/eQ43xJ9wZywb2lfppqzxlmyZvxTWbp5Hl1l?=
 =?us-ascii?Q?KHrqdgcuf43t9RgFnXAjXZkxVF5TdcDQjzNeU00rf8d/bcTW8JZ8BCRX1550?=
 =?us-ascii?Q?48hxhJg7pg=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 3c57ebe8-7d26-4c31-621d-08da41424619
X-MS-Exchange-CrossTenant-AuthSource: AM7PR04MB7046.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2022 07:10:12.8561
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 3ZZJp1r/UcmOh9okxtlRa60VCJTMBqSVSircsAH488t2vS9ePSAIH32zKQ/HpGe7thP1RoSVWFzzLoVAb2WItw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8007
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The PLL parameters in rate table should be directly compared with
those read from PLL registers instead of the cooked ones.

Fixes: 1b26cb8a77a4 ("clk: imx: support fracn gppll")
Cc: Abel Vesa <abel.vesa@nxp.com>
Cc: Michael Turquette <mturquette@baylibre.com>
Cc: Stephen Boyd <sboyd@kernel.org>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Pengutronix Kernel Team <kernel@pengutronix.de>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: NXP Linux Team <linux-imx@nxp.com>
Cc: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Liu Ying <victor.liu@nxp.com>
---
 drivers/clk/imx/clk-fracn-gppll.c | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/drivers/clk/imx/clk-fracn-gppll.c b/drivers/clk/imx/clk-fracn-gppll.c
index 71c102d950ab..762b07dd5a6d 100644
--- a/drivers/clk/imx/clk-fracn-gppll.c
+++ b/drivers/clk/imx/clk-fracn-gppll.c
@@ -131,18 +131,7 @@ static unsigned long clk_fracn_gppll_recalc_rate(struct clk_hw *hw, unsigned lon
 	mfi = FIELD_GET(PLL_MFI_MASK, pll_div);
 
 	rdiv = FIELD_GET(PLL_RDIV_MASK, pll_div);
-	rdiv = rdiv + 1;
 	odiv = FIELD_GET(PLL_ODIV_MASK, pll_div);
-	switch (odiv) {
-	case 0:
-		odiv = 2;
-		break;
-	case 1:
-		odiv = 3;
-		break;
-	default:
-		break;
-	}
 
 	/*
 	 * Sometimes, the recalculated rate has deviation due to
@@ -160,6 +149,19 @@ static unsigned long clk_fracn_gppll_recalc_rate(struct clk_hw *hw, unsigned lon
 	if (rate)
 		return (unsigned long)rate;
 
+	rdiv = rdiv + 1;
+
+	switch (odiv) {
+	case 0:
+		odiv = 2;
+		break;
+	case 1:
+		odiv = 3;
+		break;
+	default:
+		break;
+	}
+
 	/* Fvco = Fref * (MFI + MFN / MFD) */
 	fvco = fvco * mfi * mfd + fvco * mfn;
 	do_div(fvco, mfd * rdiv * odiv);
-- 
2.25.1