From: Gautham R Shenoy <ego@linux.vnet.ibm.com>
To: Nicholas Piggin <npiggin@gmail.com>
Cc: linuxppc-dev@lists.ozlabs.org,
Gautham R Shenoy <ego@linux.vnet.ibm.com>,
Vaidyanathan Srinivasan <svaidy@linux.vnet.ibm.com>
Subject: Re: [PATCH 3/8] powerpc/64s: use alternative feature patching
Date: Thu, 16 Mar 2017 16:51:49 +0530 [thread overview]
Message-ID: <20170316112149.GB16462@in.ibm.com> (raw)
In-Reply-To: <20170314092349.10981-4-npiggin@gmail.com>
On Tue, Mar 14, 2017 at 07:23:44PM +1000, Nicholas Piggin wrote:
> This reduces the number of nops for POWER8.
Nice!
>
> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Reviewed-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com>
> ---
> arch/powerpc/kernel/idle_book3s.S | 19 ++++++++++++-------
> 1 file changed, 12 insertions(+), 7 deletions(-)
>
> diff --git a/arch/powerpc/kernel/idle_book3s.S b/arch/powerpc/kernel/idle_book3s.S
> index 405631b2c229..9284ea0762b1 100644
> --- a/arch/powerpc/kernel/idle_book3s.S
> +++ b/arch/powerpc/kernel/idle_book3s.S
> @@ -383,7 +383,11 @@ _GLOBAL(power9_idle_stop)
> */
> .global pnv_powersave_wakeup
> pnv_powersave_wakeup:
> - bl pnv_restore_hyp_resource
> +BEGIN_FTR_SECTION
> + bl pnv_restore_hyp_resource_arch300
> +FTR_SECTION_ELSE
> + bl pnv_restore_hyp_resource_arch207
> +ALT_FTR_SECTION_END_IFSET(CPU_FTR_ARCH_300)
>
> li r0,PNV_THREAD_RUNNING
> stb r0,PACA_THREAD_IDLE_STATE(r13) /* Clear thread state */
> @@ -411,14 +415,13 @@ pnv_powersave_wakeup:
> *
> * cr3 - set to gt if waking up with partial/complete hypervisor state loss
> */
> -pnv_restore_hyp_resource:
> - ld r2,PACATOC(r13);
> -
> -BEGIN_FTR_SECTION
> +pnv_restore_hyp_resource_arch300:
> /*
> * POWER ISA 3. Use PSSCR to determine if we
> * are waking up from deep idle state
> */
> + ld r2,PACATOC(r13);
> +
> LOAD_REG_ADDRBASE(r5,pnv_first_deep_stop_state)
> ld r4,ADDROFF(pnv_first_deep_stop_state)(r5)
>
> @@ -433,12 +436,14 @@ BEGIN_FTR_SECTION
>
> blr /* Waking up without hypervisor state loss. */
>
> -END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300)
> -
> +/* Same calling convention as arch300 */
> +pnv_restore_hyp_resource_arch207:
> /*
> * POWER ISA 2.07 or less.
> * Check if we slept with winkle.
> */
> + ld r2,PACATOC(r13);
> +
> lbz r0,PACA_THREAD_IDLE_STATE(r13)
> cmpwi cr2,r0,PNV_THREAD_NAP
> cmpwi cr4,r0,PNV_THREAD_WINKLE
> --
> 2.11.0
>
next prev parent reply other threads:[~2017-03-16 11:21 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-14 9:23 [PATCH 0/8] idle fixes and changes for POWER8 and POWER9 Nicholas Piggin
2017-03-14 9:23 ` [PATCH 1/8] powerpc/64s: move remaining system reset idle code into idle_book3s.S Nicholas Piggin
2017-03-14 9:23 ` [PATCH 2/8] powerpc/64s: stop using bit in HSPRG0 to test winkle Nicholas Piggin
2017-03-16 11:14 ` Gautham R Shenoy
2017-03-14 9:23 ` [PATCH 3/8] powerpc/64s: use alternative feature patching Nicholas Piggin
2017-03-16 11:21 ` Gautham R Shenoy [this message]
2017-03-14 9:23 ` [PATCH 4/8] powerpc/64s: fix POWER9 machine check handler from stop state Nicholas Piggin
2017-03-16 12:40 ` Mahesh Jagannath Salgaonkar
2017-03-16 13:05 ` Nicholas Piggin
2017-03-16 13:19 ` Gautham R Shenoy
2017-03-20 5:22 ` Mahesh Jagannath Salgaonkar
2017-03-17 2:49 ` Nicholas Piggin
2017-03-17 5:15 ` Nicholas Piggin
2017-03-14 9:23 ` [PATCH 5/8] powerpc/64s: use PACA_THREAD_IDLE_STATE only in POWER8 Nicholas Piggin
2017-03-16 11:54 ` Gautham R Shenoy
2017-03-16 12:16 ` Nicholas Piggin
2017-03-14 9:23 ` [PATCH 6/8] powerpc/64s: idle expand usable core idle state bits Nicholas Piggin
2017-03-16 12:10 ` Gautham R Shenoy
2017-03-14 9:23 ` [PATCH 7/8] powerpc/64s: idle do not hold reservation longer than required Nicholas Piggin
2017-03-16 12:43 ` Gautham R Shenoy
2017-03-16 12:55 ` Nicholas Piggin
2017-03-14 9:23 ` [PATCH 8/8] powerpc/64s: idle POWER8 avoid full state loss recovery when possible Nicholas Piggin
2017-03-16 16:12 ` Gautham R Shenoy
2017-03-17 5:24 ` Nicholas Piggin
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=20170316112149.GB16462@in.ibm.com \
--to=ego@linux.vnet.ibm.com \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=npiggin@gmail.com \
--cc=svaidy@linux.vnet.ibm.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.