]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
powerpc/64: fix irq replay pt_regs->softe value
authorNicholas Piggin <npiggin@gmail.com>
Tue, 15 Sep 2020 11:46:46 +0000 (21:46 +1000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 29 Oct 2020 09:08:00 +0000 (10:08 +0100)
[ Upstream commit 2b48e96be2f9f7151197fd25dc41487054bc6f5b ]

Replayed interrupts get an "artificial" struct pt_regs constructed to
pass to interrupt handler functions. This did not get the softe field
set correctly, it's as though the interrupt has hit while irqs are
disabled. It should be IRQS_ENABLED.

This is possibly harmless, asynchronous handlers should not be testing
if irqs were disabled, but it might be possible for example some code
is shared with synchronous or NMI handlers, and it makes more sense if
debug output looks at this.

Fixes: 3282a3da25bd ("powerpc/64: Implement soft interrupt replay in C")
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200915114650.3980244-2-npiggin@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/powerpc/kernel/irq.c

index 297ee79febc6c91743d15f0f460192fbb33dd89c..3a22281a8264eac9f4e2225b36268e6bd1c14469 100644 (file)
@@ -214,7 +214,7 @@ void replay_soft_interrupts(void)
        struct pt_regs regs;
 
        ppc_save_regs(&regs);
-       regs.softe = IRQS_ALL_DISABLED;
+       regs.softe = IRQS_ENABLED;
 
 again:
        if (IS_ENABLED(CONFIG_PPC_IRQ_SOFT_MASK_DEBUG))