linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Nicholas Piggin <npiggin@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: Nicholas Piggin <npiggin@gmail.com>,
	"Gautham R . Shenoy" <ego@linux.vnet.ibm.com>
Subject: [PATCH 11/13] powerpc/64s: idle POWER9 can execute stop without ptesync
Date: Sun,  6 Aug 2017 03:02:39 +1000	[thread overview]
Message-ID: <20170805170241.22966-12-npiggin@gmail.com> (raw)
In-Reply-To: <20170805170241.22966-1-npiggin@gmail.com>

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
 arch/powerpc/kernel/idle_book3s.S       |  7 ++++---
 arch/powerpc/kvm/book3s_hv_rmhandlers.S | 24 ++++++++++++------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/arch/powerpc/kernel/idle_book3s.S b/arch/powerpc/kernel/idle_book3s.S
index 3ab73f9223e4..75746111e2c4 100644
--- a/arch/powerpc/kernel/idle_book3s.S
+++ b/arch/powerpc/kernel/idle_book3s.S
@@ -249,7 +249,7 @@ power_enter_stop:
 	andis.   r4,r3,PSSCR_EC_ESL_MASK_SHIFTED
 	clrldi   r3,r3,60 /* r3 = Bits[60:63] = Requested Level (RL) */
 	bne	 .Lhandle_esl_ec_set
-	IDLE_STATE_ENTER_SEQ(PPC_STOP)
+	PPC_STOP
 	li	r3,0  /* Since we didn't lose state, return 0 */
 
 	/*
@@ -282,7 +282,8 @@ power_enter_stop:
 	ld	r4,ADDROFF(pnv_first_deep_stop_state)(r5)
 	cmpd	r3,r4
 	bge	.Lhandle_deep_stop
-	IDLE_STATE_ENTER_SEQ_NORET(PPC_STOP)
+	PPC_STOP	/* Does not return (system reset interrupt) */
+
 .Lhandle_deep_stop:
 /*
  * Entering deep idle state.
@@ -304,7 +305,7 @@ lwarx_loop_stop:
 
 	bl	save_sprs_to_stack
 
-	IDLE_STATE_ENTER_SEQ_NORET(PPC_STOP)
+	PPC_STOP	/* Does not return (system reset interrupt) */
 
 /*
  * Entered with MSR[EE]=0 and no soft-masked interrupts pending.
diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
index 3e024fd71fe8..edb47738a686 100644
--- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S
+++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
@@ -2527,7 +2527,17 @@ BEGIN_FTR_SECTION
 END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S)
 
 kvm_nap_sequence:		/* desired LPCR value in r5 */
-BEGIN_FTR_SECTION
+BEGIN_FTR_SECTION	/* nap sequence */
+	mtspr	SPRN_LPCR,r5
+	isync
+	li	r0, 0
+	std	r0, HSTATE_SCRATCH0(r13)
+	ptesync
+	ld	r0, HSTATE_SCRATCH0(r13)
+1:	cmpd	r0, r0
+	bne	1b
+	nap
+FTR_SECTION_ELSE	/* stop sequence */
 	/*
 	 * PSSCR bits:	exit criterion = 1 (wakeup based on LPCR at sreset)
 	 *		enable state loss = 1 (allow SMT mode switch)
@@ -2539,18 +2549,8 @@ BEGIN_FTR_SECTION
 	li	r4, LPCR_PECE_HVEE@higher
 	sldi	r4, r4, 32
 	or	r5, r5, r4
-END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300)
 	mtspr	SPRN_LPCR,r5
-	isync
-	li	r0, 0
-	std	r0, HSTATE_SCRATCH0(r13)
-	ptesync
-	ld	r0, HSTATE_SCRATCH0(r13)
-1:	cmpd	r0, r0
-	bne	1b
-BEGIN_FTR_SECTION
-	nap
-FTR_SECTION_ELSE
+
 	PPC_STOP
 ALT_FTR_SECTION_END_IFCLR(CPU_FTR_ARCH_300)
 	b	.
-- 
2.11.0

  parent reply	other threads:[~2017-08-05 17:03 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-05 17:02 [PATCH 00/13] idle and soft-irq improvements and POWER9 idle optimisation Nicholas Piggin
2017-08-05 17:02 ` [PATCH 01/13] powerpc/64s: masked interrupt avoid branch Nicholas Piggin
2017-08-05 17:02 ` [PATCH 02/13] powerpc/64s: masked interrupt avoid instruction Nicholas Piggin
2017-08-05 17:02 ` [PATCH 03/13] powerpc/64s: masked interrupt returns to kernel so avoid r13 restore Nicholas Piggin
2017-08-05 17:02 ` [PATCH 04/13] powerpc/64: cleanup __check_irq_replay Nicholas Piggin
2017-08-05 17:02 ` [PATCH 05/13] powerpc/64s: irq replay merge HV and non-HV paths for doorbell replay Nicholas Piggin
2017-08-05 17:02 ` [PATCH 06/13] powerpc/64s: irq replay external use the HV handler in HV mode on POWER9 Nicholas Piggin
2017-08-05 17:02 ` [PATCH 07/13] powerpc/64: remove redundant instruction in interrupt replay Nicholas Piggin
2017-08-05 17:02 ` [PATCH 08/13] powerpc/64s: irq replay remove spurious irq reason Nicholas Piggin
2017-08-05 23:00   ` Benjamin Herrenschmidt
2017-08-06  0:51     ` Nicholas Piggin
2017-08-10 13:12       ` Michael Ellerman
2017-08-05 17:02 ` [PATCH 09/13] powerpc/64: runlatch CTRL[RUN] set optimisation Nicholas Piggin
2017-08-05 17:02 ` [PATCH 10/13] powerpc/64s: idle simplify KVM idle on POWER9 Nicholas Piggin
2017-08-08 10:36   ` Gautham R Shenoy
2017-08-08 12:42     ` Nicholas Piggin
2017-08-10  6:24       ` Gautham R Shenoy
2017-08-10 13:14   ` Michael Ellerman
2017-08-10 13:53     ` Nicholas Piggin
2017-08-05 17:02 ` Nicholas Piggin [this message]
2017-08-08 10:37   ` [PATCH 11/13] powerpc/64s: idle POWER9 can execute stop without ptesync Gautham R Shenoy
2017-08-10 13:15   ` Michael Ellerman
2017-08-10 14:03     ` Nicholas Piggin
2017-08-05 17:02 ` [PATCH 12/13] powerpc/64s: idle POWER9 can execute stop in virtual mode Nicholas Piggin
2017-08-05 22:57   ` Benjamin Herrenschmidt
2017-08-08 10:45   ` Gautham R Shenoy
2017-08-05 17:02 ` [PATCH 13/13] powerpc/64s: idle ESL=0 stop can avoid all save/restore overhead Nicholas Piggin
2017-08-05 17:11   ` Nicholas Piggin
2017-08-08 10:49   ` 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=20170805170241.22966-12-npiggin@gmail.com \
    --to=npiggin@gmail.com \
    --cc=ego@linux.vnet.ibm.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).