From: "Shreyas B. Prabhu" <shreyas@linux.vnet.ibm.com>
To: mpe@ellerman.id.au
Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org,
benh@kernel.crashing.org, paulus@samba.org,
mahesh@linux.vnet.ibm.com, maddy@linux.vnet.ibm.com,
"Shreyas B. Prabhu" <shreyas@linux.vnet.ibm.com>
Subject: [PATCH 2/3] powerpc/powernv: Encapsulate idle preparation steps in a macro
Date: Mon, 29 Feb 2016 17:52:59 +0530 [thread overview]
Message-ID: <1456748580-10519-3-git-send-email-shreyas@linux.vnet.ibm.com> (raw)
In-Reply-To: <1456748580-10519-1-git-send-email-shreyas@linux.vnet.ibm.com>
Before entering any idle state which can result in a state loss
we currently save the context in the stack before entering idle.
Encapsulate these steps in a macro IDLE_STATE_PREP. Move this
and other macros to commonly accessible location.
Signed-off-by: Shreyas B. Prabhu <shreyas@linux.vnet.ibm.com>
---
arch/powerpc/include/asm/cpuidle.h | 68 ++++++++++++++++++++++++++++++++++++++
arch/powerpc/kernel/idle_power7.S | 65 ++----------------------------------
2 files changed, 70 insertions(+), 63 deletions(-)
diff --git a/arch/powerpc/include/asm/cpuidle.h b/arch/powerpc/include/asm/cpuidle.h
index d2f99ca1e3a6..6c678a779e8e 100644
--- a/arch/powerpc/include/asm/cpuidle.h
+++ b/arch/powerpc/include/asm/cpuidle.h
@@ -15,6 +15,74 @@ extern u32 pnv_fastsleep_workaround_at_entry[];
extern u32 pnv_fastsleep_workaround_at_exit[];
#endif
+/*
+ * IDLE_STATE_PREP - Will be called in preparation for entering
+ * any hardware idle state. Since idle states can result in a
+ * state loss, we create a regs frame on the stack, fill it up
+ * with the state we care about and stick a pointer to it in
+ * PACAR1. Use interrupt stack frame for this purpose.
+ * r3 - contains idle state to be entered
+ * r13 - PACA pointer
+ */
+#define IDLE_STATE_PREP \
+ mflr r0; \
+ std r0,16(r1); \
+ stdu r1,-INT_FRAME_SIZE(r1); \
+ std r0,_LINK(r1); \
+ std r0,_NIP(r1); \
+ \
+ /* Hard disable interrupts */ \
+ mfmsr r9; \
+ rldicl r9,r9,48,1; \
+ rotldi r9,r9,16; \
+ mtmsrd r9,1; /* hard-disable interrupts */ \
+ \
+ /* Check if something happened while soft-disabled */ \
+ lbz r0,PACAIRQHAPPENED(r13); \
+ andi. r0,r0,~PACA_IRQ_HARD_DIS@l; \
+ beq 1f; \
+ cmpwi cr0,r4,0; \
+ beq 1f; \
+ addi r1,r1,INT_FRAME_SIZE; \
+ ld r0,16(r1); \
+ li r3,0; /* Return 0 (no nap) */ \
+ mtlr r0; \
+ blr; \
+1: /* We mark irqs hard disabled as this is the state \
+ * we'll be in when returning and we need to tell \
+ * arch_local_irq_restore() about it */ \
+ li r0,PACA_IRQ_HARD_DIS; \
+ stb r0,PACAIRQHAPPENED(r13); \
+ \
+ /* We haven't lost state ... yet */ \
+ li r0,0; \
+ stb r0,PACA_NAPSTATELOST(r13); \
+ \
+ /* Continue saving state */ \
+ SAVE_GPR(2, r1); \
+ SAVE_NVGPRS(r1); \
+ mfcr r4; \
+ std r4,_CCR(r1); \
+ std r9,_MSR(r1); \
+ std r1,PACAR1(r13); \
+
+/*
+ * We use interrupt stack to save and restore few registers like
+ * PC, CR, LR and NVGPRs while enter/exiting idle states. Since
+ * volatile registers don't need to be saved/restored use that space
+ * instead to save/restore sprs which lose state during winkle.
+ */
+#define _SDR1 GPR3
+#define _RPR GPR4
+#define _SPURR GPR5
+#define _PURR GPR6
+#define _TSCR GPR7
+#define _DSCR GPR8
+#define _AMOR GPR9
+#define _WORT GPR10
+#define _WORC GPR11
+
+
#endif
#endif
diff --git a/arch/powerpc/kernel/idle_power7.S b/arch/powerpc/kernel/idle_power7.S
index abc53e88a5b4..6af57e292848 100644
--- a/arch/powerpc/kernel/idle_power7.S
+++ b/arch/powerpc/kernel/idle_power7.S
@@ -24,20 +24,6 @@
#undef DEBUG
-/*
- * Use unused space in the interrupt stack to save and restore
- * registers for winkle support.
- */
-#define _SDR1 GPR3
-#define _RPR GPR4
-#define _SPURR GPR5
-#define _PURR GPR6
-#define _TSCR GPR7
-#define _DSCR GPR8
-#define _AMOR GPR9
-#define _WORT GPR10
-#define _WORC GPR11
-
/* Idle state entry routines */
#define IDLE_STATE_ENTER_SEQ(IDLE_INST) \
@@ -77,55 +63,8 @@ core_idle_lock_held:
* 1 - check
*/
_GLOBAL(power7_powersave_common)
- /* Use r3 to pass state nap/sleep/winkle */
- /* NAP is a state loss, we create a regs frame on the
- * stack, fill it up with the state we care about and
- * stick a pointer to it in PACAR1. We really only
- * need to save PC, some CR bits and the NV GPRs,
- * but for now an interrupt frame will do.
- */
- mflr r0
- std r0,16(r1)
- stdu r1,-INT_FRAME_SIZE(r1)
- std r0,_LINK(r1)
- std r0,_NIP(r1)
-
- /* Hard disable interrupts */
- mfmsr r9
- rldicl r9,r9,48,1
- rotldi r9,r9,16
- mtmsrd r9,1 /* hard-disable interrupts */
-
- /* Check if something happened while soft-disabled */
- lbz r0,PACAIRQHAPPENED(r13)
- andi. r0,r0,~PACA_IRQ_HARD_DIS@l
- beq 1f
- cmpwi cr0,r4,0
- beq 1f
- addi r1,r1,INT_FRAME_SIZE
- ld r0,16(r1)
- li r3,0 /* Return 0 (no nap) */
- mtlr r0
- blr
-
-1: /* We mark irqs hard disabled as this is the state we'll
- * be in when returning and we need to tell arch_local_irq_restore()
- * about it
- */
- li r0,PACA_IRQ_HARD_DIS
- stb r0,PACAIRQHAPPENED(r13)
-
- /* We haven't lost state ... yet */
- li r0,0
- stb r0,PACA_NAPSTATELOST(r13)
-
- /* Continue saving state */
- SAVE_GPR(2, r1)
- SAVE_NVGPRS(r1)
- mfcr r4
- std r4,_CCR(r1)
- std r9,_MSR(r1)
- std r1,PACAR1(r13)
+ /* Save PC, CR, LR and NVGPRs in stack */
+ IDLE_STATE_PREP;
/*
* Go to real mode to do the nap, as required by the architecture.
--
1.9.3
next prev parent reply other threads:[~2016-02-29 12:25 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-29 12:22 [PATCH 0/3] powerpc/powernv: Cpuidle related cleanup Shreyas B. Prabhu
2016-02-29 12:22 ` [PATCH 1/3] powerpc/powernv: Move CHECK_HMI_INTERRUPT to exception-64s header Shreyas B. Prabhu
2016-03-17 5:21 ` Paul Mackerras
2016-02-29 12:22 ` Shreyas B. Prabhu [this message]
2016-03-17 11:15 ` [PATCH 2/3] powerpc/powernv: Encapsulate idle preparation steps in a macro Paul Mackerras
2016-03-18 14:53 ` Shreyas B Prabhu
2016-03-19 0:21 ` Paul Mackerras
2016-03-21 13:27 ` Shreyas B Prabhu
2016-02-29 12:23 ` [PATCH 3/3] powerpc/powernv: Refactor hypervisor state restore code Shreyas B. Prabhu
2016-03-10 10:45 ` [PATCH 0/3] powerpc/powernv: Cpuidle related cleanup Shreyas B Prabhu
2016-03-11 1:00 ` Michael Ellerman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456748580-10519-3-git-send-email-shreyas@linux.vnet.ibm.com \
--to=shreyas@linux.vnet.ibm.com \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=maddy@linux.vnet.ibm.com \
--cc=mahesh@linux.vnet.ibm.com \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).