The patch "powerpc/64s: make PACA_IRQ_HARD_DIS track MSR[EE] closely" needs an equivalent change to the 64/e interrupt handler, to set PACA_IRQ_HARD_DIS when MSR[EE] gets cleared.
Also the original patch should be named powerpc/64: rather than 64s:. Signed-off-by: Nicholas Piggin <npig...@gmail.com> --- arch/powerpc/kernel/exceptions-64e.S | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S index 9b6e653e501a..9eab3ea480fa 100644 --- a/arch/powerpc/kernel/exceptions-64e.S +++ b/arch/powerpc/kernel/exceptions-64e.S @@ -956,6 +956,9 @@ kernel_dbg_exc: rldicl r10,r11,48,1 /* clear MSR_EE */ rotldi r11,r10,16 mtspr SPRN_SRR1,r11 + lbz r11,PACAIRQHAPPENED(r13) + ori r11,r11,PACA_IRQ_HARD_DIS + stb r11,PACAIRQHAPPENED(r13) .endif lwz r11,PACA_EXGEN+EX_CR(r13) -- 2.17.0