From: Zhuo Chen <chenzhuo.1@bytedance.com>
To: sathyanarayanan.kuppuswamy@linux.intel.com, bhelgaas@google.com,
ruscur@russell.cc, oohall@gmail.com, fancer.lancer@gmail.com,
jdmason@kudzu.us, dave.jiang@intel.com, allenbh@gmail.com,
james.smart@broadcom.com, dick.kennedy@broadcom.com,
jejb@linux.ibm.com, martin.petersen@oracle.com
Cc: linux-scsi@vger.kernel.org, linux-pci@vger.kernel.org,
chenzhuo.1@bytedance.com, linux-kernel@vger.kernel.org,
ntb@lists.linux.dev, linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v3 1/9] PCI/AER: Add pci_aer_clear_uncorrect_error_status() to PCI core
Date: Wed, 28 Sep 2022 18:59:38 +0800 [thread overview]
Message-ID: <20220928105946.12469-2-chenzhuo.1@bytedance.com> (raw)
In-Reply-To: <20220928105946.12469-1-chenzhuo.1@bytedance.com>
In lpfc_aer_cleanup_state(), uncorrectable error status needs to be
cleared, which can be done by calling pci_aer_clear_nonfatal_status()
and pci_aer_clear_fatal_status(). Meanwhile they can be combined in
one function (the same in dpc_process_error). So add
pci_aer_clear_uncorrect_error_status() function to PCI core and
export symbol to other modules which wants to use it.
Signed-off-by: Zhuo Chen <chenzhuo.1@bytedance.com>
---
drivers/pci/pcie/aer.c | 16 ++++++++++++++++
include/linux/aer.h | 5 +++++
2 files changed, 21 insertions(+)
diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c
index e2d8a74f83c3..4e637121be23 100644
--- a/drivers/pci/pcie/aer.c
+++ b/drivers/pci/pcie/aer.c
@@ -286,6 +286,22 @@ void pci_aer_clear_fatal_status(struct pci_dev *dev)
pci_write_config_dword(dev, aer + PCI_ERR_UNCOR_STATUS, status);
}
+int pci_aer_clear_uncorrect_error_status(struct pci_dev *dev)
+{
+ int aer = dev->aer_cap;
+ u32 status;
+
+ if (!pcie_aer_is_native(dev))
+ return -EIO;
+
+ pci_read_config_dword(dev, aer + PCI_ERR_UNCOR_STATUS, &status);
+ if (status)
+ pci_write_config_dword(dev, aer + PCI_ERR_UNCOR_STATUS, status);
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(pci_aer_clear_uncorrect_error_status);
+
/**
* pci_aer_raw_clear_status - Clear AER error registers.
* @dev: the PCI device
diff --git a/include/linux/aer.h b/include/linux/aer.h
index 97f64ba1b34a..154690c278cb 100644
--- a/include/linux/aer.h
+++ b/include/linux/aer.h
@@ -45,6 +45,7 @@ struct aer_capability_regs {
int pci_enable_pcie_error_reporting(struct pci_dev *dev);
int pci_disable_pcie_error_reporting(struct pci_dev *dev);
int pci_aer_clear_nonfatal_status(struct pci_dev *dev);
+int pci_aer_clear_uncorrect_error_status(struct pci_dev *dev);
void pci_save_aer_state(struct pci_dev *dev);
void pci_restore_aer_state(struct pci_dev *dev);
#else
@@ -60,6 +61,10 @@ static inline int pci_aer_clear_nonfatal_status(struct pci_dev *dev)
{
return -EINVAL;
}
+static inline int pci_aer_clear_uncorrect_error_status(struct pci_dev *dev)
+{
+ return -EINVAL;
+}
static inline void pci_save_aer_state(struct pci_dev *dev) {}
static inline void pci_restore_aer_state(struct pci_dev *dev) {}
#endif
--
2.30.1 (Apple Git-130)
next prev parent reply other threads:[~2022-09-28 11:01 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-28 10:59 [PATCH v3 0/9] PCI/AER: Fix and optimize usage of status clearing api Zhuo Chen
2022-09-28 10:59 ` Zhuo Chen [this message]
2023-03-15 21:29 ` [PATCH v3 1/9] PCI/AER: Add pci_aer_clear_uncorrect_error_status() to PCI core Bjorn Helgaas
2022-09-28 10:59 ` [PATCH v3 2/9] PCI/DPC: Use pci_aer_clear_uncorrect_error_status() to clear uncorrectable error status Zhuo Chen
2022-09-28 10:59 ` [PATCH v3 3/9] NTB: Remove pci_aer_clear_nonfatal_status() call Zhuo Chen
2022-09-28 11:03 ` Serge Semin
2022-12-06 18:09 ` Bjorn Helgaas
2022-12-06 21:41 ` Serge Semin
2023-03-15 21:31 ` Bjorn Helgaas
2022-09-28 10:59 ` [PATCH v3 4/9] scsi: lpfc: Change to use pci_aer_clear_uncorrect_error_status() Zhuo Chen
2022-12-06 22:13 ` Bjorn Helgaas
2023-03-15 21:35 ` Bjorn Helgaas
2023-03-30 23:43 ` Justin Tee
2022-09-28 10:59 ` [PATCH v3 5/9] PCI/AER: Unexport pci_aer_clear_nonfatal_status() Zhuo Chen
2022-09-28 10:59 ` [PATCH v3 6/9] PCI/AER: Move check inside pcie_clear_device_status() Zhuo Chen
2022-09-28 10:59 ` [PATCH v3 7/9] PCI/AER: Use pcie_aer_is_native() to judge whether OS owns AER Zhuo Chen
2022-09-28 10:59 ` [PATCH v3 8/9] PCI/ERR: Clear fatal error status when pci_channel_io_frozen Zhuo Chen
2022-12-06 21:42 ` Bjorn Helgaas
2022-09-28 10:59 ` [PATCH v3 9/9] PCI/AER: Refine status clearing process with api Zhuo Chen
2022-09-28 11:06 ` [PATCH v3 0/9] PCI/AER: Fix and optimize usage of status clearing api Serge Semin
2022-09-28 15:54 ` [External] " Zhuo Chen
2022-11-04 17:20 ` Zhuo Chen
2022-11-24 11:55 ` Zhuo Chen
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=20220928105946.12469-2-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 \
--cc=sathyanarayanan.kuppuswamy@linux.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).