Skip to content

Commit f5a9e48

Browse files
athira-rajeevmpe
authored andcommitted
powerpc/powernv/idle: Fix restore of SPRN_LDBAR for POWER9 stop state.
commit 10d9161 ("powerpc/64s: Reimplement book3s idle code in C") reimplemented book3S code to pltform/powernv/idle.c. But when doing so missed to add the per-thread LDBAR update in the core_woken path of the power9_idle_stop(). Patch fixes the same. Fixes: 10d9161 ("powerpc/64s: Reimplement book3s idle code in C") Cc: stable@vger.kernel.org # v5.2+ Signed-off-by: Athira Rajeev <atrajeev@linux.vnet.ibm.com> Signed-off-by: Madhavan Srinivasan <maddy@linux.vnet.ibm.com> Reviewed-by: Nicholas Piggin <npiggin@gmail.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20190702105836.26695-1-maddy@linux.vnet.ibm.com
1 parent 3343962 commit f5a9e48

File tree

1 file changed

+1
-1
lines changed
  • arch/powerpc/platforms/powernv

1 file changed

+1
-1
lines changed

arch/powerpc/platforms/powernv/idle.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -762,7 +762,6 @@ static unsigned long power9_idle_stop(unsigned long psscr, bool mmu_on)
762762
mtspr(SPRN_PTCR, sprs.ptcr);
763763
mtspr(SPRN_RPR, sprs.rpr);
764764
mtspr(SPRN_TSCR, sprs.tscr);
765-
mtspr(SPRN_LDBAR, sprs.ldbar);
766765

767766
if (pls >= pnv_first_tb_loss_level) {
768767
/* TB loss */
@@ -794,6 +793,7 @@ static unsigned long power9_idle_stop(unsigned long psscr, bool mmu_on)
794793
mtspr(SPRN_MMCR0, sprs.mmcr0);
795794
mtspr(SPRN_MMCR1, sprs.mmcr1);
796795
mtspr(SPRN_MMCR2, sprs.mmcr2);
796+
mtspr(SPRN_LDBAR, sprs.ldbar);
797797

798798
mtspr(SPRN_SPRG3, local_paca->sprg_vdso);
799799

0 commit comments

Comments
 (0)