Skip to contentSkip to conversation

arm: socfpga: set the mpuclk divider in the Altera group register

PATCH New Dinh Nguyen 3 participants 10 messages Jan 31, 2017 – Feb 9, 2017

Subsystems (3)
lore
Share & tools
lore

Dinh Nguyen

author maintainer
#0 lore raw

PATCH 1/1 arm: socfpga: set the mpuclk divider in the Altera group register

The mpuclk register in the Altera group of the clock manager divides the mpu_clk that is generated from the C0 output of the main pll.

Without this patch, the default value of the register is 1, so the mpuclk will always get divided by 2 if the correct value is not set. For example, on the Arria5 socdk board, the MPU clock is only 525 MHz, and it should be 1.05 GHz.

---
 arch/arm/mach-socfpga/clock_manager.c              | 3 +++
 arch/arm/mach-socfpga/include/mach/clock_manager.h | 3 +++
 arch/arm/mach-socfpga/wrap_pll_config.c            | 3 +++
 3 files changed, 9 insertions(+)
arch/arm/mach-socfpga/clock_manager.c +3 -0
index aa71636..29e18f8 100644
@@ -167,6 +167,9 @@ void cm_basic_init(const struct cm_config * const cfg)
 	/* main mpu */
 	writel(cfg->mpuclk, &clock_manager_base->main_pll.mpuclk);
 
+	/* altera group mpuclk */
+	writel(cfg->altera_grp_mpuclk, &clock_manager_base->altera.mpuclk);
+
 	/* main main clock */
 	writel(cfg->mainclk, &clock_manager_base->main_pll.mainclk);
 
arch/arm/mach-socfpga/include/mach/clock_manager.h +3 -0
index 2675951..803c926 100644
@@ -55,6 +55,9 @@ struct cm_config {
 	uint32_t ddr2xdqsclk;
 	uint32_t ddrdqclk;
 	uint32_t s2fuser2clk;
+
+	/* altera group */
+	uint32_t altera_grp_mpuclk;
 };
 
 void cm_basic_init(const struct cm_config * const cfg);
arch/arm/mach-socfpga/wrap_pll_config.c +3 -0
index 8a0a0e6..72b5f92 100644
@@ -116,6 +116,9 @@ static const struct cm_config cm_default_cfg = {
 		CLKMGR_SDRPLLGRP_S2FUSER2CLK_PHASE_OFFSET) |
 	(CONFIG_HPS_SDRPLLGRP_S2FUSER2CLK_CNT <<
 		CLKMGR_SDRPLLGRP_S2FUSER2CLK_CNT_OFFSET),
+
+	/* altera group */
+	CONFIG_HPS_ALTERAGRP_MPUCLK,
 };
 
 const struct cm_config * const cm_get_default_config(void)
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 arm: socfpga: set the mpuclk divider in the Altera group register

Quoted 10 lines · Dinh Nguyen

The mpuclk register in the Altera group of the clock manager divides the mpu_clk that is generated from the C0 output of the main pll.

Without this patch, the default value of the register is 1, so the mpuclk will always get divided by 2 if the correct value is not set. For example, on the Arria5 socdk board, the MPU clock is only 525 MHz, and it should be 1.05 GHz.

That's real neat, does that mean we get up to twice as much performance?

Quoted 49 lines
---
 arch/arm/mach-socfpga/clock_manager.c              | 3 +++
 arch/arm/mach-socfpga/include/mach/clock_manager.h | 3 +++
 arch/arm/mach-socfpga/wrap_pll_config.c            | 3 +++
 3 files changed, 9 insertions(+)
arch/arm/mach-socfpga/clock_manager.c +3 -0
index aa71636..29e18f8 100644
@@ -167,6 +167,9 @@ void cm_basic_init(const struct cm_config * const cfg)
 	/* main mpu */
 	writel(cfg->mpuclk, &clock_manager_base->main_pll.mpuclk);
 
+	/* altera group mpuclk */
+	writel(cfg->altera_grp_mpuclk, &clock_manager_base->altera.mpuclk);
+
 	/* main main clock */
 	writel(cfg->mainclk, &clock_manager_base->main_pll.mainclk);
 
arch/arm/mach-socfpga/include/mach/clock_manager.h +3 -0
index 2675951..803c926 100644
@@ -55,6 +55,9 @@ struct cm_config {
 	uint32_t ddr2xdqsclk;
 	uint32_t ddrdqclk;
 	uint32_t s2fuser2clk;
+
+	/* altera group */
+	uint32_t altera_grp_mpuclk;
 };
 
 void cm_basic_init(const struct cm_config * const cfg);
arch/arm/mach-socfpga/wrap_pll_config.c +3 -0
index 8a0a0e6..72b5f92 100644
@@ -116,6 +116,9 @@ static const struct cm_config cm_default_cfg = {
 		CLKMGR_SDRPLLGRP_S2FUSER2CLK_PHASE_OFFSET) |
 	(CONFIG_HPS_SDRPLLGRP_S2FUSER2CLK_CNT <<
 		CLKMGR_SDRPLLGRP_S2FUSER2CLK_CNT_OFFSET),
+
+	/* altera group */
+	CONFIG_HPS_ALTERAGRP_MPUCLK,
 };
 
 const struct cm_config * const cm_get_default_config(void)
Signature · 2 lines
Best regards,
Marek Vasut
#2 lore raw

PATCH 1/1 arm: socfpga: set the mpuclk divider in the Altera group register

In reply to Dinh Nguyen
Quoted 8 lines · Dinh Nguyen

The mpuclk register in the Altera group of the clock manager divides the mpu_clk that is generated from the C0 output of the main pll.

Without this patch, the default value of the register is 1, so the mpuclk will always get divided by 2 if the correct value is not set. For example, on the Arria5 socdk board, the MPU clock is only 525 MHz, and it should be 1.05 GHz.

Applied to u-boot-socfpga/next (so for 2017.05), as the MW is closed and I'd rather be a bit careful here. Is my assumption correct that until now, the performance of the CPU in both C/V and A/V was halved?

It'd still be great to have people test it, so I added some more people to CC.

Quoted 50 lines
---
 arch/arm/mach-socfpga/clock_manager.c              | 3 +++
 arch/arm/mach-socfpga/include/mach/clock_manager.h | 3 +++
 arch/arm/mach-socfpga/wrap_pll_config.c            | 3 +++
 3 files changed, 9 insertions(+)
arch/arm/mach-socfpga/clock_manager.c +3 -0
index aa71636..29e18f8 100644
@@ -167,6 +167,9 @@ void cm_basic_init(const struct cm_config * const cfg)
 	/* main mpu */
 	writel(cfg->mpuclk, &clock_manager_base->main_pll.mpuclk);
 
+	/* altera group mpuclk */
+	writel(cfg->altera_grp_mpuclk, &clock_manager_base->altera.mpuclk);
+
 	/* main main clock */
 	writel(cfg->mainclk, &clock_manager_base->main_pll.mainclk);
 
arch/arm/mach-socfpga/include/mach/clock_manager.h +3 -0
index 2675951..803c926 100644
@@ -55,6 +55,9 @@ struct cm_config {
 	uint32_t ddr2xdqsclk;
 	uint32_t ddrdqclk;
 	uint32_t s2fuser2clk;
+
+	/* altera group */
+	uint32_t altera_grp_mpuclk;
 };
 
 void cm_basic_init(const struct cm_config * const cfg);
arch/arm/mach-socfpga/wrap_pll_config.c +3 -0
index 8a0a0e6..72b5f92 100644
@@ -116,6 +116,9 @@ static const struct cm_config cm_default_cfg = {
 		CLKMGR_SDRPLLGRP_S2FUSER2CLK_PHASE_OFFSET) |
 	(CONFIG_HPS_SDRPLLGRP_S2FUSER2CLK_CNT <<
 		CLKMGR_SDRPLLGRP_S2FUSER2CLK_CNT_OFFSET),
+
+	/* altera group */
+	CONFIG_HPS_ALTERAGRP_MPUCLK,
 };
 
 const struct cm_config * const cm_get_default_config(void)
Signature · 2 lines
Best regards,
Marek Vasut
#3 lore raw

PATCH 1/1 arm: socfpga: set the mpuclk divider in the Altera group register

Quoted 5 lines · Marek Vasut
Quoted 4 lines · Dinh Nguyen

The mpuclk register in the Altera group of the clock manager divides the mpu_clk that is generated from the C0 output of the main pll.

Quoted 8 lines
Quoted 4 lines

Without this patch, the default value of the register is 1, so the mpuclk will always get divided by 2 if the correct value is not set. For example, on the Arria5 socdk board, the MPU clock is only 525 MHz, and it should be 1.05 GHz.

Applied to u-boot-socfpga/next (so for 2017.05), as the MW is closed and I'd rather be a bit careful here. Is my assumption correct that until now, the performance of the CPU in both C/V and A/V was halved?

Hm in fact, it is already zero on C/V (I just checked) , so this seems to be A/V specific ?

Quoted 55 lines

It'd still be great to have people test it, so I added some more people to CC.

Quoted 50 lines
---
 arch/arm/mach-socfpga/clock_manager.c              | 3 +++
 arch/arm/mach-socfpga/include/mach/clock_manager.h | 3 +++
 arch/arm/mach-socfpga/wrap_pll_config.c            | 3 +++
 3 files changed, 9 insertions(+)
arch/arm/mach-socfpga/clock_manager.c +3 -0
index aa71636..29e18f8 100644
@@ -167,6 +167,9 @@ void cm_basic_init(const struct cm_config * const cfg)
 	/* main mpu */
 	writel(cfg->mpuclk, &clock_manager_base->main_pll.mpuclk);
 
+	/* altera group mpuclk */
+	writel(cfg->altera_grp_mpuclk, &clock_manager_base->altera.mpuclk);
+
 	/* main main clock */
 	writel(cfg->mainclk, &clock_manager_base->main_pll.mainclk);
 
arch/arm/mach-socfpga/include/mach/clock_manager.h +3 -0
index 2675951..803c926 100644
@@ -55,6 +55,9 @@ struct cm_config {
 	uint32_t ddr2xdqsclk;
 	uint32_t ddrdqclk;
 	uint32_t s2fuser2clk;
+
+	/* altera group */
+	uint32_t altera_grp_mpuclk;
 };
 
 void cm_basic_init(const struct cm_config * const cfg);
arch/arm/mach-socfpga/wrap_pll_config.c +3 -0
index 8a0a0e6..72b5f92 100644
@@ -116,6 +116,9 @@ static const struct cm_config cm_default_cfg = {
 		CLKMGR_SDRPLLGRP_S2FUSER2CLK_PHASE_OFFSET) |
 	(CONFIG_HPS_SDRPLLGRP_S2FUSER2CLK_CNT <<
 		CLKMGR_SDRPLLGRP_S2FUSER2CLK_CNT_OFFSET),
+
+	/* altera group */
+	CONFIG_HPS_ALTERAGRP_MPUCLK,
 };
 
 const struct cm_config * const cm_get_default_config(void)
Signature · 2 lines
Best regards,
Marek Vasut
author maintainer
#4 lore raw

PATCH 1/1 arm: socfpga: set the mpuclk divider in the Altera group register

Quoted 11 lines · Marek Vasut
Quoted 10 lines · Marek Vasut
Quoted 8 lines · Dinh Nguyen

The mpuclk register in the Altera group of the clock manager divides the mpu_clk that is generated from the C0 output of the main pll.

Without this patch, the default value of the register is 1, so the mpuclk will always get divided by 2 if the correct value is not set. For example, on the Arria5 socdk board, the MPU clock is only 525 MHz, and it should be 1.05 GHz.

Quoted 6 lines
Quoted 3 lines

Applied to u-boot-socfpga/next (so for 2017.05), as the MW is closed and I'd rather be a bit careful here. Is my assumption correct that until now, the performance of the CPU in both C/V and A/V was halved?

Hm in fact, it is already zero on C/V (I just checked) , so this seems to be A/V specific ?

Yes, that's correct. It's A/V specific. But patch is good for all C/V as well. For the C/V devices, it numerator for the MPU clock is higher, so dividing by 2 put the mpuclk ~1GHz. But for A/V, dividing by 2 puts the clock at 525MHz. Pretty slow.

Dinh

#5 lore raw

PATCH 1/1 arm: socfpga: set the mpuclk divider in the Altera group register

Quoted 18 lines · Dinh Nguyen
Quoted 15 lines · Marek Vasut
Quoted 13 lines · Marek Vasut
Quoted 8 lines · Dinh Nguyen

The mpuclk register in the Altera group of the clock manager divides the mpu_clk that is generated from the C0 output of the main pll.

Without this patch, the default value of the register is 1, so the mpuclk will always get divided by 2 if the correct value is not set. For example, on the Arria5 socdk board, the MPU clock is only 525 MHz, and it should be 1.05 GHz.

Applied to u-boot-socfpga/next (so for 2017.05), as the MW is closed and I'd rather be a bit careful here. Is my assumption correct that until now, the performance of the CPU in both C/V and A/V was halved?

Quoted 7 lines
Quoted 2 lines

Hm in fact, it is already zero on C/V (I just checked) , so this seems to be A/V specific ?

Yes, that's correct. It's A/V specific. But patch is good for all C/V as well. For the C/V devices, it numerator for the MPU clock is higher, so dividing by 2 put the mpuclk ~1GHz. But for A/V, dividing by 2 puts the clock at 525MHz. Pretty slow.

Cool, thanks for confirming. Maybe I should get it into 2017.03 release? What do you think ?

Signature · 2 lines
Best regards,
Marek Vasut
author maintainer
#6 lore raw

PATCH 1/1 arm: socfpga: set the mpuclk divider in the Altera group register

Quoted 22 lines · Marek Vasut
Quoted 21 lines · Dinh Nguyen
Quoted 17 lines · Marek Vasut
Quoted 5 lines · Marek Vasut
Quoted 4 lines · Dinh Nguyen

The mpuclk register in the Altera group of the clock manager divides the mpu_clk that is generated from the C0 output of the main pll.

Quoted 8 lines
Quoted 4 lines

Without this patch, the default value of the register is 1, so the mpuclk will always get divided by 2 if the correct value is not set. For example, on the Arria5 socdk board, the MPU clock is only 525 MHz, and it should be 1.05 GHz.

Applied to u-boot-socfpga/next (so for 2017.05), as the MW is closed and I'd rather be a bit careful here. Is my assumption correct that until now, the performance of the CPU in both C/V and A/V was halved?

Hm in fact, it is already zero on C/V (I just checked) , so this seems to be A/V specific ?

Quoted 8 lines
Quoted 4 lines

Yes, that's correct. It's A/V specific. But patch is good for all C/V as well. For the C/V devices, it numerator for the MPU clock is higher, so dividing by 2 put the mpuclk ~1GHz. But for A/V, dividing by 2 puts the clock at 525MHz. Pretty slow.

Cool, thanks for confirming. Maybe I should get it into 2017.03 release? What do you think ?

Yes, I think the earlier the better.

Thanks,
Dinh

#7 lore raw

PATCH 1/1 arm: socfpga: set the mpuclk divider in the Altera group register

Quoted 30 lines · Dinh Nguyen
Quoted 27 lines · Marek Vasut
Quoted 25 lines · Dinh Nguyen
Quoted 11 lines · Marek Vasut
Quoted 10 lines · Marek Vasut
Quoted 8 lines · Dinh Nguyen

The mpuclk register in the Altera group of the clock manager divides the mpu_clk that is generated from the C0 output of the main pll.

Without this patch, the default value of the register is 1, so the mpuclk will always get divided by 2 if the correct value is not set. For example, on the Arria5 socdk board, the MPU clock is only 525 MHz, and it should be 1.05 GHz.

Quoted 6 lines
Quoted 3 lines

Applied to u-boot-socfpga/next (so for 2017.05), as the MW is closed and I'd rather be a bit careful here. Is my assumption correct that until now, the performance of the CPU in both C/V and A/V was halved?

Hm in fact, it is already zero on C/V (I just checked) , so this seems to be A/V specific ?

Yes, that's correct. It's A/V specific. But patch is good for all C/V as well. For the C/V devices, it numerator for the MPU clock is higher, so dividing by 2 put the mpuclk ~1GHz. But for A/V, dividing by 2 puts the clock at 525MHz. Pretty slow.

Quoted 5 lines
Quoted 3 lines

Cool, thanks for confirming. Maybe I should get it into 2017.03 release? What do you think ?

Yes, I think the earlier the better.

OK fine. Done.

Signature · 2 lines
Best regards,
Marek Vasut
#8 lore raw

PATCH 1/1 arm: socfpga: set the mpuclk divider in the Altera group register

Quoted 31 lines · Marek Vasut
Quoted 30 lines · Dinh Nguyen
Quoted 27 lines · Marek Vasut
Quoted 25 lines · Dinh Nguyen
Quoted 11 lines · Marek Vasut
Quoted 10 lines · Marek Vasut
Quoted 8 lines · Dinh Nguyen

The mpuclk register in the Altera group of the clock manager divides the mpu_clk that is generated from the C0 output of the main pll.

Without this patch, the default value of the register is 1, so the mpuclk will always get divided by 2 if the correct value is not set. For example, on the Arria5 socdk board, the MPU clock is only 525 MHz, and it should be 1.05 GHz.

Quoted 6 lines
Quoted 3 lines

Applied to u-boot-socfpga/next (so for 2017.05), as the MW is closed and I'd rather be a bit careful here. Is my assumption correct that until now, the performance of the CPU in both C/V and A/V was halved?

Hm in fact, it is already zero on C/V (I just checked) , so this seems to be A/V specific ?

Yes, that's correct. It's A/V specific. But patch is good for all C/V as well. For the C/V devices, it numerator for the MPU clock is higher, so dividing by 2 put the mpuclk ~1GHz. But for A/V, dividing by 2 puts the clock at 525MHz. Pretty slow.

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

Cool, thanks for confirming. Maybe I should get it into 2017.03 release? What do you think ?

Yes, I think the earlier the better.

OK fine. Done.

Thanks!

Pretty simple test:

time dd if=/dev/urandom of=/dev/null bs=1M count=500

with patch ~11 seconds, without patch ~22 seconds.

Dinh

#9 lore raw

PATCH 1/1 arm: socfpga: set the mpuclk divider in the Altera group register

Quoted 41 lines · Dinh Nguyen
Quoted 31 lines · Marek Vasut
Quoted 30 lines · Dinh Nguyen
Quoted 27 lines · Marek Vasut
Quoted 25 lines · Dinh Nguyen
Quoted 11 lines · Marek Vasut
Quoted 10 lines · Marek Vasut
Quoted 8 lines · Dinh Nguyen

The mpuclk register in the Altera group of the clock manager divides the mpu_clk that is generated from the C0 output of the main pll.

Without this patch, the default value of the register is 1, so the mpuclk will always get divided by 2 if the correct value is not set. For example, on the Arria5 socdk board, the MPU clock is only 525 MHz, and it should be 1.05 GHz.

Quoted 6 lines
Quoted 3 lines

Applied to u-boot-socfpga/next (so for 2017.05), as the MW is closed and I'd rather be a bit careful here. Is my assumption correct that until now, the performance of the CPU in both C/V and A/V was halved?

Hm in fact, it is already zero on C/V (I just checked) , so this seems to be A/V specific ?

Yes, that's correct. It's A/V specific. But patch is good for all C/V as well. For the C/V devices, it numerator for the MPU clock is higher, so dividing by 2 put the mpuclk ~1GHz. But for A/V, dividing by 2 puts the clock at 525MHz. Pretty slow.

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

Cool, thanks for confirming. Maybe I should get it into 2017.03 release? What do you think ?

Yes, I think the earlier the better.

OK fine. Done.

Quoted 7 lines

Thanks!

Pretty simple test:

time dd if=/dev/urandom of=/dev/null bs=1M count=500

with patch ~11 seconds, without patch ~22 seconds.

Hehe, that's an interesting way to test CPU speed :)

Signature · 2 lines
Best regards,
Marek Vasut