arm64: Fix incorrect irqflag restore for priority masking for compat
authorJames Morse <james.morse@arm.com>
Thu, 3 Oct 2019 17:01:27 +0000 (18:01 +0100)
committerWill Deacon <will@kernel.org>
Fri, 4 Oct 2019 10:44:03 +0000 (11:44 +0100)
commitf46f27a576cc3b1e3d45ea50bc06287aa46b04b2
treebf8dc9446a691e50306f4a8a500a17b5f77d7002
parente4365f968fcd5ef4a2f69f11ebc9ee66f47fc879
arm64: Fix incorrect irqflag restore for priority masking for compat

Commit bd82d4bd2188 ("arm64: Fix incorrect irqflag restore for priority
masking") added a macro to the entry.S call paths that leave the
PSTATE.I bit set. This tells the pPNMI masking logic that interrupts
are masked by the CPU, not by the PMR. This value is read back by
local_daif_save().

Commit bd82d4bd2188 added this call to el0_svc, as el0_svc_handler
is called with interrupts masked. el0_svc_compat was missed, but should
be covered in the same way as both of these paths end up in
el0_svc_common(), which expects to unmask interrupts.

Fixes: bd82d4bd2188 ("arm64: Fix incorrect irqflag restore for priority masking")
Signed-off-by: James Morse <james.morse@arm.com>
Cc: Julien Thierry <julien.thierry.kdev@gmail.com>
Signed-off-by: Will Deacon <will@kernel.org>
arch/arm64/kernel/entry.S