Commit 30d092d0 authored by Yogesh Lal's avatar Yogesh Lal Committed by Lin Yujun
Browse files

irqchip/gic-v3: Handle CPU_PM_ENTER_FAILED correctly 

stable inclusion
from stable-v5.10.234
commit 61c684dbfeb08aec30fd6f5e3efecbf9cb7b7b90
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBFOBV

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=61c684dbfeb08aec30fd6f5e3efecbf9cb7b7b90



--------------------------------

commit 0d62a49ab55c99e8deb4593b8d9f923de1ab5c18 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: 3708d52f ("irqchip: gic-v3: Implement CPU PM notifier")
Signed-off-by: default avatarYogesh Lal <quic_ylal@quicinc.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarMarc 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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarLin Yujun <linyujun809@huawei.com>
parent 3c7b3985

drivers/irqchip/irq-gic-v3.c

+1 −1
Original line number Diff line number Diff line
@@ -1378,7 +1378,7 @@ static int gic_retrigger(struct irq_data *data) 
static int gic_cpu_pm_notifier(struct notifier_block *self,

			       unsigned long cmd, void *v)

{

	if (cmd == CPU_PM_EXIT) {

	if (cmd == CPU_PM_EXIT || cmd == CPU_PM_ENTER_FAILED) {

		if (gic_dist_security_disabled())

			gic_enable_redist(true);

		gic_cpu_sys_reg_init();