]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
PCI/AER: Disable AER service on suspend
authorKai-Heng Feng <kai.heng.feng@canonical.com>
Sun, 28 Jul 2024 16:08:50 +0000 (12:08 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Jan 2025 12:28:29 +0000 (13:28 +0100)
[ Upstream commit 5afc2f763edc5daae4722ee46fea4e627d01fa90 ]

If the link is powered off during suspend, electrical noise may cause
errors that are logged via AER.  If the AER interrupt is enabled and shares
an IRQ with PME, that causes a spurious wakeup during suspend.

Disable the AER interrupt during suspend to prevent this.  Clear error
status before re-enabling IRQ interrupts during resume so we don't get an
interrupt for errors that occurred during the suspend/resume process.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=209149
Link: https://bugzilla.kernel.org/show_bug.cgi?id=216295
Link: https://bugzilla.kernel.org/show_bug.cgi?id=218090
Link: https://lore.kernel.org/r/20240416043225.1462548-2-kai.heng.feng@canonical.com
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
[bhelgaas: drop pci_ancestor_pr3_present() etc, commit log]
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/pci/pcie/aer.c

index 4f7744aab6c728ac546340e60b22a5b8aed1e76d..2908bfda88804eda46d46ebf0c0648b3d8c92f29 100644 (file)
@@ -1382,6 +1382,22 @@ static int aer_probe(struct pcie_device *dev)
        return 0;
 }
 
+static int aer_suspend(struct pcie_device *dev)
+{
+       struct aer_rpc *rpc = get_service_data(dev);
+
+       aer_disable_rootport(rpc);
+       return 0;
+}
+
+static int aer_resume(struct pcie_device *dev)
+{
+       struct aer_rpc *rpc = get_service_data(dev);
+
+       aer_enable_rootport(rpc);
+       return 0;
+}
+
 /**
  * aer_root_reset - reset Root Port hierarchy, RCEC, or RCiEP
  * @dev: pointer to Root Port, RCEC, or RCiEP
@@ -1453,6 +1469,8 @@ static struct pcie_port_service_driver aerdriver = {
        .service        = PCIE_PORT_SERVICE_AER,
 
        .probe          = aer_probe,
+       .suspend        = aer_suspend,
+       .resume         = aer_resume,
        .remove         = aer_remove,
 };