From patchwork Thu Jun 8 07:55:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dietmar Eggemann X-Patchwork-Id: 103341 Delivered-To: patch@linaro.org Received: by 10.182.29.35 with SMTP id g3csp2123788obh; Thu, 8 Jun 2017 00:56:26 -0700 (PDT) X-Received: by 10.98.78.70 with SMTP id c67mr10846649pfb.155.1496908586580; Thu, 08 Jun 2017 00:56:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496908586; cv=none; d=google.com; s=arc-20160816; b=X3pDMSKf+WYVDNCyBQkxc6K3OAm6vQxGqnZE3C3Nmf0hsMAF4dAWDfGnl8f9Jyxgke Wp+wrw8XslvCugWHj9nl1PiqFDJEfWRtzR2elv47UEV84+buy2Un+ghQ6kR3hTuy3fUE XTqHqLwCMmkONZxvQvnUa8wjkduJuL3qyUoXx1pv+LyfpUayGw8lUl26H/Gd3Btkost/ 4Jmd/yLF9ZbBysuq2KC4SS2DoD9y4K+Xuuw4mOU0+hUTKtOfzPPHirX1MVEvcBMTGox/ zxDCorbvFmNxKxfyglBLrXAaiqFT7l36AIdJO3jQ4NC/MD1xptRw0qVsVbCkzQa5kebO WmxQ== 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=uZ1tOuXvdIpsx3CTkJoPB0/p9WdcdzNCvlfbwE86wDM=; b=SloD7ZMpGqRJNG/TnQL4pQwZxIGRRWUUhNuN4wSj3Ov/qABReedB1VaVJD5JeKY/Ev +dG7ar9yiNZ/+EJYPbeOKDLClQUPGq9o0vSmQ2vdRZbtH0BNx5qvuoYISgfQY0olC5ag T/AmRhz3BlUFCOCuaPVva1F6X+4pynMz8tpjKBm//CNHYKgfuwwL7zAhcXPUthhJsMz+ NLIV2Zdt8ChBJX1tQMOQMMHfQSGfM0l7htQJJSvhjSW9HGoqQM7+jenA+z2rY4ddXY4R 6XWSV8bx56m8ILN0+//4QFVOt637EJfSInz98YwRibT40EsAOHVLN1/FnFwSCzHuGB9h WQzg== 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 x12si3869049pgc.126.2017.06.08.00.56.26; Thu, 08 Jun 2017 00:56:26 -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 S1751944AbdFHHzu (ORCPT + 25 others); Thu, 8 Jun 2017 03:55:50 -0400 Received: from foss.arm.com ([217.140.101.70]:43258 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751902AbdFHHzs (ORCPT ); Thu, 8 Jun 2017 03:55:48 -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 F3317168F; Thu, 8 Jun 2017 00:55:42 -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 0504E3F3E1; Thu, 8 Jun 2017 00:55:40 -0700 (PDT) From: Dietmar Eggemann To: linux-kernel@vger.kernel.org Cc: linux-pm@vger.kernel.org, linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org, Greg Kroah-Hartman , Russell King , Catalin Marinas , Will Deacon , Juri Lelli , Vincent Guittot , Peter Zijlstra , Morten Rasmussen Subject: [PATCH 4/6] arm: wire cpu-invariant accounting support up to the task scheduler Date: Thu, 8 Jun 2017 08:55:11 +0100 Message-Id: <20170608075513.12475-5-dietmar.eggemann@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170608075513.12475-1-dietmar.eggemann@arm.com> References: <20170608075513.12475-1-dietmar.eggemann@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 --- 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) { }