[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <18100.1364171644@ale.ozlabs.ibm.com>
Date: Mon, 25 Mar 2013 11:34:04 +1100
From: Michael Neuling <mikey@...ling.org>
To: Stuart Yoder <stuart.yoder@...escale.com>
cc: chen.gang.flying.transformer@...il.com, galak@...nel.crashing.org,
gang.chen@...anux.com, benh@...nel.crashing.org,
sfr@...b.auug.org.au, paulus@...ba.org, matt@...abs.org,
imunsie@....ibm.com, linuxppc-dev@...ts.ozlabs.org,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH] PPC: define the conditions where the ePAPR idle hcall can be supported
Stuart Yoder <stuart.yoder@...escale.com> wrote:
> From: Stuart Yoder <stuart.yoder@...escale.com>
>
> For 32-bit, CONFIG_EPAPR_PARAVIRT pulls in both epapr_paravirt.c
> and epapr_hcalls.c which contains the 32-bit paravirt idle loop.
>
> For 64-bit, the paravirt idle loop is in idle_book3e.S and that
> source file is included only if CONFIG_PPC_BOOK3E_64 defined.
>
> This patch makes that dependency for 64-bit explicit.
>
> Signed-off-by: Stuart Yoder <stuart.yoder@...escale.com>
It works for me. Thanks.
> ---
> arch/powerpc/kernel/epapr_paravirt.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/arch/powerpc/kernel/epapr_paravirt.c b/arch/powerpc/kernel/epapr_paravirt.c
> index f3eab85..d44a571 100644
> --- a/arch/powerpc/kernel/epapr_paravirt.c
> +++ b/arch/powerpc/kernel/epapr_paravirt.c
> @@ -23,8 +23,10 @@
> #include <asm/code-patching.h>
> #include <asm/machdep.h>
>
> +#if !defined(CONFIG_64BIT) || defined(CONFIG_PPC_BOOK3E_64)
> extern void epapr_ev_idle(void);
> extern u32 epapr_ev_idle_start[];
> +#endif
You don't need this #ifdef
>
> bool epapr_paravirt_enabled;
>
> @@ -47,11 +49,15 @@ static int __init epapr_paravirt_init(void)
>
> for (i = 0; i < (len / 4); i++) {
> patch_instruction(epapr_hypercall_start + i, insts[i]);
> +#if !defined(CONFIG_64BIT) || defined(CONFIG_PPC_BOOK3E_64)
> patch_instruction(epapr_ev_idle_start + i, insts[i]);
> +#endif
> }
>
> +#if !defined(CONFIG_64BIT) || defined(CONFIG_PPC_BOOK3E_64)
> if (of_get_property(hyper_node, "has-idle", NULL))
> ppc_md.power_save = epapr_ev_idle;
> +#endif
>
> epapr_paravirt_enabled = true;
>
> --
> 1.7.9.7
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists