clk: rockchip: clk-pll: Fix CRU_xx_CON2 register usage
Subsystems (2)
PATCH 1/2 clk: rockchip: clk-pll: Fix CRU_xx_CON2 register usage
According to RK3588 TRM, CRU_(CPLL/GPLL/etc)_CON2 register (rate-k value) does not use highword write enable mask. Lets fix this.
--- drivers/clk/rockchip/clk-pll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/rockchip/clk-pll.c +1 -1
@@ -959,7 +959,7 @@ static int rockchip_rk3588_pll_set_params(struct rockchip_clk_pll *pll,HIWORD_UPDATE (rate->s,RK3588_PLLCON1_S_MASK ,RK3588_PLLCON1_S_SHIFT ), pll->reg_base + RK3399_PLLCON(1)); -writel_relaxed (HIWORD_UPDATE (rate->k,RK3588_PLLCON2_K_MASK ,RK3588_PLLCON2_K_SHIFT ), +writel_relaxed ((rate->k &RK3588_PLLCON2_K_MASK ) <<RK3588_PLLCON2_K_SHIFT , pll->reg_base +RK3399_PLLCON (2 ));/* set pll power up */
Signature · 1 line
2.39.1
PATCH 2/2 clk: rockchip: clk-pll: Typo fix
Fixed RK3399 -> RK3588 typo.
No functional changes.
--- drivers/clk/rockchip/clk-pll.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/clk/rockchip/clk-pll.c +4 -4
@@ -949,18 +949,18 @@ static int rockchip_rk3588_pll_set_params(struct rockchip_clk_pll *pll,/* set pll power down */ writel (HIWORD_UPDATE (RK3588_PLLCON1_PWRDOWN ,RK3588_PLLCON1_PWRDOWN ,0 ), - pll->reg_base +RK3399_PLLCON (1 )); + pll->reg_base +RK3588_PLLCON (1 ));/* update pll values */ writel_relaxed (HIWORD_UPDATE (rate->m,RK3588_PLLCON0_M_MASK ,RK3588_PLLCON0_M_SHIFT ), - pll->reg_base +RK3399_PLLCON (0 )); + pll->reg_base +RK3588_PLLCON (0 ));writel_relaxed (HIWORD_UPDATE (rate->p,RK3588_PLLCON1_P_MASK ,RK3588_PLLCON1_P_SHIFT ) |HIWORD_UPDATE (rate->s,RK3588_PLLCON1_S_MASK ,RK3588_PLLCON1_S_SHIFT ), - pll->reg_base +RK3399_PLLCON (1 )); + pll->reg_base +RK3588_PLLCON (1 ));writel_relaxed ((rate->k &RK3588_PLLCON2_K_MASK ) <<RK3588_PLLCON2_K_SHIFT , - pll->reg_base +RK3399_PLLCON (2 )); + pll->reg_base +RK3588_PLLCON (2 ));/* set pll power up */ writel(HIWORD_UPDATE(0, RK3588_PLLCON1_PWRDOWN, 0),
Signature · 1 line
2.39.1
Heiko Stübner
maintainerHi Alexander,
Am Dienstag, 8. April 2025, 08:31:25 Mitteleuropäische Sommerzeit schrieb Alexander Shiyan:
Quoted 5 lines
According to RK3588 TRM, CRU_(CPLL/GPLL/etc)_CON2 register (rate-k value) does not use highword write enable mask. Lets fix this.
Signed-off-by Alexander Shiyan <[email protected]>
The commit message doesn't say, but did you check this on actual hardware too?
Sometimes there is a disconnect between the TRM and actual hardware, so the actual real-life situation should be checked.
As for a test-case, any write without write-mask to a register that would require a write-mask would not come through.
So with your patch applied, does the register value change after the write below when reading it back again?
Thanks
Heiko
Quoted 18 lines
--- drivers/clk/rockchip/clk-pll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/clk/rockchip/clk-pll.c +1
-1@@ -959,7 +959,7 @@ static int rockchip_rk3588_pll_set_params(struct rockchip_clk_pll *pll,HIWORD_UPDATE (rate->s,RK3588_PLLCON1_S_MASK ,RK3588_PLLCON1_S_SHIFT ), pll->reg_base + RK3399_PLLCON(1)); -writel_relaxed (HIWORD_UPDATE (rate->k,RK3588_PLLCON2_K_MASK ,RK3588_PLLCON2_K_SHIFT ), +writel_relaxed ((rate->k &RK3588_PLLCON2_K_MASK ) <<RK3588_PLLCON2_K_SHIFT , pll->reg_base +RK3399_PLLCON (2 ));/* set pll power up */
Hello.
Yes, everything works as expected:
# mw 0xfd7c01a8 0x00001234 # md 0xfd7c01a8+4 fd7c01a8: 00001234 # mw 0xfd7c01a8 0x00005678 # md 0xfd7c01a8+4 fd7c01a8: 00005678
вт, 8 апр. 2025 г. в 10:31, Heiko Stübner <[email protected]>:
Quoted 49 lines
Hi Alexander,
Am Dienstag, 8. April 2025, 08:31:25 Mitteleuropäische Sommerzeit schrieb Alexander Shiyan:
Quoted 5 lines
According to RK3588 TRM, CRU_(CPLL/GPLL/etc)_CON2 register (rate-k value) does not use highword write enable mask. Lets fix this.
Signed-off-by Alexander Shiyan <[email protected]>The commit message doesn't say, but did you check this on actual hardware too?
Sometimes there is a disconnect between the TRM and actual hardware, so the actual real-life situation should be checked.
As for a test-case, any write without write-mask to a register that would require a write-mask would not come through.
So with your patch applied, does the register value change after the write below when reading it back again?Thanks
HeikoQuoted 18 lines
--- drivers/clk/rockchip/clk-pll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/clk/rockchip/clk-pll.c +1
-1@@ -959,7 +959,7 @@ static int rockchip_rk3588_pll_set_params(struct rockchip_clk_pll *pll,HIWORD_UPDATE (rate->s,RK3588_PLLCON1_S_MASK ,RK3588_PLLCON1_S_SHIFT ), pll->reg_base + RK3399_PLLCON(1)); -writel_relaxed (HIWORD_UPDATE (rate->k,RK3588_PLLCON2_K_MASK ,RK3588_PLLCON2_K_SHIFT ), +writel_relaxed ((rate->k &RK3588_PLLCON2_K_MASK ) <<RK3588_PLLCON2_K_SHIFT , pll->reg_base +RK3399_PLLCON (2 ));/* set pll power up */