Skip to content

Commit

Permalink
powerpc/tm: update comment about interrupt re-entrancy
Browse files Browse the repository at this point in the history
Since the system reset interrupt began to use its own stack, and
machine check interrupts have done so for some time, r1 can be
changed without clearing MSR[RI], provided no other interrupts
(including SLB misses) are taken.

MSR[RI] does have to be cleared when using SCRATCH0, however.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
  • Loading branch information
Nicholas Piggin authored and Michael Ellerman committed Jul 2, 2019
1 parent d7fb34c commit f30a5e6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/powerpc/kernel/tm.S
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ _GLOBAL(tm_reclaim)
/* Stash the stack pointer away for use after reclaim */
std r1, PACAR1(r13)

/* Clear MSR RI since we are about to change r1, EE is already off. */
/* Clear MSR RI since we are about to use SCRATCH0, EE is already off */
li r5, 0
mtmsrd r5, 1

Expand Down Expand Up @@ -474,7 +474,7 @@ restore_gprs:

REST_GPR(7, r7)

/* Clear MSR RI since we are about to change r1. EE is already off */
/* Clear MSR RI since we are about to use SCRATCH0. EE is already off */
li r5, 0
mtmsrd r5, 1

Expand Down

0 comments on commit f30a5e6

Please sign in to comment.