Patchwork PPC: define the conditions where the ePAPR idle hcall can be supported

login
register
mail settings
Submitter Stuart Yoder
Date March 22, 2013, 7:12 p.m.
Message ID <1363979533-24485-1-git-send-email-stuart.yoder@freescale.com>
Download mbox | patch
Permalink /patch/230244/
State Accepted
Headers show

Comments

Stuart Yoder - March 22, 2013, 7:12 p.m.
From: Stuart Yoder <stuart.yoder@freescale.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@freescale.com>
---
 arch/powerpc/kernel/epapr_paravirt.c |    6 ++++++
 1 file changed, 6 insertions(+)
Michael Neuling - March 25, 2013, 12:34 a.m.
Stuart Yoder <stuart.yoder@freescale.com> wrote:

> From: Stuart Yoder <stuart.yoder@freescale.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@freescale.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
> 
>

Patch

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
 
 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;