| Message ID | 20170314092349.10981-4-npiggin@gmail.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
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 >
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
This reduces the number of nops for POWER8. Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- arch/powerpc/kernel/idle_book3s.S | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)