From patchwork Wed Jul 5 16:38:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautham R Shenoy X-Patchwork-Id: 9826811 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 31F6E602F0 for ; Wed, 5 Jul 2017 16:39:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2385228547 for ; Wed, 5 Jul 2017 16:39:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 17D702856F; Wed, 5 Jul 2017 16:39:54 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9A08528547 for ; Wed, 5 Jul 2017 16:39:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752010AbdGEQii (ORCPT ); Wed, 5 Jul 2017 12:38:38 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:55941 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751796AbdGEQig (ORCPT ); Wed, 5 Jul 2017 12:38:36 -0400 Received: from pps.filterd (m0098394.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v65GcYCb104150 for ; Wed, 5 Jul 2017 12:38:36 -0400 Received: from e13.ny.us.ibm.com (e13.ny.us.ibm.com [129.33.205.203]) by mx0a-001b2d01.pphosted.com with ESMTP id 2bh39d1jb8-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 05 Jul 2017 12:38:36 -0400 Received: from localhost by e13.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 5 Jul 2017 12:38:34 -0400 Received: from b01cxnp22033.gho.pok.ibm.com (9.57.198.23) by e13.ny.us.ibm.com (146.89.104.200) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 5 Jul 2017 12:38:31 -0400 Received: from b01ledav004.gho.pok.ibm.com (b01ledav004.gho.pok.ibm.com [9.57.199.109]) by b01cxnp22033.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v65GcVNK50135176; Wed, 5 Jul 2017 16:38:31 GMT Received: from b01ledav004.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 47E0D112047; Wed, 5 Jul 2017 12:38:31 -0400 (EDT) Received: from sofia.ibm.com (unknown [9.77.120.36]) by b01ledav004.gho.pok.ibm.com (Postfix) with ESMTP id 04FFC112040; Wed, 5 Jul 2017 12:38:31 -0400 (EDT) Received: by sofia.ibm.com (Postfix, from userid 1000) id 4785D2E2DCB; Wed, 5 Jul 2017 22:08:29 +0530 (IST) From: "Gautham R. Shenoy" To: Michael Ellerman , Michael Neuling , Nicholas Piggin , Vaidyanathan Srinivasan , Shilpasri G Bhat , "Rafael J. Wysocki" , Akshay Adiga Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, "Gautham R. Shenoy" Subject: [PATCH 3/5] powernv:idle: Define idle init function for power8 Date: Wed, 5 Jul 2017 22:08:14 +0530 X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1499272696-28751-1-git-send-email-ego@linux.vnet.ibm.com> References: <1499272696-28751-1-git-send-email-ego@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 17070516-0008-0000-0000-0000025661C7 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00007324; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000214; SDB=6.00883263; UDB=6.00440614; IPR=6.00663454; BA=6.00005454; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00016094; XFM=3.00000015; UTC=2017-07-05 16:38:34 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17070516-0009-0000-0000-000035EB6A41 Message-Id: <1499272696-28751-4-git-send-email-ego@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-07-05_10:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1703280000 definitions=main-1707050280 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "Gautham R. Shenoy" In this patch we define a new function named pnv_power8_idle_init(). We move the following code from pnv_init_idle_states() into this newly defined function. a) That patches out pnv_fastsleep_workaround_at_entry/exit when no states with OPAL_PM_SLEEP_ENABLED_ER1 are present. b) Creating a sysfs control to choose how the workaround has to be applied when a OPAL_PM_SLEEP_ENABLED_ER1 state is present. c) Set ppc_md.power_save to power7_idle when OPAL_PM_NAP_ENABLED is present. With this, all the power8 specific initializations are in one place. Signed-off-by: Gautham R. Shenoy Reviewed-by: Nicholas Piggin --- arch/powerpc/platforms/powernv/idle.c | 59 ++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 19 deletions(-) diff --git a/arch/powerpc/platforms/powernv/idle.c b/arch/powerpc/platforms/powernv/idle.c index a5990d9..c400ff9 100644 --- a/arch/powerpc/platforms/powernv/idle.c +++ b/arch/powerpc/platforms/powernv/idle.c @@ -564,6 +564,44 @@ static void __init pnv_power9_idle_init(void) pnv_first_deep_stop_state); } + +static void __init pnv_power8_idle_init(void) +{ + int i; + bool has_nap = false; + bool has_sleep_er1 = false; + int dt_idle_states = pnv_idle.nr_states; + + for (i = 0; i < dt_idle_states; i++) { + struct pnv_idle_state *state = &pnv_idle.states[i]; + + if (state->flags & OPAL_PM_NAP_ENABLED) + has_nap = true; + if (state->flags & OPAL_PM_SLEEP_ENABLED_ER1) + has_sleep_er1 = true; + } + + if (!has_sleep_er1) { + patch_instruction( + (unsigned int *)pnv_fastsleep_workaround_at_entry, + PPC_INST_NOP); + patch_instruction( + (unsigned int *)pnv_fastsleep_workaround_at_exit, + PPC_INST_NOP); + } else { + /* + * OPAL_PM_SLEEP_ENABLED_ER1 is set. It indicates that + * workaround is needed to use fastsleep. Provide sysfs + * control to choose how this workaround has to be applied. + */ + device_create_file(cpu_subsys.dev_root, + &dev_attr_fastsleep_workaround_applyonce); + } + + if (has_nap) + ppc_md.power_save = power7_idle; +} + /* * Returns 0 if prop1_len == prop2_len. Else returns -1 */ @@ -837,6 +875,8 @@ static int __init pnv_probe_idle_states(void) if (cpu_has_feature(CPU_FTR_ARCH_300)) pnv_power9_idle_init(); + else + pnv_power8_idle_init(); for (i = 0; i < dt_idle_states; i++) { if (!pnv_idle.states[i].valid) @@ -858,22 +898,6 @@ static int __init pnv_init_idle_states(void) if (pnv_probe_idle_states()) goto out; - if (!(supported_cpuidle_states & OPAL_PM_SLEEP_ENABLED_ER1)) { - patch_instruction( - (unsigned int *)pnv_fastsleep_workaround_at_entry, - PPC_INST_NOP); - patch_instruction( - (unsigned int *)pnv_fastsleep_workaround_at_exit, - PPC_INST_NOP); - } else { - /* - * OPAL_PM_SLEEP_ENABLED_ER1 is set. It indicates that - * workaround is needed to use fastsleep. Provide sysfs - * control to choose how this workaround has to be applied. - */ - device_create_file(cpu_subsys.dev_root, - &dev_attr_fastsleep_workaround_applyonce); - } pnv_alloc_idle_core_states(); @@ -899,9 +923,6 @@ static int __init pnv_init_idle_states(void) } } - if (supported_cpuidle_states & OPAL_PM_NAP_ENABLED) - ppc_md.power_save = power7_idle; - out: return 0; }