From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3DB1C1F63CF; Tue, 21 Jan 2025 17:57:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737482222; cv=none; b=WMNBkoDmIwpFTuoa+AkLtk9OTSqw8PeagzC4An9CXnGsJ0BECn2n38Xl319xqbhptt6BDEflwTZXs//H0KRJZ10QO18xrJWgJi51/l+fFRn0vtMlYJTJrxgP3oaNimj/SRCcsXtFO6T8u1bFdQU7E72+yuA59mI1jBoPVE26aoc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737482222; c=relaxed/simple; bh=zdyxfKRh5aRBs1gGvXlbrHZVsIlODjImCXxsfhMJk5w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lxgRco/ZwnxLuy/6K5SWflRfxlbfn5mNWIMb6u/4soWyQ5tuhOCrMFSC+FnYm1HW6HgMBmFSQlGP9ItdqY7NNLsWLjRr7MvA4ehdBJ/Dsyx0EsEfTxpxheuVrLQhKc2F89gbPtV38gnPaSJOaYBwXnvEms80Q3RSRMBQo1E8/Wo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1c4znwn2; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="1c4znwn2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B0160C4CEDF; Tue, 21 Jan 2025 17:57:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1737482222; bh=zdyxfKRh5aRBs1gGvXlbrHZVsIlODjImCXxsfhMJk5w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1c4znwn2snetHkZ0tRUQ5GW2SFMB9Av33iFwmSKCTBFOx5fF32cHAz1TUloFWd+rK A0iicAv751xKfnHujbiPuJ2gcAFF6HjX18FCWx/kZnRx4uRwwfyVJ13wdVYiwtHi/H TPiPFDGcJL278biUboO+wWBFqvirkM1jdPCvjryQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yogesh Lal , Thomas Gleixner , Marc Zyngier Subject: [PATCH 6.6 56/72] irqchip/gic-v3: Handle CPU_PM_ENTER_FAILED correctly Date: Tue, 21 Jan 2025 18:52:22 +0100 Message-ID: <20250121174525.588397734@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250121174523.429119852@linuxfoundation.org> References: <20250121174523.429119852@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yogesh Lal 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: 3708d52fc6bb ("irqchip: gic-v3: Implement CPU PM notifier") Signed-off-by: Yogesh Lal Signed-off-by: Thomas Gleixner Acked-by: Marc Zyngier Cc: stable@vger.kernel.org Link: https://lore.kernel.org/all/20241220093907.2747601-1-quic_ylal@quicinc.com Signed-off-by: Greg Kroah-Hartman --- drivers/irqchip/irq-gic-v3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -1460,7 +1460,7 @@ static int gic_retrigger(struct irq_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();