From: Dietmar Eggemann <dietmar.eggemann@arm.com> To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-renesas-soc@vger.kernel.org Cc: Russell King <linux@armlinux.org.uk>, Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Kukjin Kim <kgene@kernel.org>, Krzysztof Kozlowski <krzk@kernel.org>, Vincent Guittot <vincent.guittot@linaro.org>, Juri Lelli <juri.lelli@arm.com> Subject: [PATCH 1/4] arm: topology: remove cpu_efficiency Date: Wed, 30 Aug 2017 15:41:17 +0100 [thread overview] Message-ID: <20170830144120.9312-2-dietmar.eggemann@arm.com> (raw) In-Reply-To: <20170830144120.9312-1-dietmar.eggemann@arm.com> Remove the 'cpu_efficiency/clock-frequency dt property' based solution to set cpu capacity which was only working for Cortex-A15/A7 arm big.LITTLE systems. I.e. the 'capacity-dmips-mhz' based solution is now the only one. It is shared between arm and arm64 and works for every big.LITTLE system no matter which core types it consists of. Cc: Russell King <linux@arm.linux.org.uk> Cc: Vincent Guittot <vincent.guittot@linaro.org> Cc: Juri Lelli <juri.lelli@arm.com> Signed-off-by: Dietmar Eggemann <dietmar.eggemann@arm.com> --- arch/arm/kernel/topology.c | 113 ++------------------------------------------- 1 file changed, 3 insertions(+), 110 deletions(-) diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c index bf949a763dbe..04ccfdd94213 100644 --- a/arch/arm/kernel/topology.c +++ b/arch/arm/kernel/topology.c @@ -47,52 +47,10 @@ */ #ifdef CONFIG_OF -struct cpu_efficiency { - const char *compatible; - unsigned long efficiency; -}; - -/* - * Table of relative efficiency of each processors - * The efficiency value must fit in 20bit and the final - * cpu_scale value must be in the range - * 0 < cpu_scale < 3*SCHED_CAPACITY_SCALE/2 - * in order to return at most 1 when DIV_ROUND_CLOSEST - * is used to compute the capacity of a CPU. - * Processors that are not defined in the table, - * use the default SCHED_CAPACITY_SCALE value for cpu_scale. - */ -static const struct cpu_efficiency table_efficiency[] = { - {"arm,cortex-a15", 3891}, - {"arm,cortex-a7", 2048}, - {NULL, }, -}; - -static unsigned long *__cpu_capacity; -#define cpu_capacity(cpu) __cpu_capacity[cpu] - -static unsigned long middle_capacity = 1; -static bool cap_from_dt = true; - -/* - * Iterate all CPUs' descriptor in DT and compute the efficiency - * (as per table_efficiency). Also calculate a middle efficiency - * as close as possible to (max{eff_i} - min{eff_i}) / 2 - * This is later used to scale the cpu_capacity field such that an - * 'average' CPU is of middle capacity. Also see the comments near - * table_efficiency[] and update_cpu_capacity(). - */ static void __init parse_dt_topology(void) { - const struct cpu_efficiency *cpu_eff; - struct device_node *cn = NULL; - unsigned long min_capacity = ULONG_MAX; - unsigned long max_capacity = 0; - unsigned long capacity = 0; - int cpu = 0; - - __cpu_capacity = kcalloc(nr_cpu_ids, sizeof(*__cpu_capacity), - GFP_NOWAIT); + struct device_node *cn; + int cpu; cn = of_find_node_by_path("/cpus"); if (!cn) { @@ -101,9 +59,6 @@ static void __init parse_dt_topology(void) } for_each_possible_cpu(cpu) { - const u32 *rate; - int len; - /* too early to use cpu->of_node */ cn = of_get_cpu_node(cpu, NULL); if (!cn) { @@ -115,73 +70,13 @@ static void __init parse_dt_topology(void) of_node_put(cn); continue; } - - cap_from_dt = false; - - for (cpu_eff = table_efficiency; cpu_eff->compatible; cpu_eff++) - if (of_device_is_compatible(cn, cpu_eff->compatible)) - break; - - if (cpu_eff->compatible == NULL) - continue; - - rate = of_get_property(cn, "clock-frequency", &len); - if (!rate || len != 4) { - pr_err("%s missing clock-frequency property\n", - cn->full_name); - continue; - } - - capacity = ((be32_to_cpup(rate)) >> 20) * cpu_eff->efficiency; - - /* Save min capacity of the system */ - if (capacity < min_capacity) - min_capacity = capacity; - - /* Save max capacity of the system */ - if (capacity > max_capacity) - max_capacity = capacity; - - cpu_capacity(cpu) = capacity; } - /* If min and max capacities are equals, we bypass the update of the - * cpu_scale because all CPUs have the same capacity. Otherwise, we - * compute a middle_capacity factor that will ensure that the capacity - * of an 'average' CPU of the system will be as close as possible to - * SCHED_CAPACITY_SCALE, which is the default value, but with the - * constraint explained near table_efficiency[]. - */ - if (4*max_capacity < (3*(max_capacity + min_capacity))) - middle_capacity = (min_capacity + max_capacity) - >> (SCHED_CAPACITY_SHIFT+1); - else - middle_capacity = ((max_capacity / 3) - >> (SCHED_CAPACITY_SHIFT-1)) + 1; - - if (cap_from_dt) - topology_normalize_cpu_scale(); -} - -/* - * Look for a customed capacity of a CPU in the cpu_capacity table during the - * boot. The update of all CPUs is in O(n^2) for heteregeneous system but the - * function returns directly for SMP system. - */ -static void update_cpu_capacity(unsigned int cpu) -{ - if (!cpu_capacity(cpu) || cap_from_dt) - return; - - topology_set_cpu_scale(cpu, cpu_capacity(cpu) / middle_capacity); - - pr_info("CPU%u: update cpu_capacity %lu\n", - cpu, topology_get_cpu_scale(NULL, cpu)); + topology_normalize_cpu_scale(); } #else static inline void parse_dt_topology(void) {} -static inline void update_cpu_capacity(unsigned int cpuid) {} #endif /* @@ -277,8 +172,6 @@ void store_cpu_topology(unsigned int cpuid) update_siblings_masks(cpuid); - update_cpu_capacity(cpuid); - pr_info("CPU%u: thread %d, cpu %d, socket %d, mpidr %x\n", cpuid, cpu_topology[cpuid].thread_id, cpu_topology[cpuid].core_id, -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: dietmar.eggemann@arm.com (Dietmar Eggemann) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/4] arm: topology: remove cpu_efficiency Date: Wed, 30 Aug 2017 15:41:17 +0100 [thread overview] Message-ID: <20170830144120.9312-2-dietmar.eggemann@arm.com> (raw) In-Reply-To: <20170830144120.9312-1-dietmar.eggemann@arm.com> Remove the 'cpu_efficiency/clock-frequency dt property' based solution to set cpu capacity which was only working for Cortex-A15/A7 arm big.LITTLE systems. I.e. the 'capacity-dmips-mhz' based solution is now the only one. It is shared between arm and arm64 and works for every big.LITTLE system no matter which core types it consists of. Cc: Russell King <linux@arm.linux.org.uk> Cc: Vincent Guittot <vincent.guittot@linaro.org> Cc: Juri Lelli <juri.lelli@arm.com> Signed-off-by: Dietmar Eggemann <dietmar.eggemann@arm.com> --- arch/arm/kernel/topology.c | 113 ++------------------------------------------- 1 file changed, 3 insertions(+), 110 deletions(-) diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c index bf949a763dbe..04ccfdd94213 100644 --- a/arch/arm/kernel/topology.c +++ b/arch/arm/kernel/topology.c @@ -47,52 +47,10 @@ */ #ifdef CONFIG_OF -struct cpu_efficiency { - const char *compatible; - unsigned long efficiency; -}; - -/* - * Table of relative efficiency of each processors - * The efficiency value must fit in 20bit and the final - * cpu_scale value must be in the range - * 0 < cpu_scale < 3*SCHED_CAPACITY_SCALE/2 - * in order to return@most 1 when DIV_ROUND_CLOSEST - * is used to compute the capacity of a CPU. - * Processors that are not defined in the table, - * use the default SCHED_CAPACITY_SCALE value for cpu_scale. - */ -static const struct cpu_efficiency table_efficiency[] = { - {"arm,cortex-a15", 3891}, - {"arm,cortex-a7", 2048}, - {NULL, }, -}; - -static unsigned long *__cpu_capacity; -#define cpu_capacity(cpu) __cpu_capacity[cpu] - -static unsigned long middle_capacity = 1; -static bool cap_from_dt = true; - -/* - * Iterate all CPUs' descriptor in DT and compute the efficiency - * (as per table_efficiency). Also calculate a middle efficiency - * as close as possible to (max{eff_i} - min{eff_i}) / 2 - * This is later used to scale the cpu_capacity field such that an - * 'average' CPU is of middle capacity. Also see the comments near - * table_efficiency[] and update_cpu_capacity(). - */ static void __init parse_dt_topology(void) { - const struct cpu_efficiency *cpu_eff; - struct device_node *cn = NULL; - unsigned long min_capacity = ULONG_MAX; - unsigned long max_capacity = 0; - unsigned long capacity = 0; - int cpu = 0; - - __cpu_capacity = kcalloc(nr_cpu_ids, sizeof(*__cpu_capacity), - GFP_NOWAIT); + struct device_node *cn; + int cpu; cn = of_find_node_by_path("/cpus"); if (!cn) { @@ -101,9 +59,6 @@ static void __init parse_dt_topology(void) } for_each_possible_cpu(cpu) { - const u32 *rate; - int len; - /* too early to use cpu->of_node */ cn = of_get_cpu_node(cpu, NULL); if (!cn) { @@ -115,73 +70,13 @@ static void __init parse_dt_topology(void) of_node_put(cn); continue; } - - cap_from_dt = false; - - for (cpu_eff = table_efficiency; cpu_eff->compatible; cpu_eff++) - if (of_device_is_compatible(cn, cpu_eff->compatible)) - break; - - if (cpu_eff->compatible == NULL) - continue; - - rate = of_get_property(cn, "clock-frequency", &len); - if (!rate || len != 4) { - pr_err("%s missing clock-frequency property\n", - cn->full_name); - continue; - } - - capacity = ((be32_to_cpup(rate)) >> 20) * cpu_eff->efficiency; - - /* Save min capacity of the system */ - if (capacity < min_capacity) - min_capacity = capacity; - - /* Save max capacity of the system */ - if (capacity > max_capacity) - max_capacity = capacity; - - cpu_capacity(cpu) = capacity; } - /* If min and max capacities are equals, we bypass the update of the - * cpu_scale because all CPUs have the same capacity. Otherwise, we - * compute a middle_capacity factor that will ensure that the capacity - * of an 'average' CPU of the system will be as close as possible to - * SCHED_CAPACITY_SCALE, which is the default value, but with the - * constraint explained near table_efficiency[]. - */ - if (4*max_capacity < (3*(max_capacity + min_capacity))) - middle_capacity = (min_capacity + max_capacity) - >> (SCHED_CAPACITY_SHIFT+1); - else - middle_capacity = ((max_capacity / 3) - >> (SCHED_CAPACITY_SHIFT-1)) + 1; - - if (cap_from_dt) - topology_normalize_cpu_scale(); -} - -/* - * Look for a customed capacity of a CPU in the cpu_capacity table during the - * boot. The update of all CPUs is in O(n^2) for heteregeneous system but the - * function returns directly for SMP system. - */ -static void update_cpu_capacity(unsigned int cpu) -{ - if (!cpu_capacity(cpu) || cap_from_dt) - return; - - topology_set_cpu_scale(cpu, cpu_capacity(cpu) / middle_capacity); - - pr_info("CPU%u: update cpu_capacity %lu\n", - cpu, topology_get_cpu_scale(NULL, cpu)); + topology_normalize_cpu_scale(); } #else static inline void parse_dt_topology(void) {} -static inline void update_cpu_capacity(unsigned int cpuid) {} #endif /* @@ -277,8 +172,6 @@ void store_cpu_topology(unsigned int cpuid) update_siblings_masks(cpuid); - update_cpu_capacity(cpuid); - pr_info("CPU%u: thread %d, cpu %d, socket %d, mpidr %x\n", cpuid, cpu_topology[cpuid].thread_id, cpu_topology[cpuid].core_id, -- 2.11.0
next prev parent reply other threads:[~2017-08-30 14:41 UTC|newest] Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-08-30 14:41 [PATCH 0/4] arm: remove cpu_efficiency Dietmar Eggemann 2017-08-30 14:41 ` Dietmar Eggemann 2017-08-30 14:41 ` Dietmar Eggemann [this message] 2017-08-30 14:41 ` [PATCH 1/4] arm: topology: " Dietmar Eggemann 2017-09-04 7:49 ` Vincent Guittot 2017-09-04 7:49 ` Vincent Guittot 2017-09-04 7:49 ` Vincent Guittot 2017-09-06 11:43 ` Dietmar Eggemann 2017-09-06 11:43 ` Dietmar Eggemann 2017-09-06 12:40 ` Vincent Guittot 2017-09-06 12:40 ` Vincent Guittot 2017-09-06 12:40 ` Vincent Guittot 2017-09-07 10:41 ` Dietmar Eggemann 2017-09-07 10:41 ` Dietmar Eggemann 2017-08-30 14:41 ` [PATCH 2/4] arm: dts: exynos: add exynos5420 cpu capacity-dmips-mhz information Dietmar Eggemann 2017-08-30 14:41 ` Dietmar Eggemann 2017-08-30 14:41 ` Dietmar Eggemann 2017-08-30 20:26 ` Krzysztof Kozlowski 2017-08-30 20:26 ` Krzysztof Kozlowski 2017-08-30 20:26 ` Krzysztof Kozlowski 2017-08-31 10:36 ` Dietmar Eggemann 2017-08-31 10:36 ` Dietmar Eggemann 2017-09-03 19:56 ` Krzysztof Kozlowski 2017-09-03 19:56 ` Krzysztof Kozlowski 2017-09-06 11:47 ` Dietmar Eggemann 2017-09-06 11:47 ` Dietmar Eggemann 2017-09-06 11:47 ` Dietmar Eggemann 2017-09-17 7:37 ` Krzysztof Kozlowski 2017-09-17 7:37 ` Krzysztof Kozlowski 2017-08-30 14:41 ` [PATCH 3/4] arm: dts: exynos: add exynos5422 " Dietmar Eggemann 2017-08-30 14:41 ` Dietmar Eggemann 2017-08-30 14:41 ` Dietmar Eggemann 2017-09-17 7:37 ` Krzysztof Kozlowski 2017-09-17 7:37 ` Krzysztof Kozlowski 2017-08-30 14:41 ` [PATCH 4/4] arm: dts: r8a7790: add " Dietmar Eggemann 2017-08-30 14:41 ` Dietmar Eggemann 2017-09-18 7:39 ` Simon Horman 2017-09-18 7:39 ` Simon Horman 2017-10-09 17:55 ` Dietmar Eggemann 2017-10-09 17:55 ` Dietmar Eggemann
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170830144120.9312-2-dietmar.eggemann@arm.com \ --to=dietmar.eggemann@arm.com \ --cc=devicetree@vger.kernel.org \ --cc=juri.lelli@arm.com \ --cc=kgene@kernel.org \ --cc=krzk@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=mark.rutland@arm.com \ --cc=robh+dt@kernel.org \ --cc=vincent.guittot@linaro.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.