From: Sean V Kelley <sean.v.kelley@intel.com>
To: bhelgaas@google.com, Jonathan.Cameron@huawei.com,
rafael.j.wysocki@intel.com, ashok.raj@intel.com,
tony.luck@intel.com, sathyanarayanan.kuppuswamy@intel.com,
qiuxu.zhuo@intel.com
Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v5 05/10] PCI/AER: Apply function level reset to RCiEP on fatal error
Date: Fri, 18 Sep 2020 13:45:58 -0700 [thread overview]
Message-ID: <20200918204603.62100-6-sean.v.kelley@intel.com> (raw)
In-Reply-To: <20200918204603.62100-1-sean.v.kelley@intel.com>
From: Qiuxu Zhuo <qiuxu.zhuo@intel.com>
Attempt to do function level reset for an RCiEP associated with an
RCEC device on fatal error.
Signed-off-by: Qiuxu Zhuo <qiuxu.zhuo@intel.com>
---
drivers/pci/pcie/err.c | 31 ++++++++++++++++++++++---------
1 file changed, 22 insertions(+), 9 deletions(-)
diff --git a/drivers/pci/pcie/err.c b/drivers/pci/pcie/err.c
index e575fa6cee63..5380ecc41506 100644
--- a/drivers/pci/pcie/err.c
+++ b/drivers/pci/pcie/err.c
@@ -169,6 +169,17 @@ static void pci_bridge_walk(struct pci_dev *bridge, int (*cb)(struct pci_dev *,
cb(bridge, userdata);
}
+static pci_ers_result_t flr_on_rciep(struct pci_dev *dev)
+{
+ if (!pcie_has_flr(dev))
+ return PCI_ERS_RESULT_NONE;
+
+ if (pcie_flr(dev))
+ return PCI_ERS_RESULT_DISCONNECT;
+
+ return PCI_ERS_RESULT_RECOVERED;
+}
+
pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,
pci_channel_state_t state,
pci_ers_result_t (*reset_subordinate_devices)(struct pci_dev *pdev))
@@ -195,15 +206,17 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,
if (state == pci_channel_io_frozen) {
pci_bridge_walk(bridge, report_frozen_detected, &status);
if (type == PCI_EXP_TYPE_RC_END) {
- pci_warn(dev, "link reset not possible for RCiEP\n");
- status = PCI_ERS_RESULT_NONE;
- goto failed;
- }
-
- status = reset_subordinate_devices(bridge);
- if (status != PCI_ERS_RESULT_RECOVERED) {
- pci_warn(dev, "subordinate device reset failed\n");
- goto failed;
+ status = flr_on_rciep(dev);
+ if (status != PCI_ERS_RESULT_RECOVERED) {
+ pci_warn(dev, "function level reset failed\n");
+ goto failed;
+ }
+ } else {
+ status = reset_subordinate_devices(bridge);
+ if (status != PCI_ERS_RESULT_RECOVERED) {
+ pci_warn(dev, "subordinate device reset failed\n");
+ goto failed;
+ }
}
} else {
pci_bridge_walk(bridge, report_normal_detected, &status);
--
2.28.0
next prev parent reply other threads:[~2020-09-18 20:51 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20200918204603.62100-1-sean.v.kelley@intel.com>
2020-09-18 20:45 ` [PATCH v5 03/10] PCI/RCEC: Cache RCEC capabilities in pci_init_capabilities() Sean V Kelley
2020-09-21 10:09 ` Jonathan Cameron
2020-09-22 20:45 ` Bjorn Helgaas
2020-09-22 21:54 ` Sean V Kelley
2020-09-18 20:45 ` Sean V Kelley [this message]
2020-09-21 11:13 ` [PATCH v5 05/10] PCI/AER: Apply function level reset to RCiEP on fatal error Jonathan Cameron
2020-09-23 2:49 ` Sean V Kelley
2020-09-18 20:45 ` [PATCH v5 06/10] PCI/RCEC: Add pcie_link_rcec() to associate RCiEPs Sean V Kelley
2020-09-21 11:25 ` Jonathan Cameron
2020-09-23 2:55 ` Sean V Kelley
2020-09-18 20:46 ` [PATCH v5 09/10] PCI/PME: Add pcie_walk_rcec() to RCEC PME handling Sean V Kelley
2020-09-21 12:15 ` Jonathan Cameron
[not found] ` <20200918204603.62100-8-sean.v.kelley@intel.com>
2020-09-21 11:31 ` [PATCH v5 07/10] PCI/RCEC: Add RCiEP's linked RCEC to AER/ERR Jonathan Cameron
2020-09-23 2:50 ` Sean V Kelley
[not found] ` <20200918204603.62100-9-sean.v.kelley@intel.com>
2020-09-21 12:12 ` [PATCH v5 08/10] PCI/AER: Add pcie_walk_rcec() to RCEC AER handling Jonathan Cameron
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=20200918204603.62100-6-sean.v.kelley@intel.com \
--to=sean.v.kelley@intel.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=ashok.raj@intel.com \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=qiuxu.zhuo@intel.com \
--cc=rafael.j.wysocki@intel.com \
--cc=sathyanarayanan.kuppuswamy@intel.com \
--cc=tony.luck@intel.com \
/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;
as well as URLs for NNTP newsgroup(s).