From patchwork Thu Oct 12 14:00:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dietmar Eggemann X-Patchwork-Id: 115632 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp1790823edb; Thu, 12 Oct 2017 07:01:25 -0700 (PDT) X-Google-Smtp-Source: AOwi7QATYKCRgbEppAwfMJcLIE6joDLr3Nxs22iTz3mNxhuBA5ooQG50hIEAR1LjmUgdXlqXxPKS X-Received: by 10.84.132.104 with SMTP id 95mr318432ple.231.1507816885341; Thu, 12 Oct 2017 07:01:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507816885; cv=none; d=google.com; s=arc-20160816; b=x3jccuyRpsRKz6X3g350TWh5DG/8uvl4RokmBQKQTIBqnsnAbFA8t1e16+niYy7UsV VB9jPc3SsBmtn+vJxuMQvJ1Dx+Wr2WdxfEfUqgA+plP2VSPTYY+C6WMf+OKrPwxVoB6T NWcXaz82laL1nrTqMFxvqkN1bilYiAyHuE7XrtPTaM3f6+5I/naiS13AT8YdWW+3N9nj Wi1055W4meMjie5NCn9Xl4by09HAsvda8Mi0eaqqHy9/LKMFN0EkYyqn/2vEjcJuOwa/ B0eXrFRd16/7KMSxaV9sKizEYhtucZeHbASqtWfGoBXIHLWeC5LfcvILA/1JYAUWNJBT Ob/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=O2Zm5MesZht1C+B56pubJ07AM4aj4EJG8u5p5MwFNPg=; b=Ktc8Q8hPUsp9fD9bbEwyMqXkv6IyV+8CVU1Fg9Eo5/9aVxi5IHO39JFdhLkar60orQ 5oXjc0rr9XB1giEUJrw6jPD4tvnkegaLEeKykxfFhbq4lzzFetATkn8MSMhE8y/iebfJ +syBHRXaARTGYWdS9oLsEG3j+OBC1Jt3HK9Ncnrk6jCY+xMN0pHpb/7MUTsmh59qFinP JKNc4lcn3Gvql0fUp5g/r+CxOj5Q1MA+H+PRQMV1DuD5nqjhGjp7QW5E0JXyMlYwzBzx 80kXd55RCiK4ItQiUs+xfhAuGxIa7mTxEm5o2UCQr40ez9vbiNAcCyLr9p238A0oDXzG N2mw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t16si8073194pgo.542.2017.10.12.07.01.24; Thu, 12 Oct 2017 07:01:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752545AbdJLOBX (ORCPT + 27 others); Thu, 12 Oct 2017 10:01:23 -0400 Received: from foss.arm.com ([217.140.101.70]:47546 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751356AbdJLOA5 (ORCPT ); Thu, 12 Oct 2017 10:00:57 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 7F7DD15BE; Thu, 12 Oct 2017 07:00:57 -0700 (PDT) Received: from e107985-lin.cambridge.arm.com (e107985-lin.cambridge.arm.com [10.1.210.41]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 65E5D3F483; Thu, 12 Oct 2017 07:00:56 -0700 (PDT) From: Dietmar Eggemann To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Russell King , Vincent Guittot , Juri Lelli Subject: [PATCH v2 1/1] arm: topology: remove cpu_efficiency Date: Thu, 12 Oct 2017 15:00:28 +0100 Message-Id: <20171012140028.21599-2-dietmar.eggemann@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171012140028.21599-1-dietmar.eggemann@arm.com> References: <20171012140028.21599-1-dietmar.eggemann@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: Vincent Guittot Cc: Juri Lelli Signed-off-by: Dietmar Eggemann --- arch/arm/kernel/topology.c | 132 ++------------------------------------------- 1 file changed, 4 insertions(+), 128 deletions(-) -- 2.11.0 diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c index 24ac3cab411d..15cc131ae387 100644 --- a/arch/arm/kernel/topology.c +++ b/arch/arm/kernel/topology.c @@ -30,69 +30,11 @@ #include #include -/* - * cpu capacity scale management - */ - -/* - * cpu capacity table - * This per cpu data structure describes the relative capacity of each core. - * On a heteregenous system, cores don't have the same computation capacity - * and we reflect that difference in the cpu_capacity field so the scheduler - * can take this difference into account during load balance. A per cpu - * structure is preferred because each CPU updates its own cpu_capacity field - * during the load balance except for idle cores. One idle core is selected - * to run the rebalance_domains for all idle cores and the cpu_capacity can be - * updated during this sequence. - */ - #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 +43,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) { @@ -111,76 +50,15 @@ static void __init parse_dt_topology(void) continue; } - if (topology_parse_cpu_capacity(cn, cpu)) { + if (topology_parse_cpu_capacity(cn, cpu)) 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("%pOF missing clock-frequency property\n", cn); - 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 /* @@ -276,8 +154,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,