| Message ID | 20170811163912.28783-2-npiggin@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e0c827c09c0d04d77616a4506a71b3d5b0cf07e8 |
| Headers | show |
On Fri, 2017-08-11 at 16:38:59 UTC, Nicholas Piggin wrote: > Interrupts which do not require EE to be cleared can all > be tested with a single bitwise test. > > Signed-off-by: Nicholas Piggin <npiggin@gmail.com> Patches 1-9 applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/e0c827c09c0d04d77616a4506a71b3 cheers
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index f14f3c04ec7e..f8ad3f0eb383 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -1370,10 +1370,8 @@ masked_##_H##interrupt: \ ori r10,r10,0xffff; \ mtspr SPRN_DEC,r10; \ b MASKED_DEC_HANDLER_LABEL; \ -1: cmpwi r10,PACA_IRQ_DBELL; \ - beq 2f; \ - cmpwi r10,PACA_IRQ_HMI; \ - beq 2f; \ +1: andi. r10,r10,(PACA_IRQ_DBELL|PACA_IRQ_HMI); \ + bne 2f; \ mfspr r10,SPRN_##_H##SRR1; \ rldicl r10,r10,48,1; /* clear MSR_EE */ \ rotldi r10,r10,16; \
Interrupts which do not require EE to be cleared can all be tested with a single bitwise test. Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- arch/powerpc/kernel/exceptions-64s.S | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)