From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3x2mlf6FxdzDqhn for ; Thu, 6 Jul 2017 02:38:38 +1000 (AEST) 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 v65GcaQG104291 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 2bh39d1jb9-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 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 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> Message-Id: <1499272696-28751-4-git-send-email-ego@linux.vnet.ibm.com> List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 --- 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; } -- 1.9.4