Skip to contentSkip to conversation

sunxi: clock: H6/H616: Fix PLL clock factor encodings

PATCH In review Andre Przywara 2 participants 3 messages May 5, 2021 – Jun 3, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 sunxi: clock: H6/H616: Fix PLL clock factor encodings

Most clock factors and dividers in the H6 PLLs use a "+1 encoding", which we were missing on two occasions.

This fixes the MMC clock setup on the H6, which could be slightly off due to the wrong parent frequency:
mmc 2 set mod-clk req 52000000 parent 1176000000 n 2 m 12 rate 49000000

Also the CPU frequency was a tad too high before.

---
Changelog v1 .. v2:
- Also fix PLL5 factor calculation (video, currently unused)
- Also fix PLL1 factor calculation (CPU clock)

 arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h | 4 ++--
 arch/arm/mach-sunxi/clock_sun50i_h6.c             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h +2 -2
index 62abfc4ef6b..2e076cf594d 100644
@@ -233,14 +233,14 @@ struct sunxi_ccm_reg {
 #define CCM_PLL1_OUT_EN			BIT(27)
 #define CCM_PLL1_CLOCK_TIME_2		(2 << 24)
 #define CCM_PLL1_CTRL_P(p)		((p) << 16)
-#define CCM_PLL1_CTRL_N(n)		((n) << 8)
+#define CCM_PLL1_CTRL_N(n)		(((n) - 1) << 8)
 
 /* pll5 bit field */
 #define CCM_PLL5_CTRL_EN		BIT(31)
 #define CCM_PLL5_LOCK_EN		BIT(29)
 #define CCM_PLL5_LOCK			BIT(28)
 #define CCM_PLL5_OUT_EN			BIT(27)
-#define CCM_PLL5_CTRL_N(n)		((n) << 8)
+#define CCM_PLL5_CTRL_N(n)		(((n) - 1) << 8)
 #define CCM_PLL5_CTRL_DIV1(div1)	((div1) << 0)
 #define CCM_PLL5_CTRL_DIV2(div0)	((div0) << 1)
 
arch/arm/mach-sunxi/clock_sun50i_h6.c +1 -1
index 492fc4a3fca..a947463e0a5 100644
@@ -94,7 +94,7 @@ unsigned int clock_get_pll6(void)
 	int m = IS_ENABLED(CONFIG_MACH_SUN50I_H6) ? 4 : 2;
 
 	uint32_t rval = readl(&ccm->pll6_cfg);
-	int n = ((rval & CCM_PLL6_CTRL_N_MASK) >> CCM_PLL6_CTRL_N_SHIFT);
+	int n = ((rval & CCM_PLL6_CTRL_N_MASK) >> CCM_PLL6_CTRL_N_SHIFT) + 1;
 	int div1 = ((rval & CCM_PLL6_CTRL_DIV1_MASK) >>
 			CCM_PLL6_CTRL_DIV1_SHIFT) + 1;
 	int div2 = ((rval & CCM_PLL6_CTRL_DIV2_MASK) >>
Signature · 1 line
2.17.5
#1 lore raw

On Wed, 5 May 2021 13:53:05 +0100
Andre Przywara <[email protected]> wrote:

Hi,

Quoted 2 lines

Most clock factors and dividers in the H6 PLLs use a "+1 encoding", which we were missing on two occasions.

can someone please confirm that I didn't mess this up?

Cheers,
Andre

Quoted 51 lines

This fixes the MMC clock setup on the H6, which could be slightly off due to the wrong parent frequency:
mmc 2 set mod-clk req 52000000 parent 1176000000 n 2 m 12 rate 49000000

Also the CPU frequency was a tad too high before.

---
Changelog v1 .. v2:
- Also fix PLL5 factor calculation (video, currently unused)
- Also fix PLL1 factor calculation (CPU clock)

 arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h | 4 ++--
 arch/arm/mach-sunxi/clock_sun50i_h6.c             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h +2 -2
index 62abfc4ef6b..2e076cf594d 100644
@@ -233,14 +233,14 @@ struct sunxi_ccm_reg {
 #define CCM_PLL1_OUT_EN			BIT(27)
 #define CCM_PLL1_CLOCK_TIME_2		(2 << 24)
 #define CCM_PLL1_CTRL_P(p)		((p) << 16)
-#define CCM_PLL1_CTRL_N(n)		((n) << 8)
+#define CCM_PLL1_CTRL_N(n)		(((n) - 1) << 8)
 
 /* pll5 bit field */
 #define CCM_PLL5_CTRL_EN		BIT(31)
 #define CCM_PLL5_LOCK_EN		BIT(29)
 #define CCM_PLL5_LOCK			BIT(28)
 #define CCM_PLL5_OUT_EN			BIT(27)
-#define CCM_PLL5_CTRL_N(n)		((n) << 8)
+#define CCM_PLL5_CTRL_N(n)		(((n) - 1) << 8)
 #define CCM_PLL5_CTRL_DIV1(div1)	((div1) << 0)
 #define CCM_PLL5_CTRL_DIV2(div0)	((div0) << 1)
 
arch/arm/mach-sunxi/clock_sun50i_h6.c +1 -1
index 492fc4a3fca..a947463e0a5 100644
@@ -94,7 +94,7 @@ unsigned int clock_get_pll6(void)
 	int m = IS_ENABLED(CONFIG_MACH_SUN50I_H6) ? 4 : 2;
 
 	uint32_t rval = readl(&ccm->pll6_cfg);
-	int n = ((rval & CCM_PLL6_CTRL_N_MASK) >> CCM_PLL6_CTRL_N_SHIFT);
+	int n = ((rval & CCM_PLL6_CTRL_N_MASK) >> CCM_PLL6_CTRL_N_SHIFT) + 1;
 	int div1 = ((rval & CCM_PLL6_CTRL_DIV1_MASK) >>
 			CCM_PLL6_CTRL_DIV1_SHIFT) + 1;
 	int div2 = ((rval & CCM_PLL6_CTRL_DIV2_MASK) >>
maintainer Reviewed-by
#2 lore raw

Hi!

Dne četrtek, 27. maj 2021 ob 01:49:48 CEST je Andre Przywara napisal(a):

Quoted 43 lines

On Wed, 5 May 2021 13:53:05 +0100
Andre Przywara <[email protected]> wrote:

Hi,

Quoted 2 lines

Most clock factors and dividers in the H6 PLLs use a "+1 encoding", which we were missing on two occasions.

can someone please confirm that I didn't mess this up?

Cheers,
Andre

Quoted 30 lines

This fixes the MMC clock setup on the H6, which could be slightly off due to the wrong parent frequency:
mmc 2 set mod-clk req 52000000 parent 1176000000 n 2 m 12 rate 49000000

Also the CPU frequency was a tad too high before.

---
Changelog v1 .. v2:
- Also fix PLL5 factor calculation (video, currently unused)
- Also fix PLL1 factor calculation (CPU clock)

 arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h | 4 ++--
 arch/arm/mach-sunxi/clock_sun50i_h6.c             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
(quoted diff) +0 -0

b/arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h index 62abfc4ef6b..2e076cf594d 100644

arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h +1 -1
@@ -233,14 +233,14 @@ struct sunxi_ccm_reg {
 
 #define CCM_PLL1_OUT_EN			BIT(27)
 #define CCM_PLL1_CLOCK_TIME_2		(2 << 24)
 #define CCM_PLL1_CTRL_P(p)		((p) << 16)
 
-#define CCM_PLL1_CTRL_N(n)		((n) << 8)
+#define CCM_PLL1_CTRL_N(n)		(((n) - 1) << 8)
 
Quoted 8 lines

arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h struct sunxi_ccm_reg {

Quoted 8 lines
arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h +1 -1
 /* pll5 bit field */
 #define CCM_PLL5_CTRL_EN		BIT(31)
 #define CCM_PLL5_LOCK_EN		BIT(29)
 #define CCM_PLL5_LOCK			BIT(28)
 #define CCM_PLL5_OUT_EN			BIT(27)
 
-#define CCM_PLL5_CTRL_N(n)		((n) << 8)
+#define CCM_PLL5_CTRL_N(n)		(((n) - 1) << 8)

H6 and H616 DRAM drivers actually consider this "- 1" in the code. Either drop this change or fix DRAM drivers.

With that:

Best regards,
Jernej

Quoted 11 lines
Quoted 11 lines

#define CCM_PLL5_CTRL_DIV1(div1) ((div1) << 0)
#define CCM_PLL5_CTRL_DIV2(div0) ((div0) << 1)

(quoted diff) +0 -0

b/arch/arm/mach-sunxi/clock_sun50i_h6.c index 492fc4a3fca..a947463e0a5 100644

arch/arm/mach-sunxi/clock_sun50i_h6.c +0 -0
@@ -94,7 +94,7 @@ unsigned int clock_get_pll6(void)
 
Quoted 6 lines

arch/arm/mach-sunxi/clock_sun50i_h6.c unsigned int clock_get_pll6(void)

Quoted 6 lines
arch/arm/mach-sunxi/clock_sun50i_h6.c +1 -1
 	int m = IS_ENABLED(CONFIG_MACH_SUN50I_H6) ? 4 : 2;
 
 	uint32_t rval = readl(&ccm->pll6_cfg);
 
-	int n = ((rval & CCM_PLL6_CTRL_N_MASK) >> CCM_PLL6_CTRL_N_SHIFT);
+	int n = ((rval & CCM_PLL6_CTRL_N_MASK) >> CCM_PLL6_CTRL_N_SHIFT) + 

1;

Quoted 6 lines
Quoted 6 lines
arch/arm/mach-sunxi/clock_sun50i_h6.c +0 -0
 	int div1 = ((rval & CCM_PLL6_CTRL_DIV1_MASK) >>
arch/arm/mach-sunxi/clock_sun50i_h6.c +0 -0
 			CCM_PLL6_CTRL_DIV1_SHIFT) + 1;
 
 	int div2 = ((rval & CCM_PLL6_CTRL_DIV2_MASK) >>