From patchwork Thu Aug 4 23:04:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lina Iyer X-Patchwork-Id: 9264575 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AB0AE6048B for ; Thu, 4 Aug 2016 23:11:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9B2F2283DF for ; Thu, 4 Aug 2016 23:11:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8E66728424; Thu, 4 Aug 2016 23:11:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1ACD2283DF for ; Thu, 4 Aug 2016 23:11:06 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bVRki-0007Dt-Lo; Thu, 04 Aug 2016 23:08:36 +0000 Received: from mail-pf0-x231.google.com ([2607:f8b0:400e:c00::231]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bVRiN-0005hU-SL for linux-arm-kernel@lists.infradead.org; Thu, 04 Aug 2016 23:06:16 +0000 Received: by mail-pf0-x231.google.com with SMTP id h186so90607858pfg.3 for ; Thu, 04 Aug 2016 16:05:51 -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=Lo10mqEdr33Gp6Q4CGjnlsiqv/kTvSLcdj3QdnK9z/ZnHkDqhj3wEfGV/qYvcp5K/9 T29TbcpSrGA4U4dFPCcy/1I3udVnk+XCrAguSUU0qLUORfi15aBZEew3E8/6xp2VK7tM ipkvi+Bsk6hI3aVe94jvb6A2OIfB4r01yw0L8= 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=AQgbsrmYWFkhk9/ug7lDTrlNOux+FIHyDmuiRy8qLXiidb8h5mcquQfrKRrLiHCJMQ 4YMktXwHDpC/sMBkIfoVszLWzibOnuYFRQw5syOzxfi8NdxZr9ClJs4Gt19IjPRRb9cD /LLoOpw4z6sSoGhN+58yVgeMhO+1uISeNBadPsgaXuszPSp6TDnGtJQHpi8SACFRvgUs ogRupzTTWH7ilLTZX1o9FVa0k+L2xeE6tot462djT/3VNHEjpqBJ6GL/GFpWOj0+ITol YZbQJ9OoXUunLObkXJZlFKjJvfcY5AAWHQgdRsN31FMD6l8WpXfvGHxByw6/yR1X3YZj +89w== X-Gm-Message-State: AEkoouuFWy0Azrwo59O4pnY4DCrndFmXxj4COzeVfnccPj+PAMcfu3phHGGsaqnSxlVqqUEj X-Received: by 10.98.29.201 with SMTP id d192mr130478915pfd.142.1470351950794; Thu, 04 Aug 2016 16:05:50 -0700 (PDT) Received: from ubuntu.localdomain (i-global254.qualcomm.com. [199.106.103.254]) by smtp.gmail.com with ESMTPSA id x66sm22736214pfb.86.2016.08.04.16.05.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 04 Aug 2016 16:05:49 -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 Subject: [PATCH v3 07/15] ARM: cpuidle: Add runtime PM support for CPUs Date: Thu, 4 Aug 2016 17:04:54 -0600 Message-Id: <1470351902-43103-8-git-send-email-lina.iyer@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1470351902-43103-1-git-send-email-lina.iyer@linaro.org> References: <1470351902-43103-1-git-send-email-lina.iyer@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160804_160612_266797_3897BF68 X-CRM114-Status: GOOD ( 16.34 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lorenzo Pieralisi , linux-arm-msm@vger.kernel.org, Daniel Lezcano , sboyd@codeaurora.org, andy.gross@linaro.org, Lina Iyer MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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(+) 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); }