From patchwork Wed Jun 20 15:19:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Guittot X-Patchwork-Id: 9507 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 8B96323E1B for ; Wed, 20 Jun 2012 15:20:17 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id 5CF2BA18341 for ; Wed, 20 Jun 2012 15:20:17 +0000 (UTC) Received: by yhpp61 with SMTP id p61so6361165yhp.11 for ; Wed, 20 Jun 2012 08:20:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=SZ1mQXysYr7SxKoSXJu9YwmT+Pyz4XVD+U+KA9YP2xY=; b=nYKCZf8HBEhVDKYnPVNNjI5ywxgqQmXC/X+18P7zX84qx3w4NhsIL6vZns1t8L74kS NBd2HQChOoXtw6t+OF46+Qlsy3E9YMqszvokIYKgam3P56m2oAP7qhZh+tNppwlrl4sY pYLezxMV6mGEW014skEF2SK44SJJTVWPidZ1YupDOv//Z+jStyocl0VRUft07yVOw/SJ cHX34i0dOCVi1YdQqWLsL1MqCMZmSS8kC333MbW/naLTEXkqiJnIoFbsnTPNqVvI11lK 64DoQ75y9QpbVyc0On0TaO69IXPOXFAuXKax0i1OC5WlpwDkA70I3W2JUHIo5Uexvr5O /Hdg== Received: by 10.42.89.72 with SMTP id f8mr11072608icm.33.1340205616683; Wed, 20 Jun 2012 08:20:16 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.24.148 with SMTP id v20csp185124ibb; Wed, 20 Jun 2012 08:20:13 -0700 (PDT) Received: by 10.216.182.210 with SMTP id o60mr14086801wem.23.1340205612750; Wed, 20 Jun 2012 08:20:12 -0700 (PDT) Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) by mx.google.com with ESMTPS id ek6si35198660wid.0.2012.06.20.08.20.12 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 20 Jun 2012 08:20:12 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.178 is neither permitted nor denied by best guess record for domain of vincent.guittot@linaro.org) client-ip=209.85.212.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.178 is neither permitted nor denied by best guess record for domain of vincent.guittot@linaro.org) smtp.mail=vincent.guittot@linaro.org Received: by wibhn6 with SMTP id hn6so3504729wib.13 for ; Wed, 20 Jun 2012 08:20:12 -0700 (PDT) Received: by 10.180.102.136 with SMTP id fo8mr6774868wib.19.1340205611985; Wed, 20 Jun 2012 08:20:11 -0700 (PDT) Received: from localhost.localdomain (LPuteaux-156-14-44-212.w82-127.abo.wanadoo.fr. [82.127.83.212]) by mx.google.com with ESMTPS id gb9sm39525109wib.8.2012.06.20.08.20.08 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 20 Jun 2012 08:20:10 -0700 (PDT) From: Vincent Guittot To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linaro-dev@lists.linaro.org, devicetree-discuss@lists.ozlabs.org Cc: linux@arm.linux.org.uk, a.p.zijlstra@chello.nl, grant.likely@secretlab.ca, rob.herring@calxeda.com, yong.zhang0@gmail.com, namhyung@kernel.org, jean.pihet@newoldbits.com, Vincent Guittot Subject: [PATCH v3 1/5] ARM: topology: Add arch_scale_freq_power function Date: Wed, 20 Jun 2012 17:19:18 +0200 Message-Id: <1340205562-7653-2-git-send-email-vincent.guittot@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1340205562-7653-1-git-send-email-vincent.guittot@linaro.org> References: <1340205562-7653-1-git-send-email-vincent.guittot@linaro.org> X-Gm-Message-State: ALoCoQkSauSf5aHrtx1HqBOAVU55ua62UNdbQzWb6fn1IOrJ2xcaeVRVlp6r/HcYAhTB8Qg7vWM9 Add infrastructure to be able to modify the cpu_power of each core Signed-off-by: Vincent Guittot --- arch/arm/kernel/topology.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c index 8200dea..51f23b3 100644 --- a/arch/arm/kernel/topology.c +++ b/arch/arm/kernel/topology.c @@ -22,6 +22,37 @@ #include #include +/* + * cpu power scale management + */ + +/* + * cpu power table + * This per cpu data structure describes the relative capacity of each core. + * On a heteregenous system, cores don't have the same computation capacity + * and we reflect that difference in the cpu_power field so the scheduler can + * take this difference into account during load balance. A per cpu structure + * is preferred because each CPU updates its own cpu_power field during the + * load balance except for idle cores. One idle core is selected to run the + * rebalance_domains for all idle cores and the cpu_power can be updated + * during this sequence. + */ +static DEFINE_PER_CPU(unsigned long, cpu_scale); + +unsigned long arch_scale_freq_power(struct sched_domain *sd, int cpu) +{ + return per_cpu(cpu_scale, cpu); +} + +static void set_power_scale(unsigned int cpu, unsigned long power) +{ + per_cpu(cpu_scale, cpu) = power; +} + +/* + * cpu topology management + */ + #define MPIDR_SMP_BITMASK (0x3 << 30) #define MPIDR_SMP_VALUE (0x2 << 30) @@ -41,6 +72,9 @@ #define MPIDR_LEVEL2_MASK 0xFF #define MPIDR_LEVEL2_SHIFT 16 +/* + * cpu topology table + */ struct cputopo_arm cpu_topology[NR_CPUS]; const struct cpumask *cpu_coregroup_mask(int cpu) @@ -134,7 +168,7 @@ void init_cpu_topology(void) { unsigned int cpu; - /* init core mask */ + /* init core mask and power*/ for_each_possible_cpu(cpu) { struct cputopo_arm *cpu_topo = &(cpu_topology[cpu]); @@ -143,6 +177,8 @@ void init_cpu_topology(void) cpu_topo->socket_id = -1; cpumask_clear(&cpu_topo->core_sibling); cpumask_clear(&cpu_topo->thread_sibling); + + set_power_scale(cpu, SCHED_POWER_SCALE); } smp_wmb(); }