From patchwork Tue Oct 29 11:01:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepthi Dharwar X-Patchwork-Id: 286790 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 0B4072C0A5E for ; Tue, 29 Oct 2013 22:06:38 +1100 (EST) Received: from e28smtp07.in.ibm.com (e28smtp07.in.ibm.com [122.248.162.7]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "e28smtp07.in.ibm.com", Issuer "GeoTrust SSL CA" (not verified)) by ozlabs.org (Postfix) with ESMTPS id D28C72C03B6 for ; Tue, 29 Oct 2013 22:02:22 +1100 (EST) Received: from /spool/local by e28smtp07.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 29 Oct 2013 16:32:19 +0530 Received: from d28dlp03.in.ibm.com (9.184.220.128) by e28smtp07.in.ibm.com (192.168.1.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 29 Oct 2013 16:32:17 +0530 Received: from d28relay04.in.ibm.com (d28relay04.in.ibm.com [9.184.220.61]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id 00B791258055 for ; Tue, 29 Oct 2013 16:32:55 +0530 (IST) Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay04.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r9TB2Asx9830544 for ; Tue, 29 Oct 2013 16:32:10 +0530 Received: from d28av03.in.ibm.com (localhost [127.0.0.1]) by d28av03.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r9TB2Cqt029407 for ; Tue, 29 Oct 2013 16:32:13 +0530 Received: from deepthi.in.ibm.com (deepthi.in.ibm.com [9.124.35.20] (may be forged)) by d28av03.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id r9TB2Cl3029402; Tue, 29 Oct 2013 16:32:12 +0530 Subject: [PATCH V7 6/7] POWER/cpuidle: Enable powernv cpuidle support. To: benh@kernel.crashing.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org From: Deepthi Dharwar Date: Tue, 29 Oct 2013 16:31:56 +0530 Message-ID: <20131029110154.31547.94129.stgit@deepthi.in.ibm.com> In-Reply-To: <20131029110052.31547.82682.stgit@deepthi.in.ibm.com> References: <20131029110052.31547.82682.stgit@deepthi.in.ibm.com> User-Agent: StGit/0.16 MIME-Version: 1.0 X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13102911-8878-0000-0000-00000978D0E8 Cc: daniel.lezcano@linaro.org, preeti@linux.vnet.ibm.com, srivatsa.bhat@linux.vnet.ibm.com, scottwood@freescale.com, linux-pm@lists.linux-foundation.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.16rc2 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" The following patch extends the current power backend idle driver to the powernv platform. Signed-off-by: Deepthi Dharwar Acked-by: Daniel Lezcano --- drivers/cpuidle/cpuidle-ibm-power.c | 39 ++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/drivers/cpuidle/cpuidle-ibm-power.c b/drivers/cpuidle/cpuidle-ibm-power.c index 5b92242..f790ea2 100644 --- a/drivers/cpuidle/cpuidle-ibm-power.c +++ b/drivers/cpuidle/cpuidle-ibm-power.c @@ -52,9 +52,10 @@ static int snooze_loop(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index) { - unsigned long in_purr; + unsigned long in_purr = 0; - idle_loop_prolog(&in_purr); + if (firmware_has_feature(FW_FEATURE_SPLPAR)) + idle_loop_prolog(&in_purr); local_irq_enable(); set_thread_flag(TIF_POLLING_NRFLAG); @@ -68,7 +69,8 @@ static int snooze_loop(struct cpuidle_device *dev, clear_thread_flag(TIF_POLLING_NRFLAG); smp_mb(); - idle_loop_epilog(in_purr); + if (firmware_has_feature(FW_FEATURE_SPLPAR)) + idle_loop_epilog(in_purr); return index; } @@ -132,6 +134,15 @@ static int shared_cede_loop(struct cpuidle_device *dev, return index; } +static int nap_loop(struct cpuidle_device *dev, + struct cpuidle_driver *drv, + int index) +{ + ppc64_runlatch_off(); + power7_idle(); + return index; +} + /* * States for dedicated partition case. */ @@ -165,6 +176,23 @@ static struct cpuidle_state shared_states[] = { .enter = &shared_cede_loop }, }; +static struct cpuidle_state powernv_states[] = { + { /* Snooze */ + .name = "snooze", + .desc = "snooze", + .flags = CPUIDLE_FLAG_TIME_VALID, + .exit_latency = 0, + .target_residency = 0, + .enter = &snooze_loop }, + { /* NAP */ + .name = "NAP", + .desc = "NAP", + .flags = CPUIDLE_FLAG_TIME_VALID, + .exit_latency = 10, + .target_residency = 100, + .enter = &nap_loop }, +}; + void update_smt_snooze_delay(int cpu, int residency) { struct cpuidle_driver *drv = cpuidle_get_driver(); @@ -258,6 +286,11 @@ static int power_idle_probe(void) cpuidle_state_table = dedicated_states; max_idle_state = ARRAY_SIZE(dedicated_states); } + + } else if (firmware_has_feature(FW_FEATURE_OPALv3)) { + cpuidle_state_table = powernv_states; + max_idle_state = ARRAY_SIZE(powernv_states); + } else return -ENODEV;