From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from na01-bl2-obe.outbound.protection.outlook.com (mail-bl2lp0206.outbound.protection.outlook.com [207.46.163.206]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B23EF140109 for ; Thu, 1 May 2014 08:49:00 +1000 (EST) Message-ID: <1398898118.24575.223.camel@snotra.buserror.net> Subject: Re: [PATCH][v2] powerpc: move epapr paravirt init of power_save to an initcall From: Scott Wood To: Stuart Yoder Date: Wed, 30 Apr 2014 17:48:38 -0500 In-Reply-To: <1398889209-10350-1-git-send-email-stuart.yoder@freescale.com> References: <1398889209-10350-1-git-send-email-stuart.yoder@freescale.com> Content-Type: text/plain; charset="UTF-8" MIME-Version: 1.0 Cc: linuxppc-dev@lists.ozlabs.org, agraf@suse.de List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Wed, 2014-04-30 at 15:20 -0500, Stuart Yoder wrote: > From: Stuart Yoder > > some restructuring of epapr paravirt init resulted in > ppc_md.power_save being set, and then overwritten to > NULL during machine_init. This patch splits the > initialization of ppc_md.power_save out into a postcore > init call. > > Signed-off-by: Stuart Yoder > --- > > -v2: don't iterate over the entire DT, just look at > the hypervisor node > > arch/powerpc/kernel/epapr_paravirt.c | 25 ++++++++++++++++++++----- > 1 file changed, 20 insertions(+), 5 deletions(-) > > diff --git a/arch/powerpc/kernel/epapr_paravirt.c b/arch/powerpc/kernel/epapr_paravirt.c > index 7898be9..a01df5e 100644 > --- a/arch/powerpc/kernel/epapr_paravirt.c > +++ b/arch/powerpc/kernel/epapr_paravirt.c > @@ -53,11 +53,6 @@ static int __init early_init_dt_scan_epapr(unsigned long node, > #endif > } > > -#if !defined(CONFIG_64BIT) || defined(CONFIG_PPC_BOOK3E_64) > - if (of_get_flat_dt_prop(node, "has-idle", NULL)) > - ppc_md.power_save = epapr_ev_idle; > -#endif > - > epapr_paravirt_enabled = true; > > return 1; > @@ -70,3 +65,23 @@ int __init epapr_paravirt_early_init(void) > return 0; > } > > +static int __init epapr_idle_init(void) > +{ > + struct device_node *node; > + > + if (!epapr_paravirt_enabled) > + return 0; > + > + node = of_find_node_by_path("/hypervisor"); > + if (!node) > + return -ENODEV; > + > +#if !defined(CONFIG_64BIT) || defined(CONFIG_PPC_BOOK3E_64) > + if (of_get_property(node, "has-idle", NULL)) > + ppc_md.power_save = epapr_ev_idle; > +#endif > + > + return 0; > +} Why duplicate the search-for-hv-node code? Just have the early init func set a flag indicating whether has-idle was found, and have epapr_idle_init act on that flag. -Scott