From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from e23smtp04.au.ibm.com (e23smtp04.au.ibm.com [202.81.31.146]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "e23smtp04.au.ibm.com", Issuer "GeoTrust SSL CA" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 78D572C0448 for ; Mon, 11 Nov 2013 16:36:21 +1100 (EST) Received: from /spool/local by e23smtp04.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 11 Nov 2013 15:36:19 +1000 Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [9.190.235.152]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id 4680A2BB0044 for ; Mon, 11 Nov 2013 16:36:17 +1100 (EST) Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id rAB5IVSa55705682 for ; Mon, 11 Nov 2013 16:18:32 +1100 Received: from d23av03.au.ibm.com (localhost [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id rAB5aFSg010323 for ; Mon, 11 Nov 2013 16:36:16 +1100 Subject: [PATCH v8 6/7] POWER/cpuidle: Enable powernv cpuidle support. To: benh@kernel.crashing.org, linux-pm@lists.linux-foundation.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org From: Deepthi Dharwar Date: Mon, 11 Nov 2013 11:05:59 +0530 Message-ID: <20131111053556.14797.8562.stgit@deepthi.in.ibm.com> In-Reply-To: <20131111053450.14797.75544.stgit@deepthi.in.ibm.com> References: <20131111053450.14797.75544.stgit@deepthi.in.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Cc: b.zolnierkie@samsung.com, daniel.lezcano@linaro.org, dongsheng.wang@freescale.com, preeti@linux.vnet.ibm.com, srivatsa.bhat@linux.vnet.ibm.com, scottwood@freescale.com List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , The following patch extends the current powerpc-book3s backend idle driver to the powernv platform. Signed-off-by: Deepthi Dharwar Acked-by: Daniel Lezcano --- drivers/cpuidle/cpuidle-powerpc-book3s.c | 39 ++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/drivers/cpuidle/cpuidle-powerpc-book3s.c b/drivers/cpuidle/cpuidle-powerpc-book3s.c index 7b785ff..25e8a99 100644 --- a/drivers/cpuidle/cpuidle-powerpc-book3s.c +++ b/drivers/cpuidle/cpuidle-powerpc-book3s.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 powerpc_book3s_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;