powerpc: Correct DSCR during TM context switch

[karo-tx-linux.git] / arch / powerpc / kernel / epapr_paravirt.c

diff --git a/arch/powerpc/kernel/epapr_paravirt.c b/arch/powerpc/kernel/epapr_paravirt.c
index 7898be90f2dcd013ecec5d17dcb4897e9a1b62f7..59e4ba74975d9cf6be38ffa9312d2cbe6572a829 100644 (file)
--- a/arch/powerpc/kernel/epapr_paravirt.c
+++ b/arch/powerpc/kernel/epapr_paravirt.c
@@ -30,13 +30,14 @@ extern u32 epapr_ev_idle_start[];
 #endif
 
 bool epapr_paravirt_enabled;
+static bool __maybe_unused epapr_has_idle;
 
 static int __init early_init_dt_scan_epapr(unsigned long node,
                                           const char *uname,
                                           int depth, void *data)
 {
        const u32 *insts;
-       unsigned long len;
+       int len;
        int i;
 
        insts = of_get_flat_dt_prop(node, "hcall-instructions", &len);
@@ -47,15 +48,16 @@ static int __init early_init_dt_scan_epapr(unsigned long node,
                return -1;
 
        for (i = 0; i < (len / 4); i++) {
-               patch_instruction(epapr_hypercall_start + i, insts[i]);
+               u32 inst = be32_to_cpu(insts[i]);
+               patch_instruction(epapr_hypercall_start + i, inst);
 #if !defined(CONFIG_64BIT) || defined(CONFIG_PPC_BOOK3E_64)
-               patch_instruction(epapr_ev_idle_start + i, insts[i]);
+               patch_instruction(epapr_ev_idle_start + i, inst);
 #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;
+               epapr_has_idle = true;
 #endif
 
        epapr_paravirt_enabled = true;
@@ -70,3 +72,14 @@ int __init epapr_paravirt_early_init(void)
        return 0;
 }
 
+static int __init epapr_idle_init(void)
+{
+#if !defined(CONFIG_64BIT) || defined(CONFIG_PPC_BOOK3E_64)
+       if (epapr_has_idle)
+               ppc_md.power_save = epapr_ev_idle;
+#endif
+
+       return 0;
+}
+
+postcore_initcall(epapr_idle_init);