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 0B0451F55F3; Tue, 21 Jan 2025 18:11:27 +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=1737483087; cv=none; b=On9hwLwsuUS9EtfJATwvmDnPkCFP3HrUq+igUYq++lg5qF1SLosk2eAU9s8r4y0hLLIWoeJcXsmGLb//nk0ZAdAuxYFZtUHgVcKAKMcRgoZCIBrutyir+mnXconozebdHA0ppRIihQ3d6SdBkhEzmRCfcJixBtigUF/+lbyJlhw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737483087; c=relaxed/simple; bh=J6pfEOmpyAcUuBnp927onHdOhd0HTyEJLooKnQCxYHo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DEO7bkj+xi5PvQrbongNC2tz9ycVbfFnNBE9lpPU9sfVXbAfmHpN8Ce2wHnTrBuWQrWNn+F/rNoK6teg0KIHkHdnvX0660XvmItGdgu2OzOIXDE2TVq15h1XAElEIT/3IKKzy6HZG3f22DxfoqHaRLo4+9hH0HKtTxx8BACQ19s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=WdEten3U; 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="WdEten3U" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 81413C4CEDF; Tue, 21 Jan 2025 18:11:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1737483086; bh=J6pfEOmpyAcUuBnp927onHdOhd0HTyEJLooKnQCxYHo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WdEten3UgRmWTXu+PtmBLeP4athFxaY7DZf4cOJccUYiZw5tl+8GHz7CQAp6kz07i uBINcp0o242DKR74GbNkVWxpWvE4OcM6ZJP+xvwY6MyMHCFE5wCHt97ja8yB+7+96p PMyMGAETO8yk2kn9hWpC6RULhx5rANqLF62D1IW8= 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 5.15 112/127] irqchip/gic-v3: Handle CPU_PM_ENTER_FAILED correctly Date: Tue, 21 Jan 2025 18:53:04 +0100 Message-ID: <20250121174533.967472744@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250121174529.674452028@linuxfoundation.org> References: <20250121174529.674452028@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-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 @@ -1340,7 +1340,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();