From patchwork Thu Jun 8 07:55:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dietmar Eggemann X-Patchwork-Id: 103340 Delivered-To: patch@linaro.org Received: by 10.182.29.35 with SMTP id g3csp2123784obh; Thu, 8 Jun 2017 00:56:25 -0700 (PDT) X-Received: by 10.101.86.76 with SMTP id m12mr19733460pgs.137.1496908585820; Thu, 08 Jun 2017 00:56:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496908585; cv=none; d=google.com; s=arc-20160816; b=FvDbFr9/pUERYe8V5CTw0iCTz0wh60IXxAbiqcny82l/WKf9XxmmR8XnEvDFGDgyZr yQtPdNbvwuGV5AkDGpYBsSeK15EE0l7P1Bjav/1YFPOt3uETtfUm6PCWja7mzHSjEfwW 4D7ArX/3kP16mTQN7sSOzAwHHZdZzf6pXTsQ8F19c8vLwR//ilEoJwWJ+hv2U3N2b4J0 qOPJ8TfgEwi/eqrofg+d3w4zwnlx8X4hkBjqjj6kAu9DrE40dRhiwzQ//S5mvxALH1Lr M0Th4RWhhHfavx/V9+TgkBCYDlYUp/WLsP9bHqM7dpChmKQFkOqxp2S275LxkDd2Uz3i BGyA== 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=qXJIQ2hBHNEpyvMBxYyDqGDOj0pcIvZf1r0EzPwc7Oc=; b=bUwY1tSuxzogeNWlZqDoY6C59YWZzEcgCdV4bj5ohRTmGXO6F45gVdQ/5xVQkdIjed 2FyyZ/kcVnCeF4SbQyy2DwYTn17FNIIvVa7srClAfskQL9Y5Fy38Mritr8s3UMeUVCw6 AwTd4ohccLKQyjuQeqtqNpEOfHDtAlfvYN9E4Lo9ZWl0CDYUoku0rvM4MIC+COkfi+ta uxSXiqo69i4GNMdftkYfPPEBdtHvvlJLSXu68fDgVBCnRH1i88wYAin4wmPgWLguwV2E EUzvufGCCkvYnYFRRlzx1x9EsWbFPkDpvWW9mTfTXXpbssNww7wUDL1xHY1l1ZSbauep vpWw== 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.25; Thu, 08 Jun 2017 00:56: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 S1751984AbdFHH4A (ORCPT + 25 others); Thu, 8 Jun 2017 03:56:00 -0400 Received: from foss.arm.com ([217.140.101.70]:43268 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751577AbdFHHz6 (ORCPT ); Thu, 8 Jun 2017 03:55:58 -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 7546616EA; Thu, 8 Jun 2017 00:55:47 -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 7A5103F3E1; Thu, 8 Jun 2017 00:55:45 -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 6/6] arm64: wire cpu-invariant accounting support up to the task scheduler Date: Thu, 8 Jun 2017 08:55:13 +0100 Message-Id: <20170608075513.12475-7-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: Catalin Marinas Cc: Will Deacon Cc: Juri Lelli Signed-off-by: Dietmar Eggemann --- arch/arm64/include/asm/topology.h | 3 +++ 1 file changed, 3 insertions(+) -- 2.11.0 Acked-by: Catalin Marinas diff --git a/arch/arm64/include/asm/topology.h b/arch/arm64/include/asm/topology.h index 44598a86ec4a..e313eeb10756 100644 --- a/arch/arm64/include/asm/topology.h +++ b/arch/arm64/include/asm/topology.h @@ -37,6 +37,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 */