From patchwork Thu Aug 25 19:51:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lina Iyer X-Patchwork-Id: 74707 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp1012275qga; Thu, 25 Aug 2016 12:52:42 -0700 (PDT) X-Received: by 10.98.213.130 with SMTP id d124mr19535791pfg.118.1472154758257; Thu, 25 Aug 2016 12:52:38 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id pj6si16923845pac.250.2016.08.25.12.52.38; Thu, 25 Aug 2016 12:52:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756858AbcHYTwf (ORCPT + 8 others); Thu, 25 Aug 2016 15:52:35 -0400 Received: from mail-pf0-f174.google.com ([209.85.192.174]:36522 "EHLO mail-pf0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756804AbcHYTw0 (ORCPT ); Thu, 25 Aug 2016 15:52:26 -0400 Received: by mail-pf0-f174.google.com with SMTP id h186so20604668pfg.3 for ; Thu, 25 Aug 2016 12:52:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nP2WZEnkovd6MyeNkqtBYHiNrUsPjiWq+Ghgyn8hWr8=; b=VFi3y+qW7ziO6iqaB9WNKHzlojdNrROJEy9TAgECRpKdnY08eJHzB6DfSsOMSMFsNG tOSKB5IizpDMReAwFsQcwG6UVhFEn4NC09VocYKHr6VEYTghfl6w4GJ+b5OYeQr9Wt+t 1oDFbUHqrvrMljal8KBaT2tqkI3l0dcQTeVdE= 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=nP2WZEnkovd6MyeNkqtBYHiNrUsPjiWq+Ghgyn8hWr8=; b=OORJEb/0hfPJDsMvqtbssWzPfghUYaIWrUd+jyq3H4hkhFrjH58dCLjbgutUsXB5IE Q8sZVS4fYH5Gub3WfGktHkXu+jUZxbn2OPe6EX8sBVAU+xjAfB6GHyqtrRHkBsP2nftk VWLXUz3CjCsz1+X3fheKjWoobXKf6plo4iKyg6RBKWKSKTkv0PGxJ2NjPISlhhzETSa2 kgiDbtF+A67N0ushc53BU4XLdOtKgdRrX/6ytWbUEo/9UyrIva2iZuRj1kyWSOa2ro/m iWUxrj5d0yRPIgDOOAopr2OZc3In0eAlp1dMvDacbk7e6Mb1U9oZ6H8Cwh74q4Lk/knz gybA== X-Gm-Message-State: AE9vXwMe5ecewHhf5Owqrdlb3Kj8fzC6EnMaY8UnB6BuLhK1KCLCbxB8Voh/qdnwgorTp3HK X-Received: by 10.98.16.75 with SMTP id y72mr19559087pfi.50.1472154734378; Thu, 25 Aug 2016 12:52:14 -0700 (PDT) Received: from ubuntu.localdomain (i-global254.qualcomm.com. [199.106.103.254]) by smtp.gmail.com with ESMTPSA id i62sm22783375pfg.62.2016.08.25.12.52.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Aug 2016 12:52:13 -0700 (PDT) From: Lina Iyer To: ulf.hansson@linaro.org, khilman@kernel.org, rjw@rjwysocki.net, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: andy.gross@linaro.org, sboyd@codeaurora.org, linux-arm-msm@vger.kernel.org, brendan.jackman@arm.com, lorenzo.pieralisi@arm.com, sudeep.holla@arm.com, Juri.Lelli@arm.com, Lina Iyer , Daniel Lezcano Subject: [PATCH v4 08/16] ARM: cpuidle: Add runtime PM support for CPUs Date: Thu, 25 Aug 2016 13:51:38 -0600 Message-Id: <1472154706-40119-9-git-send-email-lina.iyer@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1472154706-40119-1-git-send-email-lina.iyer@linaro.org> References: <1472154706-40119-1-git-send-email-lina.iyer@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Notify runtime PM when the CPU is going to be powered off in the idle state. This allows for runtime PM suspend/resume of the CPU as well as its PM domain. We do not call into runtime PM for ARM WFI to keep the default state simple and faster. Cc: Daniel Lezcano Cc: Lorenzo Pieralisi Signed-off-by: Lina Iyer --- drivers/cpuidle/cpuidle-arm.c | 55 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/cpuidle/cpuidle-arm.c b/drivers/cpuidle/cpuidle-arm.c index e342565e..3abd145 100644 --- a/drivers/cpuidle/cpuidle-arm.c +++ b/drivers/cpuidle/cpuidle-arm.c @@ -11,12 +11,14 @@ #define pr_fmt(fmt) "CPUidle arm: " fmt +#include #include #include #include #include #include #include +#include #include #include @@ -37,6 +39,7 @@ static int arm_enter_idle_state(struct cpuidle_device *dev, struct cpuidle_driver *drv, int idx) { int ret; + struct device *cpu_dev = get_cpu_device(dev->cpu); if (!idx) { cpu_do_idle(); @@ -46,12 +49,20 @@ static int arm_enter_idle_state(struct cpuidle_device *dev, ret = cpu_pm_enter(); if (!ret) { /* + * Call runtime PM suspend on our device + * Notify RCU to pay attention to critical sections + * called from within runtime PM. + */ + RCU_NONIDLE(pm_runtime_put_sync_suspend(cpu_dev)); + + /* * Pass idle state index to cpu_suspend which in turn will * call the CPU ops suspend protocol with idle index as a * parameter. */ ret = arm_cpuidle_suspend(idx); + RCU_NONIDLE(pm_runtime_get_sync(cpu_dev)); cpu_pm_exit(); } @@ -84,6 +95,34 @@ static const struct of_device_id arm_idle_state_match[] __initconst = { { }, }; +#ifdef CONFIG_HOTPLUG_CPU +static int arm_idle_cpu_hotplug(struct notifier_block *nb, + unsigned long action, void *data) +{ + struct device *cpu_dev = get_cpu_device(smp_processor_id()); + + /* Execute CPU runtime PM on that CPU */ + switch (action & ~CPU_TASKS_FROZEN) { + case CPU_DYING: + pm_runtime_put_sync_suspend(cpu_dev); + break; + case CPU_STARTING: + pm_runtime_get_sync(cpu_dev); + break; + default: + break; + } + + return NOTIFY_OK; +} +#else +static int arm_idle_cpu_hotplug(struct notifier_block *nb, + unsigned long action, void *data) +{ + return NOTIFY_OK; +} +#endif + /* * arm_idle_init * @@ -96,6 +135,7 @@ static int __init arm_idle_init(void) int cpu, ret; struct cpuidle_driver *drv = &arm_idle_driver; struct cpuidle_device *dev; + struct device *cpu_dev; /* * Initialize idle states data, starting at index 1. @@ -118,6 +158,16 @@ static int __init arm_idle_init(void) * idle states suspend back-end specific data */ for_each_possible_cpu(cpu) { + + /* Initialize Runtime PM for the CPU */ + cpu_dev = get_cpu_device(cpu); + pm_runtime_irq_safe(cpu_dev); + pm_runtime_enable(cpu_dev); + if (cpu_online(cpu)) { + pm_runtime_get_noresume(cpu_dev); + pm_runtime_set_active(cpu_dev); + } + ret = arm_cpuidle_init(cpu); /* @@ -148,10 +198,15 @@ static int __init arm_idle_init(void) } } + /* Register for hotplug notifications for runtime PM */ + hotcpu_notifier(arm_idle_cpu_hotplug, 0); + return 0; out_fail: while (--cpu >= 0) { dev = per_cpu(cpuidle_devices, cpu); + cpu_dev = get_cpu_device(cpu); + __pm_runtime_disable(cpu_dev, false); cpuidle_unregister_device(dev); kfree(dev); }