From: Raag Jadav <raag.jadav@intel.com>
To: rafael@kernel.org, mahesh@linux.ibm.com, oohall@gmail.com,
bhelgaas@google.com
Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
ilpo.jarvinen@linux.intel.com, lukas@wunner.de,
aravind.iddamsetty@linux.intel.com,
Raag Jadav <raag.jadav@intel.com>
Subject: [PATCH v2] PCI/PM: Avoid suspending the device with errors
Date: Tue, 22 Apr 2025 19:23:41 +0530 [thread overview]
Message-ID: <20250422135341.2780925-1-raag.jadav@intel.com> (raw)
If an error is triggered before or during system suspend, any bus level
power state transition will result in unpredictable behaviour by the
device with failed recovery. Avoid suspending such a device and leave
it in its existing power state.
This only covers the devices that rely on PCI core PM for their power
state transition.
Signed-off-by: Raag Jadav <raag.jadav@intel.com>
---
v2: Synchronize AER handling with PCI PM (Rafael)
More discussion on [1].
[1] https://lore.kernel.org/all/CAJZ5v0g-aJXfVH+Uc=9eRPuW08t-6PwzdyMXsC6FZRKYJtY03Q@mail.gmail.com/
drivers/pci/pci-driver.c | 3 ++-
drivers/pci/pcie/aer.c | 11 +++++++++++
include/linux/aer.h | 2 ++
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index f57ea36d125d..289a1fa7cb2d 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -884,7 +884,8 @@ static int pci_pm_suspend_noirq(struct device *dev)
}
}
- if (!pci_dev->state_saved) {
+ /* Avoid suspending the device with errors */
+ if (!pci_aer_in_progress(pci_dev) && !pci_dev->state_saved) {
pci_save_state(pci_dev);
/*
diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c
index 508474e17183..b70f5011d4f5 100644
--- a/drivers/pci/pcie/aer.c
+++ b/drivers/pci/pcie/aer.c
@@ -233,6 +233,17 @@ int pcie_aer_is_native(struct pci_dev *dev)
}
EXPORT_SYMBOL_NS_GPL(pcie_aer_is_native, "CXL");
+bool pci_aer_in_progress(struct pci_dev *dev)
+{
+ u16 reg16;
+
+ if (!pcie_aer_is_native(dev))
+ return false;
+
+ pcie_capability_read_word(dev, PCI_EXP_DEVSTA, ®16);
+ return !!(reg16 & PCI_EXP_AER_FLAGS);
+}
+
static int pci_enable_pcie_error_reporting(struct pci_dev *dev)
{
int rc;
diff --git a/include/linux/aer.h b/include/linux/aer.h
index 947b63091902..68ae5378256e 100644
--- a/include/linux/aer.h
+++ b/include/linux/aer.h
@@ -48,12 +48,14 @@ struct aer_capability_regs {
#if defined(CONFIG_PCIEAER)
int pci_aer_clear_nonfatal_status(struct pci_dev *dev);
int pcie_aer_is_native(struct pci_dev *dev);
+bool pci_aer_in_progress(struct pci_dev *dev);
#else
static inline int pci_aer_clear_nonfatal_status(struct pci_dev *dev)
{
return -EINVAL;
}
static inline int pcie_aer_is_native(struct pci_dev *dev) { return 0; }
+static inline bool pci_aer_in_progress(struct pci_dev *dev) { return false; }
#endif
void pci_print_aer(struct pci_dev *dev, int aer_severity,
--
2.34.1
next reply other threads:[~2025-04-22 13:54 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-22 13:53 Raag Jadav [this message]
2025-04-22 18:01 ` [PATCH v2] PCI/PM: Avoid suspending the device with errors kernel test robot
2025-04-22 19:45 ` Bjorn Helgaas
2025-04-24 5:12 ` Raag Jadav
2025-04-24 10:59 ` Rafael J. Wysocki
2025-04-26 19:24 ` Raag Jadav
2025-04-22 23:39 ` kernel test robot
2025-04-23 12:41 ` Rafael J. Wysocki
2025-04-24 5:38 ` Raag Jadav
2025-04-24 11:02 ` Rafael J. Wysocki
2025-04-26 20:18 ` Raag Jadav
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250422135341.2780925-1-raag.jadav@intel.com \
--to=raag.jadav@intel.com \
--cc=aravind.iddamsetty@linux.intel.com \
--cc=bhelgaas@google.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lukas@wunner.de \
--cc=mahesh@linux.ibm.com \
--cc=oohall@gmail.com \
--cc=rafael@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox