From: "Shreyas B. Prabhu" <shreyas@linux.vnet.ibm.com>
To: mpe@ellerman.id.au
Cc: linuxppc-dev@lists.ozlabs.org, paulus@ozlabs.org,
linux-kernel@vger.kernel.org, mikey@neuling.org,
ego@linux.vnet.ibm.com,
"Shreyas B. Prabhu" <shreyas@linux.vnet.ibm.com>
Subject: [PATCH v3 4/9] powerpc/powernv: Make power7_powersave_common more generic
Date: Mon, 23 May 2016 20:48:37 +0530 [thread overview]
Message-ID: <1464016722-7488-5-git-send-email-shreyas@linux.vnet.ibm.com> (raw)
In-Reply-To: <1464016722-7488-1-git-send-email-shreyas@linux.vnet.ibm.com>
power7_powersave_common does common steps needed before entering idle
state and eventually changes MSR to MSR_IDLE and does rfid to
power7_enter_nap_mode.
Move the updation of HSTATE_HWTHREAD_STATE to power7_powersave_common
from power7_enter_nap_mode and make it more generic by passing the rfid
address as a function parameter.
Also make function name more generic.
Reviewed-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com>
Signed-off-by: Shreyas B. Prabhu <shreyas@linux.vnet.ibm.com>
---
Changes in v3:
==============
- Moved HSTATE_HWTHREAD_STATE updation to power_powersave_common
arch/powerpc/kernel/idle_power_common.S | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/arch/powerpc/kernel/idle_power_common.S b/arch/powerpc/kernel/idle_power_common.S
index 973c9a1..d100577 100644
--- a/arch/powerpc/kernel/idle_power_common.S
+++ b/arch/powerpc/kernel/idle_power_common.S
@@ -74,8 +74,10 @@ core_idle_lock_held:
* To check IRQ_HAPPENED in r4
* 0 - don't check
* 1 - check
+ *
+ * Address to 'rfid' to in r5
*/
-_GLOBAL(power7_powersave_common)
+_GLOBAL(pnv_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
@@ -126,28 +128,27 @@ _GLOBAL(power7_powersave_common)
std r9,_MSR(r1)
std r1,PACAR1(r13)
+#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE
+ /* Tell KVM we're napping */
+ li r4,KVM_HWTHREAD_IN_NAP
+ stb r4,HSTATE_HWTHREAD_STATE(r13)
+#endif
/*
* Go to real mode to do the nap, as required by the architecture.
* Also, we need to be in real mode before setting hwthread_state,
* because as soon as we do that, another thread can switch
* the MMU context to the guest.
*/
- LOAD_REG_IMMEDIATE(r5, MSR_IDLE)
+ LOAD_REG_IMMEDIATE(r7, MSR_IDLE)
li r6, MSR_RI
andc r6, r9, r6
- LOAD_REG_ADDR(r7, power7_enter_nap_mode)
mtmsrd r6, 1 /* clear RI before setting SRR0/1 */
- mtspr SPRN_SRR0, r7
- mtspr SPRN_SRR1, r5
+ mtspr SPRN_SRR0, r5
+ mtspr SPRN_SRR1, r7
rfid
.globl power7_enter_nap_mode
power7_enter_nap_mode:
-#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE
- /* Tell KVM we're napping */
- li r4,KVM_HWTHREAD_IN_NAP
- stb r4,HSTATE_HWTHREAD_STATE(r13)
-#endif
stb r3,PACA_THREAD_IDLE_STATE(r13)
cmpwi cr3,r3,PNV_THREAD_SLEEP
bge cr3,2f
@@ -242,19 +243,22 @@ _GLOBAL(power7_idle)
_GLOBAL(power7_nap)
mr r4,r3
li r3,PNV_THREAD_NAP
- b power7_powersave_common
+ LOAD_REG_ADDR(r5, power7_enter_nap_mode)
+ b pnv_powersave_common
/* No return */
_GLOBAL(power7_sleep)
li r3,PNV_THREAD_SLEEP
li r4,1
- b power7_powersave_common
+ LOAD_REG_ADDR(r5, power7_enter_nap_mode)
+ b pnv_powersave_common
/* No return */
_GLOBAL(power7_winkle)
li r3,3
li r4,1
- b power7_powersave_common
+ LOAD_REG_ADDR(r5, power7_enter_nap_mode)
+ b pnv_powersave_common
/* No return */
#define CHECK_HMI_INTERRUPT \
--
2.4.11
next prev parent reply other threads:[~2016-05-23 15:19 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-23 15:18 [PATCH v3 0/9] powerpc/powernv/cpuidle: Add support for POWER ISA v3 idle states Shreyas B. Prabhu
2016-05-23 15:18 ` [PATCH v3 1/9] powerpc/kvm: make hypervisor state restore a function Shreyas B. Prabhu
2016-05-23 15:18 ` [PATCH v3 2/9] powerpc/powernv: Rename idle_power7.S to idle_power_common.S Shreyas B. Prabhu
2016-05-24 8:27 ` Gautham R Shenoy
2016-05-23 15:18 ` [PATCH v3 3/9] powerpc/powernv: Rename reusable idle functions to hardware agnostic names Shreyas B. Prabhu
2016-05-24 8:30 ` Gautham R Shenoy
2016-05-23 15:18 ` Shreyas B. Prabhu [this message]
2016-05-24 8:54 ` [PATCH v3 4/9] powerpc/powernv: Make power7_powersave_common more generic Gautham R Shenoy
2016-05-23 15:18 ` [PATCH v3 5/9] powerpc/powernv: abstraction for saving SPRs before entering deep idle states Shreyas B. Prabhu
2016-05-24 8:55 ` Gautham R Shenoy
2016-05-23 15:18 ` [PATCH v3 6/9] powerpc/powernv: set power_save func after the idle states are initialized Shreyas B. Prabhu
2016-05-23 15:18 ` [PATCH v3 7/9] powerpc/powernv: Add platform support for stop instruction Shreyas B. Prabhu
2016-05-24 8:47 ` Madhavan Srinivasan
2016-05-24 10:24 ` Gautham R Shenoy
2016-05-25 2:16 ` Shreyas B Prabhu
[not found] ` <886163be-b915-b60f-b25b-bf770f3ed821@linux.vnet.ibm.com>
2016-05-25 2:12 ` Shreyas B Prabhu
2016-05-23 15:18 ` [PATCH v3 8/9] cpuidle/powernv: Add support for POWER ISA v3 idle states Shreyas B. Prabhu
2016-05-24 10:37 ` Gautham R Shenoy
2016-05-23 15:18 ` [PATCH v3 9/9] powerpc/powernv: Use deepest stop state when cpu is offlined Shreyas B. Prabhu
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=1464016722-7488-5-git-send-email-shreyas@linux.vnet.ibm.com \
--to=shreyas@linux.vnet.ibm.com \
--cc=ego@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mikey@neuling.org \
--cc=mpe@ellerman.id.au \
--cc=paulus@ozlabs.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).