From patchwork Thu Jul 6 09:49:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dietmar Eggemann X-Patchwork-Id: 107100 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp1881947qge; Thu, 6 Jul 2017 02:51:00 -0700 (PDT) X-Received: by 10.84.133.38 with SMTP id 35mr15357702plf.141.1499334659799; Thu, 06 Jul 2017 02:50:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499334659; cv=none; d=google.com; s=arc-20160816; b=xxNENfJKCjw9SICKDntxTJiBuOJIwffA82NT0KsiNEddOlxGwydGpSJAfa1pOJ0cMv g+vREEYNZ6MQ4e8NNjw3U5sX9rSwbVy9Yw+nZoV0gJiae/a/YnEsUY7VZNLMU8EenlEE yAPB3/g9KUp98q0oYj4kwrx1JvJxnNTiDTKKcvn/QC3n6/FtPtOln45exmQZ0rSwDkp8 qAtQbgC9jrMRqu/s6TazSan7Quexczubtqn8+D/7GMPBIHa9hyF4W/R7pLV14xb3ISzn nLX35l0W+9WS2G8qC1+A9EJe2o/JP7BYjs8Rv12LieQxGYwQb9YnQWIKqsBjIS575HPr oPSA== 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=8AbUIjn6F3RdoHkrcW17TDvF5bAsF5zej+829sVGxn0=; b=OgVQwe+KCuqrTPzs9M4/79vR8UnExIjelK80wbsSXTW2I8jXJDV/DAY/fyP170z5qM 5SEEZgv3zvYWqIFxQx5nOfd5JcIwifTd25FeTS3F76h5X0Q8u+XPAgJP7H0nwtx7a3WC aTuStVsAagJaj6vUIX8LqgSSbb9Lqfx0EJqqkt+IV5EGwKUBQBJxVTUbYrTNWLoR6NH9 0IMNTQLgbTYnjr0QgOrP9UXSHY/CP40pGDmF6LbUk93vZ/8TeeciThP/zbtN6phmvOEn 9ONwQLGmDmkCIjZqXK03FYU7K4jZ4yMOJhZNcvNQov5+i6iHb3ZaISh22df6jj0EyCFz 42wg== 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 d20si1351456plj.429.2017.07.06.02.50.59; Thu, 06 Jul 2017 02:50:59 -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 S1752551AbdGFJus (ORCPT + 25 others); Thu, 6 Jul 2017 05:50:48 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:36184 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752516AbdGFJuq (ORCPT ); Thu, 6 Jul 2017 05:50:46 -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 0037716EA; Thu, 6 Jul 2017 02:50:36 -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 0061C3F3E1; Thu, 6 Jul 2017 02:50:33 -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 , Russell King , Catalin Marinas , Will Deacon , Juri Lelli , Vincent Guittot , Peter Zijlstra , Morten Rasmussen , Viresh Kumar , "Rafael J . Wysocki" Subject: [PATCH v2 09/10] arm64: wire cpu-invariant accounting support up to the task scheduler Date: Thu, 6 Jul 2017 10:49:47 +0100 Message-Id: <20170706094948.8779-10-dietmar.eggemann@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170706094948.8779-1-dietmar.eggemann@arm.com> References: <20170706094948.8779-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: Catalin Marinas Cc: Will Deacon Cc: Juri Lelli Signed-off-by: Dietmar Eggemann Acked-by: Catalin Marinas Acked-by: Vincent Guittot Tested-by: Juri Lelli Reviewed-by: Juri Lelli --- arch/arm64/include/asm/topology.h | 3 +++ 1 file changed, 3 insertions(+) -- 2.11.0 Reviewed-by: Viresh Kumar diff --git a/arch/arm64/include/asm/topology.h b/arch/arm64/include/asm/topology.h index 4fd598b432e6..0dc81860cc0d 100644 --- a/arch/arm64/include/asm/topology.h +++ b/arch/arm64/include/asm/topology.h @@ -40,6 +40,9 @@ int pcibus_to_node(struct pci_bus *bus); /* 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 + #include #endif /* _ASM_ARM_TOPOLOGY_H */