powerpc/64s: Move IDLE_STATE_ENTER_SEQ[_NORET] into idle_book3s.S

This macro is only used in idle_book3s.S, move it in there and add a
more descriptive comment.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
[mpe: Split out of larger patch and write change log]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/include/asm/cpuidle.h b/arch/powerpc/include/asm/cpuidle.h
index 8a174cba5567b84ec4f10dbe1b2d9ee9421075a9..eb43b5c3a7b57f471c4a112cf7bf66d820809d9e 100644 (file)
--- a/arch/powerpc/include/asm/cpuidle.h
+++ b/arch/powerpc/include/asm/cpuidle.h
@@ -101,20 +101,4 @@ static inline void report_invalid_psscr_val(u64 psscr_val, int err)
 
 #endif
 
-/* Idle state entry routines */
-#ifdef CONFIG_PPC_P7_NAP
-#define IDLE_STATE_ENTER_SEQ(IDLE_INST)                         \
-       /* Magic NAP/SLEEP/WINKLE mode enter sequence */        \
-       std     r0,0(r1);                                       \
-       ptesync;                                                \
-       ld      r0,0(r1);                                       \
-236:   cmpd    cr0,r0,r0;                                      \
-       bne     236b;                                           \
-       IDLE_INST;                                              \
-
-#define        IDLE_STATE_ENTER_SEQ_NORET(IDLE_INST)                   \
-       IDLE_STATE_ENTER_SEQ(IDLE_INST)                         \
-       b       .
-#endif /* CONFIG_PPC_P7_NAP */
-
 #endif

diff --git a/arch/powerpc/kernel/idle_book3s.S b/arch/powerpc/kernel/idle_book3s.S
index 4924647d964d63abf87347ca5973c288e6a6825a..c3cc18573ca6bbd8659fb9c4eeb4e191163b7150 100644 (file)
--- a/arch/powerpc/kernel/idle_book3s.S
+++ b/arch/powerpc/kernel/idle_book3s.S
@@ -205,6 +205,23 @@ pnv_powersave_common:
        mtmsrd  r7,0
        bctr
 
+/*
+ * This is the sequence required to execute idle instructions, as
+ * specified in ISA v2.07 (and earlier). MSR[IR] and MSR[DR] must be 0.
+ */
+#define IDLE_STATE_ENTER_SEQ(IDLE_INST)                                \
+       /* Magic NAP/SLEEP/WINKLE mode enter sequence */        \
+       std     r0,0(r1);                                       \
+       ptesync;                                                \
+       ld      r0,0(r1);                                       \
+236:   cmpd    cr0,r0,r0;                                      \
+       bne     236b;                                           \
+       IDLE_INST;
+
+#define IDLE_STATE_ENTER_SEQ_NORET(IDLE_INST)                  \
+       IDLE_STATE_ENTER_SEQ(IDLE_INST)                         \
+       b       .
+
        .globl pnv_enter_arch207_idle_mode
 pnv_enter_arch207_idle_mode:
 #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE