powerpc/64s: Invalidate ERAT on powersave wakeup for POWER9

[mirror_ubuntu-zesty-kernel.git] / arch / powerpc / kernel / idle_book3s.S

diff --git a/arch/powerpc/kernel/idle_book3s.S b/arch/powerpc/kernel/idle_book3s.S
index 67ba6a66fed5c46cd85708d09438f687d65866e3..fb762ee5ac6f719249770461c81c93ed8a38c868 100644 (file)
--- a/arch/powerpc/kernel/idle_book3s.S
+++ b/arch/powerpc/kernel/idle_book3s.S
@@ -432,6 +432,13 @@ BEGIN_FTR_SECTION_NESTED(70)
 FTR_SECTION_ELSE_NESTED(70)
        ld      r2, PACATOC(r13)
 ALT_FTR_SECTION_END_NESTED_IFSET(CPU_FTR_POWER9_DD1, 70)
+       /*
+        * Workaround for POWER9, if we lost resources, the ERAT
+        * might have been mixed up and needs flushing.
+        */
+       blt     cr3,1f
+       PPC_INVALIDATE_ERAT
+1:
        /*
         * POWER ISA 3. Use PSSCR to determine if we
         * are waking up from deep idle state