* [PATCH] clk: imx: clk-fracn-gppll: Return rate in rate table properly in ->recalc_rate()
@ 2022-05-29 7:11 Liu Ying
2022-05-30 2:08 ` Peng Fan
0 siblings, 1 reply; 4+ messages in thread
From: Liu Ying @ 2022-05-29 7:11 UTC (permalink / raw)
To: linux-clk, linux-arm-kernel, linux-kernel
Cc: Abel Vesa, Michael Turquette, Stephen Boyd, Shawn Guo,
Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam,
NXP Linux Team, Peng Fan
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* RE: [PATCH] clk: imx: clk-fracn-gppll: Return rate in rate table properly in ->recalc_rate()
2022-05-29 7:11 [PATCH] clk: imx: clk-fracn-gppll: Return rate in rate table properly in ->recalc_rate() Liu Ying
@ 2022-05-30 2:08 ` Peng Fan
2022-05-30 9:08 ` Peng Fan
0 siblings, 1 reply; 4+ messages in thread
From: Peng Fan @ 2022-05-30 2:08 UTC (permalink / raw)
To: Ying Liu, linux-clk, linux-arm-kernel, linux-kernel
Cc: Abel Vesa, Michael Turquette, Stephen Boyd, Shawn Guo,
Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam,
dl-linux-imx
> Subject: [PATCH] clk: imx: clk-fracn-gppll: Return rate in rate table properly in
> ->recalc_rate()
>
> 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>
Reviewed-by: Peng Fan <peng.fan@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
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCH] clk: imx: clk-fracn-gppll: Return rate in rate table properly in ->recalc_rate()
2022-05-30 2:08 ` Peng Fan
@ 2022-05-30 9:08 ` Peng Fan
2022-05-31 1:45 ` Liu Ying
0 siblings, 1 reply; 4+ messages in thread
From: Peng Fan @ 2022-05-30 9:08 UTC (permalink / raw)
To: Ying Liu, linux-clk, linux-arm-kernel, linux-kernel
Cc: Abel Vesa, Michael Turquette, Stephen Boyd, Shawn Guo,
Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam,
dl-linux-imx
> Subject: RE: [PATCH] clk: imx: clk-fracn-gppll: Return rate in rate table properly
> in ->recalc_rate()
>
> > Subject: [PATCH] clk: imx: clk-fracn-gppll: Return rate in rate table
> > properly in
> > ->recalc_rate()
> >
> > 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>
>
> Reviewed-by: Peng Fan <peng.fan@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;
After check more:
According to doc, needs add a check here:
if (!rdiv)
rdiv = rdiv + 1;
Regards,
Peng.
> > +
> > + 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] clk: imx: clk-fracn-gppll: Return rate in rate table properly in ->recalc_rate()
2022-05-30 9:08 ` Peng Fan
@ 2022-05-31 1:45 ` Liu Ying
0 siblings, 0 replies; 4+ messages in thread
From: Liu Ying @ 2022-05-31 1:45 UTC (permalink / raw)
To: Peng Fan, linux-clk, linux-arm-kernel, linux-kernel
Cc: Abel Vesa, Michael Turquette, Stephen Boyd, Shawn Guo,
Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam,
dl-linux-imx
Hi Peng,
On Mon, 2022-05-30 at 17:08 +0800, Peng Fan wrote:
> > Subject: RE: [PATCH] clk: imx: clk-fracn-gppll: Return rate in rate
> > table properly
> > in ->recalc_rate()
> >
> > > Subject: [PATCH] clk: imx: clk-fracn-gppll: Return rate in rate
> > > table
> > > properly in
> > > ->recalc_rate()
> > >
> > > 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>
> >
> > Reviewed-by: Peng Fan <peng.fan@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;
>
> After check more:
> According to doc, needs add a check here:
> if (!rdiv)
> rdiv = rdiv + 1;
This new check is not something this patch tries to deal with.
Maybe, you may send a separate patch to add the check.
Regards,
Liu Ying
>
> Regards,
> Peng.
> > > +
> > > + 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
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-05-31 1:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-29 7:11 [PATCH] clk: imx: clk-fracn-gppll: Return rate in rate table properly in ->recalc_rate() Liu Ying
2022-05-30 2:08 ` Peng Fan
2022-05-30 9:08 ` Peng Fan
2022-05-31 1:45 ` Liu Ying
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).