[PATCH 0/2] cpufreq-dt: support for cluster level clock

[PATCH 0/2] cpufreq-dt: support for cluster level clock

[Leo Yan]

Add support for cluster level clock domain for cpufreq-dt driver.

With this support, then cpufreq driver which using cpufreq-dt as
backend can easily apply on multi-clusters system with cluster
level clock domain.

The first patch has been back ported to 3.18 and tested on hikey
board, the second patch is only compiled successfully.

Leo Yan (2):
  cpufreq-dt: support cluster level clock
  ARM: mvebu: update cpufreq-dt's platform data

 arch/arm/mach-mvebu/pmsu.c   |  2 +-
 drivers/cpufreq/Kconfig      |  5 +++--
 drivers/cpufreq/cpufreq-dt.c | 14 +++++++++++++-
 include/linux/cpufreq-dt.h   | 16 ++++++++++++----
 4 files changed, 29 insertions(+), 8 deletions(-)

-- 
1.9.1

[PATCH 0/2] cpufreq-dt: support for cluster level clock

[Leo Yan]

Add support for cluster level clock domain for cpufreq-dt driver.

With this support, then cpufreq driver which using cpufreq-dt as
backend can easily apply on multi-clusters system with cluster
level clock domain.

The first patch has been back ported to 3.18 and tested on hikey
board, the second patch is only compiled successfully.

Leo Yan (2):
  cpufreq-dt: support cluster level clock
  ARM: mvebu: update cpufreq-dt's platform data

 arch/arm/mach-mvebu/pmsu.c   |  2 +-
 drivers/cpufreq/Kconfig      |  5 +++--
 drivers/cpufreq/cpufreq-dt.c | 14 +++++++++++++-
 include/linux/cpufreq-dt.h   | 16 ++++++++++++----
 4 files changed, 29 insertions(+), 8 deletions(-)

-- 
1.9.1

[PATCH 1/2] cpufreq-dt: support cluster level clock

[Leo Yan]

In the previous code, cpufreq-dt driver support single clock shared by
all CPUs or every CPU has dedicated clock; but it cannot support cluster
level clock domain, which is very common implementation for ARM SoCs.

So this patch add the support for cluster level clock; which use the
platform parameter "clk_domain_boundary" to indicate whether the clock
domain is bound to system level, cluster level or CPU level.

Signed-off-by: Leo Yan <leo.yan@linaro.org>
---
 drivers/cpufreq/Kconfig      |  5 +++--
 drivers/cpufreq/cpufreq-dt.c | 14 +++++++++++++-
 include/linux/cpufreq-dt.h   | 16 ++++++++++++----
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig
index a171fef..fe1aee1 100644
--- a/drivers/cpufreq/Kconfig
+++ b/drivers/cpufreq/Kconfig
@@ -193,8 +193,9 @@ config CPUFREQ_DT
 	select PM_OPP
 	help
 	  This adds a generic DT based cpufreq driver for frequency management.
-	  It supports both uniprocessor (UP) and symmetric multiprocessor (SMP)
-	  systems which share clock and voltage across all CPUs.
+	  It supports uniprocessor (UP), and symmetric multiprocessor (SMP)
+	  systems which share clock and voltage across all CPUs; and it also
+	  supports cluster level or cpu level's clock domain.
 
 	  If in doubt, say N.
 
diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c
index bab67db..c03532c 100644
--- a/drivers/cpufreq/cpufreq-dt.c
+++ b/drivers/cpufreq/cpufreq-dt.c
@@ -294,8 +294,20 @@ static int cpufreq_init(struct cpufreq_policy *policy)
 	policy->cpuinfo.transition_latency = transition_latency;
 
 	pd = cpufreq_get_driver_data();
-	if (!pd || !pd->independent_clocks)
+	if (!pd || pd->clk_domain_boundary == CPUFREQ_DT_CLK_PER_SYS)
 		cpumask_setall(policy->cpus);
+	else if (pd->clk_domain_boundary == CPUFREQ_DT_CLK_PER_CLUSTER)
+		cpumask_copy(policy->cpus, topology_core_cpumask(policy->cpu));
+	else if (pd->clk_domain_boundary != CPUFREQ_DT_CLK_PER_CPU) {
+		/*
+		 * If each CPU has its own clock, don't need bind cpus;
+		 * otherwise will handle wrong parameter.
+		 */
+		dev_err(cpu_dev, "%s: invalid clk boundary value: %d\n",
+			__func__, pd->clk_domain_boundary);
+		ret = -EINVAL;
+		goto out_free_cpufreq_table;
+	}
 
 	of_node_put(np);
 
diff --git a/include/linux/cpufreq-dt.h b/include/linux/cpufreq-dt.h
index 0414009..d6fe6e3 100644
--- a/include/linux/cpufreq-dt.h
+++ b/include/linux/cpufreq-dt.h
@@ -10,13 +10,21 @@
 #ifndef __CPUFREQ_DT_H__
 #define __CPUFREQ_DT_H__
 
+enum cpufreq_dt_clk_type {
+	CPUFREQ_DT_CLK_PER_SYS = 0,
+	CPUFREQ_DT_CLK_PER_CLUSTER,
+	CPUFREQ_DT_CLK_PER_CPU,
+};
+
 struct cpufreq_dt_platform_data {
 	/*
-	 * True when each CPU has its own clock to control its
-	 * frequency, false when all CPUs are controlled by a single
-	 * clock.
+	 * Use this to distinguish three kinds of clock domain:
+	 *
+	 * - all CPUs are controlled by a single clock;
+	 * - all CPUs in cluster share one clock;
+	 * - each CPU has its own clock to control its frequency;
 	 */
-	bool independent_clocks;
+	enum cpufreq_dt_clk_type clk_domain_boundary;
 };
 
 #endif /* __CPUFREQ_DT_H__ */
-- 
1.9.1

[PATCH 1/2] cpufreq-dt: support cluster level clock

[Leo Yan]

In the previous code, cpufreq-dt driver support single clock shared by
all CPUs or every CPU has dedicated clock; but it cannot support cluster
level clock domain, which is very common implementation for ARM SoCs.

So this patch add the support for cluster level clock; which use the
platform parameter "clk_domain_boundary" to indicate whether the clock
domain is bound to system level, cluster level or CPU level.

Signed-off-by: Leo Yan <leo.yan@linaro.org>
---
 drivers/cpufreq/Kconfig      |  5 +++--
 drivers/cpufreq/cpufreq-dt.c | 14 +++++++++++++-
 include/linux/cpufreq-dt.h   | 16 ++++++++++++----
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig
index a171fef..fe1aee1 100644
--- a/drivers/cpufreq/Kconfig
+++ b/drivers/cpufreq/Kconfig
@@ -193,8 +193,9 @@ config CPUFREQ_DT
 	select PM_OPP
 	help
 	  This adds a generic DT based cpufreq driver for frequency management.
-	  It supports both uniprocessor (UP) and symmetric multiprocessor (SMP)
-	  systems which share clock and voltage across all CPUs.
+	  It supports uniprocessor (UP), and symmetric multiprocessor (SMP)
+	  systems which share clock and voltage across all CPUs; and it also
+	  supports cluster level or cpu level's clock domain.
 
 	  If in doubt, say N.
 
diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c
index bab67db..c03532c 100644
--- a/drivers/cpufreq/cpufreq-dt.c
+++ b/drivers/cpufreq/cpufreq-dt.c
@@ -294,8 +294,20 @@ static int cpufreq_init(struct cpufreq_policy *policy)
 	policy->cpuinfo.transition_latency = transition_latency;
 
 	pd = cpufreq_get_driver_data();
-	if (!pd || !pd->independent_clocks)
+	if (!pd || pd->clk_domain_boundary == CPUFREQ_DT_CLK_PER_SYS)
 		cpumask_setall(policy->cpus);
+	else if (pd->clk_domain_boundary == CPUFREQ_DT_CLK_PER_CLUSTER)
+		cpumask_copy(policy->cpus, topology_core_cpumask(policy->cpu));
+	else if (pd->clk_domain_boundary != CPUFREQ_DT_CLK_PER_CPU) {
+		/*
+		 * If each CPU has its own clock, don't need bind cpus;
+		 * otherwise will handle wrong parameter.
+		 */
+		dev_err(cpu_dev, "%s: invalid clk boundary value: %d\n",
+			__func__, pd->clk_domain_boundary);
+		ret = -EINVAL;
+		goto out_free_cpufreq_table;
+	}
 
 	of_node_put(np);
 
diff --git a/include/linux/cpufreq-dt.h b/include/linux/cpufreq-dt.h
index 0414009..d6fe6e3 100644
--- a/include/linux/cpufreq-dt.h
+++ b/include/linux/cpufreq-dt.h
@@ -10,13 +10,21 @@
 #ifndef __CPUFREQ_DT_H__
 #define __CPUFREQ_DT_H__
 
+enum cpufreq_dt_clk_type {
+	CPUFREQ_DT_CLK_PER_SYS = 0,
+	CPUFREQ_DT_CLK_PER_CLUSTER,
+	CPUFREQ_DT_CLK_PER_CPU,
+};
+
 struct cpufreq_dt_platform_data {
 	/*
-	 * True when each CPU has its own clock to control its
-	 * frequency, false when all CPUs are controlled by a single
-	 * clock.
+	 * Use this to distinguish three kinds of clock domain:
+	 *
+	 * - all CPUs are controlled by a single clock;
+	 * - all CPUs in cluster share one clock;
+	 * - each CPU has its own clock to control its frequency;
 	 */
-	bool independent_clocks;
+	enum cpufreq_dt_clk_type clk_domain_boundary;
 };
 
 #endif /* __CPUFREQ_DT_H__ */
-- 
1.9.1

[PATCH 2/2] ARM: mvebu: update cpufreq-dt's platform data

[Leo Yan]

Change to use cpufreq-dt's platform data of clk_domain_boundary; in
the old code the initial value is true, that means every CPU has the
dedicated clock. So assign as CPUFREQ_DT_CLK_PER_CPU.

Signed-off-by: Leo Yan <leo.yan@linaro.org>
---
 arch/arm/mach-mvebu/pmsu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-mvebu/pmsu.c b/arch/arm/mach-mvebu/pmsu.c
index 8b9f5e2..1fd3f89 100644
--- a/arch/arm/mach-mvebu/pmsu.c
+++ b/arch/arm/mach-mvebu/pmsu.c
@@ -573,7 +573,7 @@ int mvebu_pmsu_dfs_request(int cpu)
 }
 
 struct cpufreq_dt_platform_data cpufreq_dt_pd = {
-	.independent_clocks = true,
+	.clk_domain_boundary = CPUFREQ_DT_CLK_PER_CPU,
 };
 
 static int __init armada_xp_pmsu_cpufreq_init(void)
-- 
1.9.1

[PATCH 2/2] ARM: mvebu: update cpufreq-dt's platform data

[Leo Yan]

Change to use cpufreq-dt's platform data of clk_domain_boundary; in
the old code the initial value is true, that means every CPU has the
dedicated clock. So assign as CPUFREQ_DT_CLK_PER_CPU.

Signed-off-by: Leo Yan <leo.yan@linaro.org>
---
 arch/arm/mach-mvebu/pmsu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-mvebu/pmsu.c b/arch/arm/mach-mvebu/pmsu.c
index 8b9f5e2..1fd3f89 100644
--- a/arch/arm/mach-mvebu/pmsu.c
+++ b/arch/arm/mach-mvebu/pmsu.c
@@ -573,7 +573,7 @@ int mvebu_pmsu_dfs_request(int cpu)
 }
 
 struct cpufreq_dt_platform_data cpufreq_dt_pd = {
-	.independent_clocks = true,
+	.clk_domain_boundary = CPUFREQ_DT_CLK_PER_CPU,
 };
 
 static int __init armada_xp_pmsu_cpufreq_init(void)
-- 
1.9.1

Re: [PATCH 1/2] cpufreq-dt: support cluster level clock

[Viresh Kumar]

On 3 March 2015 at 18:33, Leo Yan <leo.yan@linaro.org> wrote:
> In the previous code, cpufreq-dt driver support single clock shared by
> all CPUs or every CPU has dedicated clock; but it cannot support cluster
> level clock domain, which is very common implementation for ARM SoCs.
>
> So this patch add the support for cluster level clock; which use the
> platform parameter "clk_domain_boundary" to indicate whether the clock
> domain is bound to system level, cluster level or CPU level.
>
> Signed-off-by: Leo Yan <leo.yan@linaro.org>

No. We aren't going to do it this way. You just test your current SoC where
all CPUs share clock line. The other SoC that might come later, where
clocks are per cluster, can be handled later.

So, for now you don't need any changes in the driver I believe.

Please let me know if my understanding is wrong somewhere.

--
viresh

Re: [PATCH 1/2] cpufreq-dt: support cluster level clock

[Viresh Kumar]

On 3 March 2015 at 18:33, Leo Yan <leo.yan@linaro.org> wrote:
> In the previous code, cpufreq-dt driver support single clock shared by
> all CPUs or every CPU has dedicated clock; but it cannot support cluster
> level clock domain, which is very common implementation for ARM SoCs.
>
> So this patch add the support for cluster level clock; which use the
> platform parameter "clk_domain_boundary" to indicate whether the clock
> domain is bound to system level, cluster level or CPU level.
>
> Signed-off-by: Leo Yan <leo.yan@linaro.org>

No. We aren't going to do it this way. You just test your current SoC where
all CPUs share clock line. The other SoC that might come later, where
clocks are per cluster, can be handled later.

So, for now you don't need any changes in the driver I believe.

Please let me know if my understanding is wrong somewhere.

--
viresh

[PATCH 1/2] cpufreq-dt: support cluster level clock

[Viresh Kumar]

On 3 March 2015 at 18:33, Leo Yan <leo.yan@linaro.org> wrote:
> In the previous code, cpufreq-dt driver support single clock shared by
> all CPUs or every CPU has dedicated clock; but it cannot support cluster
> level clock domain, which is very common implementation for ARM SoCs.
>
> So this patch add the support for cluster level clock; which use the
> platform parameter "clk_domain_boundary" to indicate whether the clock
> domain is bound to system level, cluster level or CPU level.
>
> Signed-off-by: Leo Yan <leo.yan@linaro.org>

No. We aren't going to do it this way. You just test your current SoC where
all CPUs share clock line. The other SoC that might come later, where
clocks are per cluster, can be handled later.

So, for now you don't need any changes in the driver I believe.

Please let me know if my understanding is wrong somewhere.

--
viresh

Re: [PATCH 1/2] cpufreq-dt: support cluster level clock

[Leo Yan]

On Tue, Mar 03, 2015 at 06:40:23PM +0530, Viresh Kumar wrote:
> On 3 March 2015 at 18:33, Leo Yan <leo.yan@linaro.org> wrote:
> > In the previous code, cpufreq-dt driver support single clock shared by
> > all CPUs or every CPU has dedicated clock; but it cannot support cluster
> > level clock domain, which is very common implementation for ARM SoCs.
> >
> > So this patch add the support for cluster level clock; which use the
> > platform parameter "clk_domain_boundary" to indicate whether the clock
> > domain is bound to system level, cluster level or CPU level.
> >
> > Signed-off-by: Leo Yan <leo.yan@linaro.org>
> 
> No. We aren't going to do it this way. You just test your current SoC where
> all CPUs share clock line. The other SoC that might come later, where
> clocks are per cluster, can be handled later.
> 
> So, for now you don't need any changes in the driver I believe.

Correct, current SoC shares one clock line.

I'm just thinking to finish things in one time. From my previous
experience, clocks per cluster are common cases for ARM's
multi-clusters, so i think it's reasonable to add related support.

Regarding of testing this patch, i created two virtual clocks for
every cluster and passed the test. Do u think this is acceptable?

Thanks,
Leo Yan

Re: [PATCH 1/2] cpufreq-dt: support cluster level clock

[Leo Yan]

On Tue, Mar 03, 2015 at 06:40:23PM +0530, Viresh Kumar wrote:
> On 3 March 2015 at 18:33, Leo Yan <leo.yan@linaro.org> wrote:
> > In the previous code, cpufreq-dt driver support single clock shared by
> > all CPUs or every CPU has dedicated clock; but it cannot support cluster
> > level clock domain, which is very common implementation for ARM SoCs.
> >
> > So this patch add the support for cluster level clock; which use the
> > platform parameter "clk_domain_boundary" to indicate whether the clock
> > domain is bound to system level, cluster level or CPU level.
> >
> > Signed-off-by: Leo Yan <leo.yan@linaro.org>
> 
> No. We aren't going to do it this way. You just test your current SoC where
> all CPUs share clock line. The other SoC that might come later, where
> clocks are per cluster, can be handled later.
> 
> So, for now you don't need any changes in the driver I believe.

Correct, current SoC shares one clock line.

I'm just thinking to finish things in one time. From my previous
experience, clocks per cluster are common cases for ARM's
multi-clusters, so i think it's reasonable to add related support.

Regarding of testing this patch, i created two virtual clocks for
every cluster and passed the test. Do u think this is acceptable?

Thanks,
Leo Yan

[PATCH 1/2] cpufreq-dt: support cluster level clock

[Leo Yan]

On Tue, Mar 03, 2015 at 06:40:23PM +0530, Viresh Kumar wrote:
> On 3 March 2015 at 18:33, Leo Yan <leo.yan@linaro.org> wrote:
> > In the previous code, cpufreq-dt driver support single clock shared by
> > all CPUs or every CPU has dedicated clock; but it cannot support cluster
> > level clock domain, which is very common implementation for ARM SoCs.
> >
> > So this patch add the support for cluster level clock; which use the
> > platform parameter "clk_domain_boundary" to indicate whether the clock
> > domain is bound to system level, cluster level or CPU level.
> >
> > Signed-off-by: Leo Yan <leo.yan@linaro.org>
> 
> No. We aren't going to do it this way. You just test your current SoC where
> all CPUs share clock line. The other SoC that might come later, where
> clocks are per cluster, can be handled later.
> 
> So, for now you don't need any changes in the driver I believe.

Correct, current SoC shares one clock line.

I'm just thinking to finish things in one time. From my previous
experience, clocks per cluster are common cases for ARM's
multi-clusters, so i think it's reasonable to add related support.

Regarding of testing this patch, i created two virtual clocks for
every cluster and passed the test. Do u think this is acceptable?

Thanks,
Leo Yan

Re: [PATCH 1/2] cpufreq-dt: support cluster level clock

[Viresh Kumar]

On 3 March 2015 at 19:33, Leo Yan <leo.yan@linaro.org> wrote:
> I'm just thinking to finish things in one time. From my previous
> experience, clocks per cluster are common cases for ARM's
> multi-clusters, so i think it's reasonable to add related support.

Yes they are common, but that will be fixed with new OPP bindings
I am working on [1].

> Regarding of testing this patch, i created two virtual clocks for
> every cluster and passed the test. Do u think this is acceptable?

Just to confirm again, we aren't going to accept or apply these
patches. It will work without any changes for you, for now.

--
viresh

[1] https://www.marc.info/?l=linaro-kernel&m=142364262800650&w=3

Re: [PATCH 1/2] cpufreq-dt: support cluster level clock

[Viresh Kumar]

On 3 March 2015 at 19:33, Leo Yan <leo.yan@linaro.org> wrote:
> I'm just thinking to finish things in one time. From my previous
> experience, clocks per cluster are common cases for ARM's
> multi-clusters, so i think it's reasonable to add related support.

Yes they are common, but that will be fixed with new OPP bindings
I am working on [1].

> Regarding of testing this patch, i created two virtual clocks for
> every cluster and passed the test. Do u think this is acceptable?

Just to confirm again, we aren't going to accept or apply these
patches. It will work without any changes for you, for now.

--
viresh

[1] https://www.marc.info/?l=linaro-kernel&m=142364262800650&w=3

[PATCH 1/2] cpufreq-dt: support cluster level clock

[Viresh Kumar]

On 3 March 2015 at 19:33, Leo Yan <leo.yan@linaro.org> wrote:
> I'm just thinking to finish things in one time. From my previous
> experience, clocks per cluster are common cases for ARM's
> multi-clusters, so i think it's reasonable to add related support.

Yes they are common, but that will be fixed with new OPP bindings
I am working on [1].

> Regarding of testing this patch, i created two virtual clocks for
> every cluster and passed the test. Do u think this is acceptable?

Just to confirm again, we aren't going to accept or apply these
patches. It will work without any changes for you, for now.

--
viresh

[1] https://www.marc.info/?l=linaro-kernel&m=142364262800650&w=3

Re: [PATCH 1/2] cpufreq-dt: support cluster level clock

[Leo Yan]

On Tue, Mar 03, 2015 at 08:49:25PM +0530, Viresh Kumar wrote:
> On 3 March 2015 at 19:33, Leo Yan <leo.yan@linaro.org> wrote:
> > I'm just thinking to finish things in one time. From my previous
> > experience, clocks per cluster are common cases for ARM's
> > multi-clusters, so i think it's reasonable to add related support.
> 
> Yes they are common, but that will be fixed with new OPP bindings
> I am working on [1].

Good to know this and looking forward the patches...

> > Regarding of testing this patch, i created two virtual clocks for
> > every cluster and passed the test. Do u think this is acceptable?
> 
> Just to confirm again, we aren't going to accept or apply these
> patches. It will work without any changes for you, for now.

OK, i will go back to just support for the case of one clock source.

> --
> viresh
> 
> [1] https://www.marc.info/?l=linaro-kernel&m=142364262800650&w=3

Re: [PATCH 1/2] cpufreq-dt: support cluster level clock

[Leo Yan]

On Tue, Mar 03, 2015 at 08:49:25PM +0530, Viresh Kumar wrote:
> On 3 March 2015 at 19:33, Leo Yan <leo.yan@linaro.org> wrote:
> > I'm just thinking to finish things in one time. From my previous
> > experience, clocks per cluster are common cases for ARM's
> > multi-clusters, so i think it's reasonable to add related support.
> 
> Yes they are common, but that will be fixed with new OPP bindings
> I am working on [1].

Good to know this and looking forward the patches...

> > Regarding of testing this patch, i created two virtual clocks for
> > every cluster and passed the test. Do u think this is acceptable?
> 
> Just to confirm again, we aren't going to accept or apply these
> patches. It will work without any changes for you, for now.

OK, i will go back to just support for the case of one clock source.

> --
> viresh
> 
> [1] https://www.marc.info/?l=linaro-kernel&m=142364262800650&w=3

[PATCH 1/2] cpufreq-dt: support cluster level clock

[Leo Yan]

On Tue, Mar 03, 2015 at 08:49:25PM +0530, Viresh Kumar wrote:
> On 3 March 2015 at 19:33, Leo Yan <leo.yan@linaro.org> wrote:
> > I'm just thinking to finish things in one time. From my previous
> > experience, clocks per cluster are common cases for ARM's
> > multi-clusters, so i think it's reasonable to add related support.
> 
> Yes they are common, but that will be fixed with new OPP bindings
> I am working on [1].

Good to know this and looking forward the patches...

> > Regarding of testing this patch, i created two virtual clocks for
> > every cluster and passed the test. Do u think this is acceptable?
> 
> Just to confirm again, we aren't going to accept or apply these
> patches. It will work without any changes for you, for now.

OK, i will go back to just support for the case of one clock source.

> --
> viresh
> 
> [1] https://www.marc.info/?l=linaro-kernel&m=142364262800650&w=3