From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752150AbcFVByn (ORCPT ); Tue, 21 Jun 2016 21:54:43 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:26870 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751505AbcFVByl (ORCPT ); Tue, 21 Jun 2016 21:54:41 -0400 X-IBM-Helo: d23dlp01.au.ibm.com X-IBM-MailFrom: benh@au1.ibm.com X-IBM-RcptTo: linux-kernel@vger.kernel.org Subject: Re: [PATCH v6 07/11] powerpc/powernv: set power_save func after the idle states are initialized From: Benjamin Herrenschmidt Reply-To: benh@au1.ibm.com To: "Shreyas B. Prabhu" , mpe@ellerman.id.au Cc: ego@linux.vnet.ibm.com, mikey@neuling.org, linux-kernel@vger.kernel.org, maddy@linux.vnet.ibm.com, linuxppc-dev@lists.ozlabs.org Date: Wed, 22 Jun 2016 11:54:28 +1000 In-Reply-To: <1465404871-5406-8-git-send-email-shreyas@linux.vnet.ibm.com> References: <1465404871-5406-1-git-send-email-shreyas@linux.vnet.ibm.com> <1465404871-5406-8-git-send-email-shreyas@linux.vnet.ibm.com> Organization: IBM Australia Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.20.3 (3.20.3-1.fc24.1) Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16062201-0044-0000-0000-000001B86A5C X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16062201-0045-0000-0000-000004FB7185 Message-Id: <1466560468.4089.7.camel@au1.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-06-22_01:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=2 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1606220018 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 2016-06-08 at 11:54 -0500, Shreyas B. Prabhu wrote: > pnv_init_idle_states discovers supported idle states from the > device tree and does the required initialization. Set power_save > function pointer only after this initialization is done > > Reviewed-by: Gautham R. Shenoy > Signed-off-by: Shreyas B. Prabhu Acked-by: Benjamin Herrenschmidt Please merge that one as-is now, no need to wait for the rest, as otherwise pwoer9 crashes at boot. It doesn't need to wait for the rest of the series. Cheers, Ben. > --- > - No changes since v1 > >  arch/powerpc/platforms/powernv/idle.c  | 3 +++ >  arch/powerpc/platforms/powernv/setup.c | 2 +- >  2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/arch/powerpc/platforms/powernv/idle.c > b/arch/powerpc/platforms/powernv/idle.c > index fcc8b68..fbb09fb 100644 > --- a/arch/powerpc/platforms/powernv/idle.c > +++ b/arch/powerpc/platforms/powernv/idle.c > @@ -285,6 +285,9 @@ static int __init pnv_init_idle_states(void) >   } >   >   pnv_alloc_idle_core_states(); > + > + if (supported_cpuidle_states & OPAL_PM_NAP_ENABLED) > + ppc_md.power_save = power7_idle; >  out_free: >   kfree(flags); >  out: > diff --git a/arch/powerpc/platforms/powernv/setup.c > b/arch/powerpc/platforms/powernv/setup.c > index ee6430b..8492bbb 100644 > --- a/arch/powerpc/platforms/powernv/setup.c > +++ b/arch/powerpc/platforms/powernv/setup.c > @@ -315,7 +315,7 @@ define_machine(powernv) { >   .get_proc_freq          = pnv_get_proc_freq, >   .progress = pnv_progress, >   .machine_shutdown = pnv_shutdown, > - .power_save             = power7_idle, > + .power_save             = NULL, >   .calibrate_decr = generic_calibrate_decr, >  #ifdef CONFIG_KEXEC >   .kexec_cpu_down = pnv_kexec_cpu_down,