From: Nicholas Piggin <npiggin@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: Nicholas Piggin <npiggin@gmail.com>
Subject: [PATCH 3/5] powerpc/64s: use alternative feature patching
Date: Fri, 17 Feb 2017 04:38:59 +1000 [thread overview]
Message-ID: <20170216183901.28611-4-npiggin@gmail.com> (raw)
In-Reply-To: <20170216183901.28611-1-npiggin@gmail.com>
This reduces the number of nops for POWER8
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
arch/powerpc/kernel/idle_book3s.S | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/arch/powerpc/kernel/idle_book3s.S b/arch/powerpc/kernel/idle_book3s.S
index 1271344e5523..ab15dee371c9 100644
--- a/arch/powerpc/kernel/idle_book3s.S
+++ b/arch/powerpc/kernel/idle_book3s.S
@@ -417,13 +417,8 @@ BEGIN_FTR_SECTION
rldicl r5,r5,4,60
cmpd cr4,r5,r4
bge cr4,pnv_wakeup_tb_loss
- /*
- * Waking up without hypervisor state loss. Return to
- * reset vector
- */
- blr
-END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300)
+FTR_SECTION_ELSE
/*
* POWER ISA 2.07 or less.
@@ -440,9 +435,13 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300)
* indicates we are waking with hypervisor state loss from nap.
*/
bgt cr3,.
+ALT_FTR_SECTION_END_IFSET(CPU_FTR_ARCH_300)
- blr /* Return back to System Reset vector from where
- pnv_restore_hyp_resource was invoked */
+ /*
+ * Waking up without hypervisor state loss. Return to
+ * reset vector
+ */
+ blr
/*
* Called if waking up from idle state which can cause either partial or
--
2.11.0
next prev parent reply other threads:[~2017-02-16 18:39 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-16 18:38 [RFC][PATCH 0/5] power saving wakeup changes for POWER9 MCE Nicholas Piggin
2017-02-16 18:38 ` [PATCH 1/5] powerpc/64s: move remaining system reset idle code into idle_book3s.S Nicholas Piggin
2017-02-28 11:40 ` Gautham R Shenoy
2017-02-16 18:38 ` [PATCH 2/5] powerpc/64: stop using bit in HSPRG0 to test winkle Nicholas Piggin
2017-02-28 15:08 ` Gautham R Shenoy
2017-02-28 15:36 ` Nicholas Piggin
2017-02-16 18:38 ` Nicholas Piggin [this message]
2017-02-28 15:12 ` [PATCH 3/5] powerpc/64s: use alternative feature patching Gautham R Shenoy
2017-02-16 18:39 ` [PATCH 4/5] powerpc/64s: consolidate pnv_restore_hyp_resource into pnv_powersave_wakeup Nicholas Piggin
2017-02-28 15:26 ` Gautham R Shenoy
2017-02-16 18:39 ` [PATCH 5/5] powerpc/64s: fix POWER9 machine check handler from stop state Nicholas Piggin
2017-02-28 17:15 ` Gautham R Shenoy
2017-03-08 12:19 ` Nicholas Piggin
2017-03-10 10:34 ` Gautham R Shenoy
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=20170216183901.28611-4-npiggin@gmail.com \
--to=npiggin@gmail.com \
--cc=linuxppc-dev@lists.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).