From patchwork Tue Feb 11 15:11:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 24469 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f71.google.com (mail-oa0-f71.google.com [209.85.219.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 74DFE203F3 for ; Tue, 11 Feb 2014 15:12:56 +0000 (UTC) Received: by mail-oa0-f71.google.com with SMTP id g12sf34205539oah.2 for ; Tue, 11 Feb 2014 07:12:55 -0800 (PST) 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=GLlfZtU3mL3n44mJ/la4clAQMvp7PnsXq1WzjuVJkFU=; b=c1eVJv+urQpQOHeQr1iV28aWxdhO/NHZG3rXz2m+ag4nX+2rKJTK2miyn8zjGsReVB TEW2FyXAsG4OK5HSEADbZPR9PRYrky/xCKUgFKssGm7sbZe/XkLQduyUGQ9jYeNNMUe8 m5bBQ64bFz2ZlgwG93pLk4cWPAij29VfSmnwW7vb6qQ5rYKNsnhYhCr4YvUsDOJBfa6W VAZCNn9Hn/tYgkN/PpDHGMt5J3UUmil50YePZQdjkss3QyP4K7VocGpDGyfTv0T8C5XN HxuBTcH8jtTRzBGz5REe2/J/a7yjELMpoajClndNM1ZiOLjDKJFSD+a9HZtI6mPUVab0 cD5A== X-Gm-Message-State: ALoCoQkIIawb55Ct93nTNX+NIeES33ZJtswYVdxJDcKQ6pfUo9FA+FS9lNAmmMb99Zg32xit/4zd X-Received: by 10.182.108.136 with SMTP id hk8mr14385459obb.11.1392131575032; Tue, 11 Feb 2014 07:12:55 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.86.51 with SMTP id o48ls2433599qgd.83.gmail; Tue, 11 Feb 2014 07:12:54 -0800 (PST) X-Received: by 10.220.110.210 with SMTP id o18mr32719vcp.49.1392131574924; Tue, 11 Feb 2014 07:12:54 -0800 (PST) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id tt2si5996088vdc.74.2014.02.11.07.12.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Feb 2014 07:12:54 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id le5so5971907vcb.16 for ; Tue, 11 Feb 2014 07:12:54 -0800 (PST) X-Received: by 10.58.90.202 with SMTP id by10mr27731888veb.6.1392131574843; Tue, 11 Feb 2014 07:12:54 -0800 (PST) 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.174.196 with SMTP id u4csp253518vcz; Tue, 11 Feb 2014 07:12:54 -0800 (PST) X-Received: by 10.66.129.133 with SMTP id nw5mr32891440pab.98.1392131573522; Tue, 11 Feb 2014 07:12:53 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fl7si19250976pad.287.2014.02.11.07.12.52; Tue, 11 Feb 2014 07:12:52 -0800 (PST) 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; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751962AbaBKPMm (ORCPT + 27 others); Tue, 11 Feb 2014 10:12:42 -0500 Received: from mail-la0-f43.google.com ([209.85.215.43]:35636 "EHLO mail-la0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751288AbaBKPLk (ORCPT ); Tue, 11 Feb 2014 10:11:40 -0500 Received: by mail-la0-f43.google.com with SMTP id pv20so5920336lab.2 for ; Tue, 11 Feb 2014 07:11:39 -0800 (PST) X-Received: by 10.112.172.8 with SMTP id ay8mr2044984lbc.41.1392131498816; Tue, 11 Feb 2014 07:11:38 -0800 (PST) Received: from localhost.localdomain (AToulouse-654-1-479-183.w86-201.abo.wanadoo.fr. [86.201.194.183]) by mx.google.com with ESMTPSA id qx7sm19964004lbb.9.2014.02.11.07.11.36 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Feb 2014 07:11:38 -0800 (PST) From: Daniel Lezcano To: mingo@kernel.org, peterz@infradead.org, tglx@linutronix.de, rjw@rjwysocki.net Cc: nicolas.pitre@linaro.org, preeti@linux.vnet.ibm.com, linux-kernel@vger.kernel.org Subject: [PATCH 3/5] idle: Reorganize the idle loop Date: Tue, 11 Feb 2014 16:11:29 +0100 Message-Id: <1392131491-5265-3-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1392131491-5265-1-git-send-email-daniel.lezcano@linaro.org> References: <1392131491-5265-1-git-send-email-daniel.lezcano@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: daniel.lezcano@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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: , Now that we have the main cpuidle function in idle.c, move some code from the idle mainloop to this function for the sake of clarity. That removes if then else indentation difficult to follow when looking at the code. This patch does not the change the current behavior. Signed-off-by: Daniel Lezcano Acked-by: Nicolas Pitre --- include/linux/cpuidle.h | 2 ++ kernel/sched/idle.c | 39 ++++++++++++++++++++------------------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index 0befaff..a8d5bd3 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -175,6 +175,8 @@ static inline int cpuidle_enable_device(struct cpuidle_device *dev) {return -ENODEV; } static inline void cpuidle_disable_device(struct cpuidle_device *dev) { } static inline int cpuidle_play_dead(void) {return -ENODEV; } +static inline struct cpuidle_driver *cpuidle_get_cpu_driver( + struct cpuidle_device *dev) {return NULL; } #endif #ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c index 6963822..8b10891 100644 --- a/kernel/sched/idle.c +++ b/kernel/sched/idle.c @@ -63,7 +63,6 @@ void __weak arch_cpu_idle(void) local_irq_enable(); } -#ifdef CONFIG_CPU_IDLE /** * cpuidle_idle_call - the main idle function * @@ -76,17 +75,26 @@ static int cpuidle_idle_call(void) struct cpuidle_driver *drv = cpuidle_get_cpu_driver(dev); int next_state, entered_state; - /* ask the governor for the next state */ + stop_critical_timings(); + rcu_idle_enter(); + + /* Ask the governor for the next state, this call can fail for + * different reasons: cpuidle is not enabled or an idle state + * fulfilling the constraints was not found. In this case, we fall + * back to the default idle function + */ next_state = cpuidle_select(drv, dev); - if (next_state < 0) - return next_state; + if (next_state < 0) { + arch_cpu_idle(); + goto out; + } if (need_resched()) { dev->last_residency = 0; /* give the governor an opportunity to reflect on the outcome */ cpuidle_reflect(dev, next_state); local_irq_enable(); - return 0; + goto out; } trace_cpu_idle_rcuidle(next_state, dev->cpu); @@ -97,15 +105,15 @@ static int cpuidle_idle_call(void) /* give the governor an opportunity to reflect on the outcome */ cpuidle_reflect(dev, entered_state); +out: + if (WARN_ON_ONCE(irqs_disabled())) + local_irq_enable(); + + rcu_idle_exit(); + start_critical_timings(); return 0; } -#else -static inline int cpuidle_idle_call(void) -{ - return -ENODEV; -} -#endif /* * Generic idle loop implementation @@ -138,14 +146,7 @@ static void cpu_idle_loop(void) cpu_idle_poll(); } else { if (!current_clr_polling_and_test()) { - stop_critical_timings(); - rcu_idle_enter(); - if (cpuidle_idle_call()) - arch_cpu_idle(); - if (WARN_ON_ONCE(irqs_disabled())) - local_irq_enable(); - rcu_idle_exit(); - start_critical_timings(); + cpuidle_idle_call(); } else { local_irq_enable(); }