From patchwork Thu Jun 8 07:55:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dietmar Eggemann X-Patchwork-Id: 103339 Delivered-To: patch@linaro.org Received: by 10.182.29.35 with SMTP id g3csp2123671obh; Thu, 8 Jun 2017 00:55:53 -0700 (PDT) X-Received: by 10.84.204.133 with SMTP id b5mr9679925ple.77.1496908553580; Thu, 08 Jun 2017 00:55:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496908553; cv=none; d=google.com; s=arc-20160816; b=W0KCc14f8PPTCWKBjhDUkTIvOIrBzrcq7vpaw8ZyCn7UJB7YODTn3VazBXcK5XL72R 45xZSyF3CUz6nvunINbmxgozxfY4fGcHkKV+oaXtI8SHatG5IqvibEAjeeUAP3jO9nte diO5jvbIHYWjUTufE2PNL2Mc5JVTM/NUisJFKPAPx/XmDeVmRWm7grtibBXr3bqqJcHJ 5mh6xDUCfDBliZZ3EwLfMcdh9v6fgGPN0QLXVQOOZQ+76iBf1QhefsdQlRtNzNQfihQs d7rSVH9Dvf7lEJ6dThduJJehRB15qUPEDXR6Jl6sQnoKVvlLUNuvmAilbjtmJx6q1X/E cfjw== 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=M876z+5VQKgq+yu6GRtEZRrTacCjuu/vS81ZluSDKs0=; b=zoT3HcPzF6XwLz9NEmDxEtBFO3NfacNbGF60CuHz5vZMml+V2Egb7xwfTKcqIgYKu6 mpl44AtaJ06IRwlKq0PrjlJqEe0t8fzzwSVY4yLqdNUefvvECk1wdqfnUTlc76wrrbhf DHoN4Mj5yvoZc1O/fuSH4cyT/H3BdE58HMyv01C/yM9L2GkKFz4yeRGgOxqI9u1F/9Ip 8RDf2TazErrZSszwYXLDn0vjvLRtWTwGsaj/yvZSVBprSb8te+W9Lb7KGDXPnN37zycs aPu0hjmdz5WBHTW+V1MhIBJRkpKp4YbTb1pnG4ZHYTHC2qevEGssJipd87vygexXgulm 2n9Q== 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 h126si3781772pgc.62.2017.06.08.00.55.53; Thu, 08 Jun 2017 00:55:53 -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 S1751902AbdFHHzv (ORCPT + 14 others); Thu, 8 Jun 2017 03:55:51 -0400 Received: from foss.arm.com ([217.140.101.70]:43262 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751946AbdFHHzu (ORCPT ); Thu, 8 Jun 2017 03:55:50 -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 3A82116A0; Thu, 8 Jun 2017 00:55:45 -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 3F23D3F3E1; Thu, 8 Jun 2017 00:55:43 -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 5/6] arm64: wire frequency-invariant accounting support up to the task scheduler Date: Thu, 8 Jun 2017 08:55:12 +0100 Message-Id: <20170608075513.12475-6-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-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Commit dfbca41f3479 ("sched: Optimize freq invariant accounting") changed the wiring which now has to be done by associating arch_scale_freq_capacity with the actual implementation provided by the architecture. Define arch_scale_freq_capacity to use the arch_topology "driver" function topology_get_freq_scale() for the task scheduler's frequency-invariant accounting instead of the default arch_scale_freq_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 | 5 +++++ arch/arm64/kernel/topology.c | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) -- 2.11.0 Acked-by: Catalin Marinas Acked-by: Vincent Guittot diff --git a/arch/arm64/include/asm/topology.h b/arch/arm64/include/asm/topology.h index 8b57339823e9..44598a86ec4a 100644 --- a/arch/arm64/include/asm/topology.h +++ b/arch/arm64/include/asm/topology.h @@ -32,6 +32,11 @@ int pcibus_to_node(struct pci_bus *bus); #endif /* CONFIG_NUMA */ +#include + +/* Replace task scheduler's default frequency-invariant accounting */ +#define arch_scale_freq_capacity topology_get_freq_scale + #include #endif /* _ASM_ARM_TOPOLOGY_H */ diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c index 79244c75eaec..6cbb6315e493 100644 --- a/arch/arm64/kernel/topology.c +++ b/arch/arm64/kernel/topology.c @@ -11,7 +11,6 @@ * for more details. */ -#include #include #include #include