From patchwork Mon Jun 30 16:05:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Guittot X-Patchwork-Id: 4452831 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 565CBBEEAA for ; Mon, 30 Jun 2014 16:13:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8484F20328 for ; Mon, 30 Jun 2014 16:12:59 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ABC03202F8 for ; Mon, 30 Jun 2014 16:12:58 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1X1eAT-0002m9-My; Mon, 30 Jun 2014 16:10:57 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X1e7C-0006Zo-0R for linux-arm-kernel@bombadil.infradead.org; Mon, 30 Jun 2014 16:07:34 +0000 Received: from mail-wg0-f45.google.com ([74.125.82.45]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X1e6z-0003mC-4w for linux-arm-kernel@lists.infradead.org; Mon, 30 Jun 2014 16:07:27 +0000 Received: by mail-wg0-f45.google.com with SMTP id l18so8275542wgh.4 for ; Mon, 30 Jun 2014 09:06:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XWo1tFG4RmK9NXaj+6pHFfSRsCUfm9J3BRApCO69JKw=; b=Uau6YriYq/4iRF4uOnsdtl1ja2qa394DkD3cDuOlhrn3ILPQdlc6X//LL5TY/xR8WC zQ//akf+KDNGzS1osa8w8HxBdEweHsnhwjhu40IMhB4UArH/+QAE6RiN2EB9ggFYufsV yPTtVGCyrLzmwjiXaNyCCX0d+LoF6uwaj0hFJPlDxe+ZmNnLGAH9MacONC2+Z/LBDjKL IGtVDZOcelNy8ev46DMwGkAVj/DsoUWAPsFOqm4d/7DUl/oJCXoGTOsag3Vq+03aeI0d UoxVvlsGZpo4vVEG0CdCwgc3BMrKeEwh7yZufTkEnfMGNhIIDrSXp9wAyffs7tXMqUoN KfkQ== X-Gm-Message-State: ALoCoQm/a7g4qNOQk9hpLcYXqxUEGKCNHAkBXDmG/0upH68jDQC8dWRC2jDHg7KgeOc95X+H6guB X-Received: by 10.180.79.201 with SMTP id l9mr30819941wix.60.1404144413102; Mon, 30 Jun 2014 09:06:53 -0700 (PDT) Received: from lmenx30s.lme.st.com (LPuteaux-656-01-48-212.w82-127.abo.wanadoo.fr. [82.127.83.212]) by mx.google.com with ESMTPSA id lo18sm32896271wic.1.2014.06.30.09.06.51 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 30 Jun 2014 09:06:52 -0700 (PDT) From: Vincent Guittot To: peterz@infradead.org, mingo@kernel.org, linux-kernel@vger.kernel.org, linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 05/12] ARM: topology: use new cpu_power interface Date: Mon, 30 Jun 2014 18:05:36 +0200 Message-Id: <1404144343-18720-6-git-send-email-vincent.guittot@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1404144343-18720-1-git-send-email-vincent.guittot@linaro.org> References: <1404144343-18720-1-git-send-email-vincent.guittot@linaro.org> X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) Cc: nicolas.pitre@linaro.org, efault@gmx.de, Vincent Guittot , daniel.lezcano@linaro.org, dietmar.eggemann@arm.com, linaro-kernel@lists.linaro.org, preeti@linux.vnet.ibm.com, Morten.Rasmussen@arm.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use the new arch_scale_cpu_power in order to reflect the original capacity of a CPU instead of arch_scale_freq_power which is more linked to a scaling of the capacity linked to the frequency. Signed-off-by: Vincent Guittot Acked-by: Rik van Riel --- arch/arm/kernel/topology.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c index d42a7db..2310bfb 100644 --- a/arch/arm/kernel/topology.c +++ b/arch/arm/kernel/topology.c @@ -42,7 +42,7 @@ */ static DEFINE_PER_CPU(unsigned long, cpu_scale); -unsigned long arch_scale_freq_capacity(struct sched_domain *sd, int cpu) +unsigned long arch_scale_cpu_capacity(struct sched_domain *sd, int cpu) { return per_cpu(cpu_scale, cpu); } @@ -166,7 +166,7 @@ static void update_cpu_capacity(unsigned int cpu) set_capacity_scale(cpu, cpu_capacity(cpu) / middle_capacity); printk(KERN_INFO "CPU%u: update cpu_capacity %lu\n", - cpu, arch_scale_freq_capacity(NULL, cpu)); + cpu, arch_scale_cpu_capacity(NULL, cpu)); } #else