Skip to content

Commit 61c684d

Browse files
quic-ylalgregkh
authored andcommitted
irqchip/gic-v3: Handle CPU_PM_ENTER_FAILED correctly
commit 0d62a49 upstream. When a CPU attempts to enter low power mode, it disables the redistributor and Group 1 interrupts and reinitializes the system registers upon wakeup. If the transition into low power mode fails, then the CPU_PM framework invokes the PM notifier callback with CPU_PM_ENTER_FAILED to allow the drivers to undo the state changes. The GIC V3 driver ignores CPU_PM_ENTER_FAILED, which leaves the GIC in disabled state. Handle CPU_PM_ENTER_FAILED in the same way as CPU_PM_EXIT to restore normal operation. [ tglx: Massage change log, add Fixes tag ] Fixes: 3708d52 ("irqchip: gic-v3: Implement CPU PM notifier") Signed-off-by: Yogesh Lal <quic_ylal@quicinc.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Marc Zyngier <maz@kernel.org> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/all/20241220093907.2747601-1-quic_ylal@quicinc.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 61ecbce commit 61c684d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/irqchip/irq-gic-v3.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1460,7 +1460,7 @@ static int gic_retrigger(struct irq_data *data)
14601460
static int gic_cpu_pm_notifier(struct notifier_block *self,
14611461
unsigned long cmd, void *v)
14621462
{
1463-
if (cmd == CPU_PM_EXIT) {
1463+
if (cmd == CPU_PM_EXIT || cmd == CPU_PM_ENTER_FAILED) {
14641464
if (gic_dist_security_disabled())
14651465
gic_enable_redist(true);
14661466
gic_cpu_sys_reg_init();

0 commit comments

Comments
 (0)