From patchwork Mon Feb 24 13:55:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 25193 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 987722066C for ; Mon, 24 Feb 2014 13:56:57 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id m1sf1629743oag.1 for ; Mon, 24 Feb 2014 05:56:57 -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=R7AFVkjBonZr3ormPDnEqneoydCv0q1gE4q3lnK/MFk=; b=FQ6BxG/ZiwoykhUtgH3oAPXfMHTlONGARz7AR83EZ2rze4UTPPwh7Dl91EonW/zjo6 q2ZqHH6x9qM7bpUWnEFzHC3vKcnIP3q78GaW+gKQ/IyBZTTKDVoww5B17TPdvPksz0g8 FjFP2oggjsNwkKQTIesxHWPcQtENFWQ/gbSy7BtVjiitKR9JMJiPtU0Rkzjpk2BhRDKv iVoNOPXgX4gDY6XbTleK5uXscB+nn4ouhhpTOEvTIGs3YHHw1ULxQN9GM/rVhGDT+sK5 1ejM0gAnWQlTg7DbuFr2Y/bB/gY2WLeHtpuuXm4c/pjx/u/spbVzHLcjlfb87Div3Yd1 Q8pA== X-Gm-Message-State: ALoCoQmVrWRVQhNN4lUKqjPuld/M/Tzl1i4BiFBgPLisv8vfi7uTncQKSTxDCtJRhpWzHEZJqCzv X-Received: by 10.50.78.231 with SMTP id e7mr9396420igx.5.1393250217115; Mon, 24 Feb 2014 05:56:57 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.81.209 with SMTP id f75ls2028901qgd.48.gmail; Mon, 24 Feb 2014 05:56:57 -0800 (PST) X-Received: by 10.220.106.7 with SMTP id v7mr563396vco.46.1393250216956; Mon, 24 Feb 2014 05:56:56 -0800 (PST) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id kn6si5838108veb.130.2014.02.24.05.56.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 24 Feb 2014 05:56:56 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.174 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.174; Received: by mail-vc0-f174.google.com with SMTP id im17so5871399vcb.33 for ; Mon, 24 Feb 2014 05:56:56 -0800 (PST) X-Received: by 10.52.33.229 with SMTP id u5mr175754vdi.64.1393250216844; Mon, 24 Feb 2014 05:56:56 -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 u4csp62815vcz; Mon, 24 Feb 2014 05:56:56 -0800 (PST) X-Received: by 10.66.220.198 with SMTP id py6mr25223361pac.21.1393250215924; Mon, 24 Feb 2014 05:56:55 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id zo6si20133pbc.343.2014.02.24.05.56.55; Mon, 24 Feb 2014 05:56:55 -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 S1753060AbaBXN4t (ORCPT + 26 others); Mon, 24 Feb 2014 08:56:49 -0500 Received: from mail-wg0-f50.google.com ([74.125.82.50]:47917 "EHLO mail-wg0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752572AbaBXNzz (ORCPT ); Mon, 24 Feb 2014 08:55:55 -0500 Received: by mail-wg0-f50.google.com with SMTP id z12so4709900wgg.29 for ; Mon, 24 Feb 2014 05:55:54 -0800 (PST) X-Received: by 10.180.106.40 with SMTP id gr8mr14293991wib.31.1393250153814; Mon, 24 Feb 2014 05:55:53 -0800 (PST) Received: from localhost.localdomain (AToulouse-654-1-343-25.w90-55.abo.wanadoo.fr. [90.55.62.25]) by mx.google.com with ESMTPSA id f7sm42338516wjb.7.2014.02.24.05.55.52 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 24 Feb 2014 05:55:53 -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 V2 3/5] idle: Reorganize the idle loop Date: Mon, 24 Feb 2014 14:55:49 +0100 Message-Id: <1393250151-6982-3-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1393250151-6982-1-git-send-email-daniel.lezcano@linaro.org> References: <1393250151-6982-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.174 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 change the current behavior. Signed-off-by: Daniel Lezcano Acked-by: Nicolas Pitre --- Changelog: V2: * fixed type in patch's description --- include/linux/cpuidle.h | 2 ++ kernel/sched/idle.c | 40 +++++++++++++++++++++------------------- 2 files changed, 23 insertions(+), 19 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ Index: cpuidle-next/include/linux/cpuidle.h =================================================================== --- cpuidle-next.orig/include/linux/cpuidle.h +++ cpuidle-next/include/linux/cpuidle.h @@ -180,6 +180,8 @@ static inline int cpuidle_enable_device( {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 Index: cpuidle-next/kernel/sched/idle.c =================================================================== --- cpuidle-next.orig/kernel/sched/idle.c +++ cpuidle-next/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,11 +75,21 @@ static int cpuidle_idle_call(void) struct cpuidle_driver *drv = cpuidle_get_cpu_driver(dev); int next_state, entered_state; + stop_critical_timings(); + rcu_idle_enter(); + next_state = cpuidle_enabled(drv, dev); - if (next_state < 0) - return next_state; + if (next_state < 0) { + arch_cpu_idle(); + goto out; + } - /* ask the governor for the next state */ + /* + * 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 (need_resched()) { @@ -88,7 +97,7 @@ static int cpuidle_idle_call(void) /* 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); @@ -99,15 +108,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 @@ -140,14 +149,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(); }