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 C74E9269B1B; Tue, 8 Apr 2025 12:33:55 +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=1744115635; cv=none; b=Q+/0XRBaL3R/WxSaKovfKWMU/gxOxBlz82sGLO4uWliLA/BjATOtgjQCCWv846MCgqn1er7no6x70Ub8gdLo3nfbPuMrRTBV5/uo8Nqs/Z3uKwdnZqsAS5fff016vqjjB0b+pWqTRVwunK8wQ7R2bRVWeFpjJ70Kpth6CBwIy+E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744115635; c=relaxed/simple; bh=5LiCPfRqCULwJbp6ZyGSsAPQ+qvmk94HSCehCBp1o4w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tWdqt4uE+f9/+ZSnLc9u2Ap8U9hC4L6IryyLQqgBAA3P4wVRbFw3CtRO1epgKLj86ugdSOmAmwmZ0OETp6n7Lk+t0OYav/Y/V060+mtIkoO+jpHRdgLxbgBr6S+DA24qEijYtP/vtc8klLIhCVJNhHFzsVN8IAiuTLccF8ludxc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=G2Yobc4F; 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="G2Yobc4F" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C7609C4CEE5; Tue, 8 Apr 2025 12:33:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744115635; bh=5LiCPfRqCULwJbp6ZyGSsAPQ+qvmk94HSCehCBp1o4w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G2Yobc4FhMg9Yhzb9o207u641w5TTbsMVyw0eHR5449HW58fzZZUVIB6wteudqfQP oNhbtgRqsRnPw9KcPtVYiEuYfGp3B/kYKj/fjFvXfOKcXlWyFTlFdcOW5teRW35MaC ZCiHmdxOPj5+QNvq4wl8RFxTjsCzCHcG4zI6CaCM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Bjorn Helgaas , Lukas Wunner , Sasha Levin Subject: [PATCH 6.1 048/204] PCI: pciehp: Dont enable HPIE when resuming in poll mode Date: Tue, 8 Apr 2025 12:49:38 +0200 Message-ID: <20250408104821.755588714@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104820.266892317@linuxfoundation.org> References: <20250408104820.266892317@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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ilpo Järvinen [ Upstream commit 527664f738afb6f2c58022cd35e63801e5dc7aec ] PCIe hotplug can operate in poll mode without interrupt handlers using a polling kthread only. eb34da60edee ("PCI: pciehp: Disable hotplug interrupt during suspend") failed to consider that and enables HPIE (Hot-Plug Interrupt Enable) unconditionally when resuming the Port. Only set HPIE if non-poll mode is in use. This makes pcie_enable_interrupt() match how pcie_enable_notification() already handles HPIE. Link: https://lore.kernel.org/r/20250321162114.3939-1-ilpo.jarvinen@linux.intel.com Fixes: eb34da60edee ("PCI: pciehp: Disable hotplug interrupt during suspend") Signed-off-by: Ilpo Järvinen Signed-off-by: Bjorn Helgaas Reviewed-by: Lukas Wunner Signed-off-by: Sasha Levin --- drivers/pci/hotplug/pciehp_hpc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c index 358f077284cbe..1ee5f7a9c7419 100644 --- a/drivers/pci/hotplug/pciehp_hpc.c +++ b/drivers/pci/hotplug/pciehp_hpc.c @@ -840,7 +840,9 @@ void pcie_enable_interrupt(struct controller *ctrl) { u16 mask; - mask = PCI_EXP_SLTCTL_HPIE | PCI_EXP_SLTCTL_DLLSCE; + mask = PCI_EXP_SLTCTL_DLLSCE; + if (!pciehp_poll_mode) + mask |= PCI_EXP_SLTCTL_HPIE; pcie_write_cmd(ctrl, mask, mask); } -- 2.39.5