From: Zhuo Chen <chenzhuo.1@bytedance.com>
To: fancer.lancer@gmail.com, jdmason@kudzu.us, dave.jiang@intel.com,
allenbh@gmail.com, bhelgaas@google.com, ruscur@russell.cc,
oohall@gmail.com, james.smart@broadcom.com,
dick.kennedy@broadcom.com, jejb@linux.ibm.com,
martin.petersen@oracle.com
Cc: chenzhuo.1@bytedance.com, ntb@lists.linux.dev,
linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org,
linuxppc-dev@lists.ozlabs.org, linux-scsi@vger.kernel.org
Subject: [PATCH 2/3] PCI/ERR: Clear fatal status in pcie_do_recovery()
Date: Fri, 2 Sep 2022 02:16:33 +0800 [thread overview]
Message-ID: <20220901181634.99591-3-chenzhuo.1@bytedance.com> (raw)
In-Reply-To: <20220901181634.99591-1-chenzhuo.1@bytedance.com>
When state is pci_channel_io_frozen in pcie_do_recovery(),
the severity is fatal and fatal status should be cleared.
So we add pci_aer_clear_fatal_status().
Since pcie_aer_is_native() in pci_aer_clear_fatal_status()
and pci_aer_clear_nonfatal_status() contains the function of
'if (host->native_aer || pcie_ports_native)', so we move them
out of it.
Signed-off-by: Zhuo Chen <chenzhuo.1@bytedance.com>
---
drivers/pci/pcie/err.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/pcie/err.c b/drivers/pci/pcie/err.c
index 0c5a143025af..e0a8ade4c3fe 100644
--- a/drivers/pci/pcie/err.c
+++ b/drivers/pci/pcie/err.c
@@ -243,10 +243,14 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,
* it is responsible for clearing this status. In that case, the
* signaling device may not even be visible to the OS.
*/
- if (host->native_aer || pcie_ports_native) {
+ if (host->native_aer || pcie_ports_native)
pcie_clear_device_status(dev);
+
+ if (state == pci_channel_io_frozen)
+ pci_aer_clear_fatal_status(dev);
+ else
pci_aer_clear_nonfatal_status(dev);
- }
+
pci_info(bridge, "device recovery successful\n");
return status;
--
2.30.1 (Apple Git-130)
next prev parent reply other threads:[~2022-09-01 18:18 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-01 18:16 [PATCH 0/3] PCI/AER: Fix and optimize usage of status clear api Zhuo Chen
2022-09-01 18:16 ` [PATCH 1/3] PCI/AER: Use pci_aer_clear_uncorrect_error_status() to clear uncorrectable error status Zhuo Chen
2022-09-11 16:22 ` Serge Semin
2022-09-11 17:09 ` [External] " Zhuo Chen
2022-09-11 17:55 ` Serge Semin
2022-09-22 20:02 ` Bjorn Helgaas
2022-09-26 13:30 ` Zhuo Chen
2022-09-26 17:21 ` Bjorn Helgaas
2022-09-01 18:16 ` Zhuo Chen [this message]
2022-09-22 21:08 ` [PATCH 2/3] PCI/ERR: Clear fatal status in pcie_do_recovery() Bjorn Helgaas
2022-09-26 14:01 ` Zhuo Chen
2022-09-26 18:09 ` Bjorn Helgaas
2022-09-27 13:41 ` [External] " Zhuo Chen
2022-09-01 18:16 ` [PATCH 3/3] PCI/AER: Use pci_aer_raw_clear_status() to clear root port's AER error status Zhuo Chen
2022-09-22 21:50 ` Bjorn Helgaas
2022-09-26 14:16 ` Zhuo Chen
2022-09-26 17:22 ` Bjorn Helgaas
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=20220901181634.99591-3-chenzhuo.1@bytedance.com \
--to=chenzhuo.1@bytedance.com \
--cc=allenbh@gmail.com \
--cc=bhelgaas@google.com \
--cc=dave.jiang@intel.com \
--cc=dick.kennedy@broadcom.com \
--cc=fancer.lancer@gmail.com \
--cc=james.smart@broadcom.com \
--cc=jdmason@kudzu.us \
--cc=jejb@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=martin.petersen@oracle.com \
--cc=ntb@lists.linux.dev \
--cc=oohall@gmail.com \
--cc=ruscur@russell.cc \
/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).