From patchwork Fri Aug 25 14:32:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dietmar Eggemann X-Patchwork-Id: 111022 Delivered-To: patch@linaro.org Received: by 10.37.128.210 with SMTP id c18csp1045611ybm; Fri, 25 Aug 2017 07:32:48 -0700 (PDT) X-Received: by 10.84.241.131 with SMTP id b3mr11095648pll.347.1503671568040; Fri, 25 Aug 2017 07:32:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503671568; cv=none; d=google.com; s=arc-20160816; b=wBjs78DgflUKKWX5l2JZxKFuzamlNYZ8vXT67nw2m4ZaOP+W3pgurS8N6LKJxskP3C LPoUTMewcp1IuenD80RV6yXMvXKfsX2X8aLsjbyERZsJIugrtNtYyMZGvx22VWL2HpqY 8De5fq8tWQ/LpEOc0PpjP80ilnm9cw24L6XY+uBr61JeFXHqLGlMyEqbnkmQNddSOtOw GKXk+O8mClvJq0kubJy/HuxND62nZkVusfycibPHeEcCWWNo4KIHOkxOmc8aE/TXcmKr y9Ap93KMNbaf7gY1ojfrjbi49OxkNRw7Yz91vTsk+JNb6wNJbyGMzoWv+tIAKYiS9E0i Wn7g== 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=nCr9J90upXbee+JCUv5Zmvv+OWBcT6kUmo/KmHuOaiw=; b=jLI9Ddaxxq5DldBEt9FEYl9tYhrqspA5VJRUfd82yhK+NYNtM4PLOdDd+Qn3hhPPJV Fdfrt8LL1e15u4f3G5klr2jbCb9tJY0yf7Bzdqq9lHR+rsnqlYOL3+o+rJ9d3h4qoR/s 1eO1hei37g/2Ljd3HvnyDagkXN1JfZ1XsFO55J5ft7ZhUw8gFJhPV2G2D4xipblCJ+7s Yo/+peGsaJ5WcGrnKsYhtdvTSfPrdfeMjr0jZYcZSkiQBF9bVI4rQR3avl17iw7YEfrG Zf86G2MRvdWGCL/Ge/03mbZt9asaCQEeWcmAsZxy+dFg/ssYrJ2MrR5yecn4RAEi8LSS rIMw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-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 a1si5061466pln.371.2017.08.25.07.32.47; Fri, 25 Aug 2017 07:32:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-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-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932866AbdHYOcq (ORCPT + 12 others); Fri, 25 Aug 2017 10:32:46 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:54124 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932735AbdHYOcp (ORCPT ); Fri, 25 Aug 2017 10:32:45 -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 DCD5D1AFA; Fri, 25 Aug 2017 07:32:44 -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 EAF543F540; Fri, 25 Aug 2017 07:32:42 -0700 (PDT) From: Dietmar Eggemann To: linux-kernel@vger.kernel.org Cc: linux-pm@vger.kernel.org, linux@arm.linux.org.uk, Greg Kroah-Hartman , Juri Lelli , Vincent Guittot , Peter Zijlstra , Morten Rasmussen , Viresh Kumar , "Rafael J . Wysocki" , Sudeep Holla Subject: [PATCH v4 08/10] arm: wire cpu-invariant accounting support up to the task scheduler Date: Fri, 25 Aug 2017 15:32:04 +0100 Message-Id: <20170825143206.30467-9-dietmar.eggemann@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170825143206.30467-1-dietmar.eggemann@arm.com> References: <20170825143206.30467-1-dietmar.eggemann@arm.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Commit 8cd5601c5060 ("sched/fair: Convert arch_scale_cpu_capacity() from weak function to #define") changed the wiring which now has to be done by associating arch_scale_cpu_capacity with the actual implementation provided by the architecture. Define arch_scale_cpu_capacity to use the arch_topology "driver" function topology_get_cpu_scale() for the task scheduler's cpu-invariant accounting instead of the default arch_scale_cpu_capacity() in kernel/sched/sched.h. Cc: Russell King Cc: Juri Lelli Signed-off-by: Dietmar Eggemann Acked-by: Vincent Guittot Acked-by: Russell King Tested-by: Juri Lelli Reviewed-by: Juri Lelli --- arch/arm/include/asm/topology.h | 3 +++ 1 file changed, 3 insertions(+) -- 2.11.0 diff --git a/arch/arm/include/asm/topology.h b/arch/arm/include/asm/topology.h index a56a9e24f4c0..b713e7223bc4 100644 --- a/arch/arm/include/asm/topology.h +++ b/arch/arm/include/asm/topology.h @@ -29,6 +29,9 @@ const struct cpumask *cpu_coregroup_mask(int cpu); /* Replace task scheduler's default frequency-invariant accounting */ #define arch_scale_freq_capacity topology_get_freq_scale +/* Replace task scheduler's default cpu-invariant accounting */ +#define arch_scale_cpu_capacity topology_get_cpu_scale + #else static inline void init_cpu_topology(void) { }