Skip to content

Commit dab32f2

Browse files
niklas88bjorn-helgaas
authored andcommitted
s390/pci: Use pci_uevent_ers() in PCI recovery
Issue uevents on s390 during PCI recovery using pci_uevent_ers() as done by EEH and AER PCIe recovery routines. Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Lukas Wunner <lukas@wunner.de> Link: https://patch.msgid.link/20250807-add_err_uevents-v5-2-adf85b0620b0@linux.ibm.com
1 parent bbf7d04 commit dab32f2

3 files changed

Lines changed: 5 additions & 2 deletions

File tree

arch/s390/pci/pci_event.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ static pci_ers_result_t zpci_event_notify_error_detected(struct pci_dev *pdev,
8888
pci_ers_result_t ers_res = PCI_ERS_RESULT_DISCONNECT;
8989

9090
ers_res = driver->err_handler->error_detected(pdev, pdev->error_state);
91+
pci_uevent_ers(pdev, ers_res);
9192
if (ers_result_indicates_abort(ers_res))
9293
pr_info("%s: Automatic recovery failed after initial reporting\n", pci_name(pdev));
9394
else if (ers_res == PCI_ERS_RESULT_NEED_RESET)
@@ -244,6 +245,7 @@ static pci_ers_result_t zpci_event_attempt_error_recovery(struct pci_dev *pdev)
244245
ers_res = PCI_ERS_RESULT_RECOVERED;
245246

246247
if (ers_res != PCI_ERS_RESULT_RECOVERED) {
248+
pci_uevent_ers(pdev, PCI_ERS_RESULT_DISCONNECT);
247249
pr_err("%s: Automatic recovery failed; operator intervention is required\n",
248250
pci_name(pdev));
249251
status_str = "failed (driver can't recover)";
@@ -253,6 +255,7 @@ static pci_ers_result_t zpci_event_attempt_error_recovery(struct pci_dev *pdev)
253255
pr_info("%s: The device is ready to resume operations\n", pci_name(pdev));
254256
if (driver->err_handler->resume)
255257
driver->err_handler->resume(pdev);
258+
pci_uevent_ers(pdev, PCI_ERS_RESULT_RECOVERED);
256259
out_unlock:
257260
pci_dev_unlock(pdev);
258261
zpci_report_status(zdev, "recovery", status_str);

drivers/pci/pci-driver.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1582,7 +1582,7 @@ static int pci_uevent(const struct device *dev, struct kobj_uevent_env *env)
15821582
return 0;
15831583
}
15841584

1585-
#if defined(CONFIG_PCIEAER) || defined(CONFIG_EEH)
1585+
#if defined(CONFIG_PCIEAER) || defined(CONFIG_EEH) || defined(CONFIG_S390)
15861586
/**
15871587
* pci_uevent_ers - emit a uevent during recovery path of PCI device
15881588
* @pdev: PCI device undergoing error recovery

include/linux/pci.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2764,7 +2764,7 @@ static inline bool pci_is_thunderbolt_attached(struct pci_dev *pdev)
27642764
return false;
27652765
}
27662766

2767-
#if defined(CONFIG_PCIEPORTBUS) || defined(CONFIG_EEH)
2767+
#if defined(CONFIG_PCIEPORTBUS) || defined(CONFIG_EEH) || defined(CONFIG_S390)
27682768
void pci_uevent_ers(struct pci_dev *pdev, enum pci_ers_result err_type);
27692769
#endif
27702770

0 commit comments

Comments
 (0)