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 3/9] powerpc/powernv: Rename reusable idle functions to hardware agnostic names
Date: Mon, 23 May 2016 20:48:36 +0530 [thread overview]
Message-ID: <1464016722-7488-4-git-send-email-shreyas@linux.vnet.ibm.com> (raw)
In-Reply-To: <1464016722-7488-1-git-send-email-shreyas@linux.vnet.ibm.com>
Functions like power7_wakeup_loss, power7_wakeup_noloss,
power7_wakeup_tb_loss are used by POWER7 and POWER8 hardware. They can
also be used by POWER9. Hence rename these functions hardware agnostic
names.
Suggested-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com>
Signed-off-by: Shreyas B. Prabhu <shreyas@linux.vnet.ibm.com>
---
New in v3
arch/powerpc/kernel/exceptions-64s.S | 6 +++---
arch/powerpc/kernel/idle_power_common.S | 16 ++++++++--------
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 4 ++--
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index 4a74d6a..a0da627 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -108,7 +108,7 @@ BEGIN_FTR_SECTION
cmpwi cr3,r13,2
GET_PACA(r13)
- bl power7_restore_hyp_resource
+ bl pnv_restore_hyp_resource
li r0,PNV_THREAD_RUNNING
stb r0,PACA_THREAD_IDLE_STATE(r13) /* Clear thread state */
@@ -128,8 +128,8 @@ BEGIN_FTR_SECTION
/* Return SRR1 from power7_nap() */
mfspr r3,SPRN_SRR1
blt cr3,2f
- b power7_wakeup_loss
-2: b power7_wakeup_noloss
+ b pnv_wakeup_loss
+2: b pnv_wakeup_noloss
9:
END_FTR_SECTION_IFSET(CPU_FTR_HVMODE | CPU_FTR_ARCH_206)
diff --git a/arch/powerpc/kernel/idle_power_common.S b/arch/powerpc/kernel/idle_power_common.S
index db59613..973c9a1 100644
--- a/arch/powerpc/kernel/idle_power_common.S
+++ b/arch/powerpc/kernel/idle_power_common.S
@@ -284,7 +284,7 @@ ALT_FTR_SECTION_END_NESTED_IFSET(CPU_FTR_ARCH_207S, 66); \
* r13 - Contents of HSPRG0
* cr3 - set to gt if waking up with partial/complete hypervisor state loss
*/
-_GLOBAL(power7_restore_hyp_resource)
+_GLOBAL(pnv_restore_hyp_resource)
/*
* Check if last bit of HSPGR0 is set. This indicates whether we are
* waking up from winkle.
@@ -296,7 +296,7 @@ _GLOBAL(power7_restore_hyp_resource)
lbz r0,PACA_THREAD_IDLE_STATE(r13)
cmpwi cr2,r0,PNV_THREAD_NAP
- bgt cr2,power7_wakeup_tb_loss /* Either sleep or Winkle */
+ bgt cr2,pnv_wakeup_tb_loss /* Either sleep or Winkle */
/*
* We fall through here if PACA_THREAD_IDLE_STATE shows we are waking
@@ -306,10 +306,10 @@ _GLOBAL(power7_restore_hyp_resource)
bgt cr3,.
blr /* Return back to System Reset vector from where
- power7_restore_hyp_resource was invoked */
+ pnv_restore_hyp_resource was invoked */
-_GLOBAL(power7_wakeup_tb_loss)
+_GLOBAL(pnv_wakeup_tb_loss)
ld r2,PACATOC(r13);
ld r1,PACAR1(r13)
/*
@@ -476,7 +476,7 @@ hypervisor_state_restored:
mtspr SPRN_SRR1,r16
mtlr r17
blr /* Return back to System Reset vector from where
- power7_restore_hyp_resource was invoked */
+ pnv_restore_hyp_resource was invoked */
fastsleep_workaround_at_exit:
li r3,1
@@ -489,7 +489,7 @@ fastsleep_workaround_at_exit:
* R3 here contains the value that will be returned to the caller
* of power7_nap.
*/
-_GLOBAL(power7_wakeup_loss)
+_GLOBAL(pnv_wakeup_loss)
ld r1,PACAR1(r13)
BEGIN_FTR_SECTION
CHECK_HMI_INTERRUPT
@@ -509,10 +509,10 @@ END_FTR_SECTION_IFSET(CPU_FTR_HVMODE)
* R3 here contains the value that will be returned to the caller
* of power7_nap.
*/
-_GLOBAL(power7_wakeup_noloss)
+_GLOBAL(pnv_wakeup_noloss)
lbz r0,PACA_NAPSTATELOST(r13)
cmpwi r0,0
- bne power7_wakeup_loss
+ bne pnv_wakeup_loss
BEGIN_FTR_SECTION
CHECK_HMI_INTERRUPT
END_FTR_SECTION_IFSET(CPU_FTR_HVMODE)
diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
index e571ad2..86f0cae 100644
--- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S
+++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
@@ -392,7 +392,7 @@ kvm_no_guest:
cmpwi r3, 0
bne 54f
/*
- * We jump to power7_wakeup_loss, which will return to the caller
+ * We jump to pnv_wakeup_loss, which will return to the caller
* of power7_nap in the powernv cpu offline loop. The value we
* put in r3 becomes the return value for power7_nap.
*/
@@ -401,7 +401,7 @@ kvm_no_guest:
rlwimi r4, r3, 0, LPCR_PECE0 | LPCR_PECE1
mtspr SPRN_LPCR, r4
li r3, 0
- b power7_wakeup_loss
+ b pnv_wakeup_loss
53: HMT_LOW
ld r5, HSTATE_KVM_VCORE(r13)
--
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 ` Shreyas B. Prabhu [this message]
2016-05-24 8:30 ` [PATCH v3 3/9] powerpc/powernv: Rename reusable idle functions to hardware agnostic names Gautham R Shenoy
2016-05-23 15:18 ` [PATCH v3 4/9] powerpc/powernv: Make power7_powersave_common more generic Shreyas B. Prabhu
2016-05-24 8:54 ` 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-4-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).