* [PATCH] clk: rockchip: convert rk3036 pll type to use internal lock status
@ 2020-01-13 15:26 Heiko Stuebner
2020-01-14 5:05 ` Stephen Boyd
0 siblings, 1 reply; 3+ messages in thread
From: Heiko Stuebner @ 2020-01-13 15:26 UTC (permalink / raw)
To: linux-clk
Cc: linux-arm-kernel, linux-rockchip, linux-kernel, mturquette,
sboyd, heiko, christoph.muellner, zhangqing, Heiko Stuebner
From: Heiko Stuebner <heiko.stuebner@theobroma-systems.com>
The rk3036 pll type exposes its lock status in both its pllcon registers
as well as the General Register Files. To remove one dependency convert
it to the "internal" lock status, similar to how rk3399 handles it.
Signed-off-by: Heiko Stuebner <heiko.stuebner@theobroma-systems.com>
---
drivers/clk/rockchip/clk-pll.c | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/drivers/clk/rockchip/clk-pll.c b/drivers/clk/rockchip/clk-pll.c
index 198417d56300..37378ded0993 100644
--- a/drivers/clk/rockchip/clk-pll.c
+++ b/drivers/clk/rockchip/clk-pll.c
@@ -118,12 +118,30 @@ static int rockchip_pll_wait_lock(struct rockchip_clk_pll *pll)
#define RK3036_PLLCON1_REFDIV_SHIFT 0
#define RK3036_PLLCON1_POSTDIV2_MASK 0x7
#define RK3036_PLLCON1_POSTDIV2_SHIFT 6
+#define RK3036_PLLCON1_LOCK_STATUS BIT(10)
#define RK3036_PLLCON1_DSMPD_MASK 0x1
#define RK3036_PLLCON1_DSMPD_SHIFT 12
+#define RK3036_PLLCON1_PWRDOWN BIT(13)
#define RK3036_PLLCON2_FRAC_MASK 0xffffff
#define RK3036_PLLCON2_FRAC_SHIFT 0
-#define RK3036_PLLCON1_PWRDOWN (1 << 13)
+static int rockchip_rk3036_pll_wait_lock(struct rockchip_clk_pll *pll)
+{
+ u32 pllcon;
+ int delay = 24000000;
+
+ /* poll check the lock status in rk3399 xPLLCON2 */
+ while (delay > 0) {
+ pllcon = readl_relaxed(pll->reg_base + RK3036_PLLCON(1));
+ if (pllcon & RK3036_PLLCON1_LOCK_STATUS)
+ return 0;
+
+ delay--;
+ }
+
+ pr_err("%s: timeout waiting for pll to lock\n", __func__);
+ return -ETIMEDOUT;
+}
static void rockchip_rk3036_pll_get_params(struct rockchip_clk_pll *pll,
struct rockchip_pll_rate_table *rate)
@@ -221,7 +239,7 @@ static int rockchip_rk3036_pll_set_params(struct rockchip_clk_pll *pll,
writel_relaxed(pllcon, pll->reg_base + RK3036_PLLCON(2));
/* wait for the pll to lock */
- ret = rockchip_pll_wait_lock(pll);
+ ret = rockchip_rk3036_pll_wait_lock(pll);
if (ret) {
pr_warn("%s: pll update unsuccessful, trying to restore old params\n",
__func__);
@@ -260,7 +278,7 @@ static int rockchip_rk3036_pll_enable(struct clk_hw *hw)
writel(HIWORD_UPDATE(0, RK3036_PLLCON1_PWRDOWN, 0),
pll->reg_base + RK3036_PLLCON(1));
- rockchip_pll_wait_lock(pll);
+ rockchip_rk3036_pll_wait_lock(pll);
return 0;
}
--
2.24.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] clk: rockchip: convert rk3036 pll type to use internal lock status
2020-01-13 15:26 [PATCH] clk: rockchip: convert rk3036 pll type to use internal lock status Heiko Stuebner
@ 2020-01-14 5:05 ` Stephen Boyd
2020-01-28 10:26 ` Heiko Stuebner
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Boyd @ 2020-01-14 5:05 UTC (permalink / raw)
To: Heiko Stuebner, linux-clk
Cc: linux-arm-kernel, linux-rockchip, linux-kernel, mturquette,
heiko, christoph.muellner, zhangqing, Heiko Stuebner
Quoting Heiko Stuebner (2020-01-13 07:26:56)
> diff --git a/drivers/clk/rockchip/clk-pll.c b/drivers/clk/rockchip/clk-pll.c
> index 198417d56300..37378ded0993 100644
> --- a/drivers/clk/rockchip/clk-pll.c
> +++ b/drivers/clk/rockchip/clk-pll.c
> @@ -118,12 +118,30 @@ static int rockchip_pll_wait_lock(struct rockchip_clk_pll *pll)
> #define RK3036_PLLCON1_REFDIV_SHIFT 0
> #define RK3036_PLLCON1_POSTDIV2_MASK 0x7
> #define RK3036_PLLCON1_POSTDIV2_SHIFT 6
> +#define RK3036_PLLCON1_LOCK_STATUS BIT(10)
> #define RK3036_PLLCON1_DSMPD_MASK 0x1
> #define RK3036_PLLCON1_DSMPD_SHIFT 12
> +#define RK3036_PLLCON1_PWRDOWN BIT(13)
> #define RK3036_PLLCON2_FRAC_MASK 0xffffff
> #define RK3036_PLLCON2_FRAC_SHIFT 0
>
> -#define RK3036_PLLCON1_PWRDOWN (1 << 13)
> +static int rockchip_rk3036_pll_wait_lock(struct rockchip_clk_pll *pll)
> +{
> + u32 pllcon;
> + int delay = 24000000;
> +
> + /* poll check the lock status in rk3399 xPLLCON2 */
> + while (delay > 0) {
> + pllcon = readl_relaxed(pll->reg_base + RK3036_PLLCON(1));
> + if (pllcon & RK3036_PLLCON1_LOCK_STATUS)
> + return 0;
> +
> + delay--;
There isn't any udelay here. So the timeout is just as fast as the CPU
can churn through this? Why not use an actual time? Or use the
readl_poll_timeout() APIs?
> + }
> +
> + pr_err("%s: timeout waiting for pll to lock\n", __func__);
> + return -ETIMEDOUT;
> +}
>
> static void rockchip_rk3036_pll_get_params(struct rockchip_clk_pll *pll,
> struct rockchip_pll_rate_table *rate)
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] clk: rockchip: convert rk3036 pll type to use internal lock status
2020-01-14 5:05 ` Stephen Boyd
@ 2020-01-28 10:26 ` Heiko Stuebner
0 siblings, 0 replies; 3+ messages in thread
From: Heiko Stuebner @ 2020-01-28 10:26 UTC (permalink / raw)
To: Stephen Boyd
Cc: linux-clk, linux-arm-kernel, linux-rockchip, linux-kernel,
mturquette, christoph.muellner, zhangqing
Am Dienstag, 14. Januar 2020, 06:05:18 CET schrieb Stephen Boyd:
> Quoting Heiko Stuebner (2020-01-13 07:26:56)
> > diff --git a/drivers/clk/rockchip/clk-pll.c b/drivers/clk/rockchip/clk-pll.c
> > index 198417d56300..37378ded0993 100644
> > --- a/drivers/clk/rockchip/clk-pll.c
> > +++ b/drivers/clk/rockchip/clk-pll.c
> > @@ -118,12 +118,30 @@ static int rockchip_pll_wait_lock(struct rockchip_clk_pll *pll)
> > #define RK3036_PLLCON1_REFDIV_SHIFT 0
> > #define RK3036_PLLCON1_POSTDIV2_MASK 0x7
> > #define RK3036_PLLCON1_POSTDIV2_SHIFT 6
> > +#define RK3036_PLLCON1_LOCK_STATUS BIT(10)
> > #define RK3036_PLLCON1_DSMPD_MASK 0x1
> > #define RK3036_PLLCON1_DSMPD_SHIFT 12
> > +#define RK3036_PLLCON1_PWRDOWN BIT(13)
> > #define RK3036_PLLCON2_FRAC_MASK 0xffffff
> > #define RK3036_PLLCON2_FRAC_SHIFT 0
> >
> > -#define RK3036_PLLCON1_PWRDOWN (1 << 13)
> > +static int rockchip_rk3036_pll_wait_lock(struct rockchip_clk_pll *pll)
> > +{
> > + u32 pllcon;
> > + int delay = 24000000;
> > +
> > + /* poll check the lock status in rk3399 xPLLCON2 */
> > + while (delay > 0) {
> > + pllcon = readl_relaxed(pll->reg_base + RK3036_PLLCON(1));
> > + if (pllcon & RK3036_PLLCON1_LOCK_STATUS)
> > + return 0;
> > +
> > + delay--;
>
> There isn't any udelay here. So the timeout is just as fast as the CPU
> can churn through this? Why not use an actual time? Or use the
> readl_poll_timeout() APIs?
Done in
http://lore.kernel.org/r/20200128100204.1318450-3-heiko@sntech.de
and to keep things similar, I did a conversion to iopoll helpers for the
other variants too.
Heiko
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-01-28 10:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-13 15:26 [PATCH] clk: rockchip: convert rk3036 pll type to use internal lock status Heiko Stuebner
2020-01-14 5:05 ` Stephen Boyd
2020-01-28 10:26 ` Heiko Stuebner
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).