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 DD2CC266F17; Tue, 8 Apr 2025 11:52:49 +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=1744113170; cv=none; b=XgCgcxwwkN58UaLEVvSQP0zURTAnzPoVt+C5hAk8LT5zzXG5ldMwR2q+qAo261M5ozQr2MfnMbzeUqndHvzinLqpo9Ldl2f7YPQ1zQwaWCMBtvS1WRc6qCYhyZFFndX4OD9w5eb1wtDtDIGRn8ZAziKUYQ70i9A7xKdGvADdxWg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744113170; c=relaxed/simple; bh=clvDgqd4CIBLdMLA+MK5yUhT0Dm03brLHPQTvO7BZ6s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=HHmHafPyBF2DHtuaznzwfAp9RCrfvJfWlryvO2d/nBlZRjzIX3mc15iT2gaQtiJsJ6xzHR7QJEq06auuMZ87xPKvn2AGFhfC+nS6XkbPjpqD+m/w2//QZloN7bHoV6VzbMqJUl04FoJZSkk94gEsZsytnGe0Sgwf1MFXnU0KjAQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=I27JShjt; 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="I27JShjt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6AEA4C4CEE5; Tue, 8 Apr 2025 11:52:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744113169; bh=clvDgqd4CIBLdMLA+MK5yUhT0Dm03brLHPQTvO7BZ6s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I27JShjtypa5m0QQNFcytAaSMaPKc4wdPUzXsjNTjkUofPi/jIE+H0MCqsLSdpQfZ RboCq7OxLFCTS73nWZyaV50ry7/44m6JhnVj60Prf4wIqlmGdz7bLwCBF8Y4Bszpp2 29W6nBz3MmXT7ieSbBZ9oI9ty73wfX21vPKBGHyI= 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.6 058/268] PCI: pciehp: Dont enable HPIE when resuming in poll mode Date: Tue, 8 Apr 2025 12:47:49 +0200 Message-ID: <20250408104830.066394030@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104828.499967190@linuxfoundation.org> References: <20250408104828.499967190@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.6-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 fd713abdfb9f9..b0bccc4d0da28 100644 --- a/drivers/pci/hotplug/pciehp_hpc.c +++ b/drivers/pci/hotplug/pciehp_hpc.c @@ -839,7 +839,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