From patchwork Fri May 23 15:52:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Guittot X-Patchwork-Id: 30823 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f69.google.com (mail-oa0-f69.google.com [209.85.219.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2903720AEA for ; Fri, 23 May 2014 15:54:27 +0000 (UTC) Received: by mail-oa0-f69.google.com with SMTP id i7sf23981306oag.8 for ; Fri, 23 May 2014 08:54:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=A8tm+B3oH9BgiCHguR8+zpGRqemckiiqzMNP7DYuRKo=; b=ii5IvMGZS0HMvvOCI5lXtMhDbYPQAhm8hrdKL5lOKd6VSzrEMZCyEdhu1NQSuhWoEO 4BJrI2FlSkQ9MAW2RqJdpNfE7ZVxTakIdYC8qDM0g4TfUyGG30IS093teD8yUfCLPxtd l0uUN3+RcfPrYoXabrp6RsKATvLbNg57XDiWe68oVZ0f+WUVmgfc6y/f8cF3h1JOfdJ2 gG9cGNHCH0o+hBai9j2G9UHU2vAgCrdv2e8z1iGbO35firS0LI443YdUwR1Hr8TCrBjf QLT9d7U7gbfgFw830QHo7nAte917qYZEAgaoaStlr/xO+DmmAdsj4bgcgJjCwdoiw1xr a7Xw== X-Gm-Message-State: ALoCoQm/duMBvUNijm/4l92CUTHH0Ty1M+S+Ipi4LymSisCF1QNbLJy1cM/kVF/8aliqNhDFs4mn X-Received: by 10.182.106.229 with SMTP id gx5mr2449552obb.31.1400860466810; Fri, 23 May 2014 08:54:26 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.109.247 with SMTP id l110ls1588300qgf.90.gmail; Fri, 23 May 2014 08:54:26 -0700 (PDT) X-Received: by 10.221.36.73 with SMTP id sz9mr1273116vcb.62.1400860466718; Fri, 23 May 2014 08:54:26 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id hy3si1871278vdb.52.2014.05.23.08.54.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 May 2014 08:54:26 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.173 as permitted sender) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id il7so6509917vcb.32 for ; Fri, 23 May 2014 08:54:26 -0700 (PDT) X-Received: by 10.58.185.165 with SMTP id fd5mr1961360vec.41.1400860466637; Fri, 23 May 2014 08:54:26 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp42693vcb; Fri, 23 May 2014 08:54:26 -0700 (PDT) X-Received: by 10.66.243.225 with SMTP id xb1mr7141481pac.49.1400860465438; Fri, 23 May 2014 08:54:25 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rq2si4406078pbc.163.2014.05.23.08.54.24 for ; Fri, 23 May 2014 08:54:24 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753109AbaEWPyS (ORCPT + 27 others); Fri, 23 May 2014 11:54:18 -0400 Received: from mail-wi0-f180.google.com ([209.85.212.180]:60245 "EHLO mail-wi0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752856AbaEWPyN (ORCPT ); Fri, 23 May 2014 11:54:13 -0400 Received: by mail-wi0-f180.google.com with SMTP id hi2so1117404wib.7 for ; Fri, 23 May 2014 08:54:12 -0700 (PDT) X-Received: by 10.194.184.179 with SMTP id ev19mr2836810wjc.85.1400860452354; Fri, 23 May 2014 08:54:12 -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 m1sm3558594wib.20.2014.05.23.08.54.10 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 May 2014 08:54:11 -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 Cc: preeti@linux.vnet.ibm.com, Morten.Rasmussen@arm.com, efault@gmx.de, nicolas.pitre@linaro.org, linaro-kernel@lists.linaro.org, daniel.lezcano@linaro.org, Vincent Guittot Subject: [PATCH v2 04/11] sched: Allow all archs to set the power_orig Date: Fri, 23 May 2014 17:52:58 +0200 Message-Id: <1400860385-14555-5-git-send-email-vincent.guittot@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1400860385-14555-1-git-send-email-vincent.guittot@linaro.org> References: <1400860385-14555-1-git-send-email-vincent.guittot@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: vincent.guittot@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.173 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , power_orig is only changed for system with a SMT sched_domain level in order to reflect the lower capacity of CPUs. Heterogenous system also have to reflect an original capacity that is different from the default value. Create a more generic function arch_scale_cpu_power that can be also used by non SMT platform to set power_orig. The weak behavior of arch_scale_cpu_power is the previous SMT one in order to keep backward compatibility in the use of power_orig. Signed-off-by: Vincent Guittot --- kernel/sched/fair.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 6a84114..6dc05f7 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -5618,6 +5618,20 @@ unsigned long __weak arch_scale_smt_power(struct sched_domain *sd, int cpu) return default_scale_smt_power(sd, cpu); } +unsigned long __weak arch_scale_cpu_power(struct sched_domain *sd, int cpu) +{ + unsigned long weight = sd->span_weight; + + if ((sd->flags & SD_SHARE_CPUPOWER) && weight > 1) { + if (sched_feat(ARCH_POWER)) + return arch_scale_smt_power(sd, cpu); + else + return default_scale_smt_power(sd, cpu); + } + + return SCHED_POWER_SCALE; +} + static unsigned long scale_rt_power(int cpu) { struct rq *rq = cpu_rq(cpu); @@ -5654,18 +5668,12 @@ static unsigned long scale_rt_power(int cpu) static void update_cpu_power(struct sched_domain *sd, int cpu) { - unsigned long weight = sd->span_weight; unsigned long power = SCHED_POWER_SCALE; struct sched_group *sdg = sd->groups; - if ((sd->flags & SD_SHARE_CPUPOWER) && weight > 1) { - if (sched_feat(ARCH_POWER)) - power *= arch_scale_smt_power(sd, cpu); - else - power *= default_scale_smt_power(sd, cpu); + power *= arch_scale_cpu_power(sd, cpu); - power >>= SCHED_POWER_SHIFT; - } + power >>= SCHED_POWER_SHIFT; sdg->sgp->power_orig = power;