From: Zhuo Chen <chenzhuo.1@bytedance.com>
To: 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: chenzhuo.1@bytedance.com, linuxppc-dev@lists.ozlabs.org,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
ntb@lists.linux.dev, linux-scsi@vger.kernel.org
Subject: [PATCH v2 5/9] PCI/AER: Unexport pci_aer_clear_nonfatal_status()
Date: Tue, 27 Sep 2022 23:35:20 +0800 [thread overview]
Message-ID: <20220927153524.49172-6-chenzhuo.1@bytedance.com> (raw)
In-Reply-To: <20220927153524.49172-1-chenzhuo.1@bytedance.com>
Since pci_aer_clear_nonfatal_status() is used only internally, move
its declaration to the PCI internal header file. Also, no one cares
about return value of pci_aer_clear_nonfatal_status(), so make it void.
Signed-off-by: Zhuo Chen <chenzhuo.1@bytedance.com>
---
drivers/pci/pci.h | 2 ++
drivers/pci/pcie/aer.c | 7 ++-----
include/linux/aer.h | 5 -----
3 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 785f31086313..a114175d08e4 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -684,6 +684,7 @@ void pci_aer_init(struct pci_dev *dev);
void pci_aer_exit(struct pci_dev *dev);
extern const struct attribute_group aer_stats_attr_group;
void pci_aer_clear_fatal_status(struct pci_dev *dev);
+void pci_aer_clear_nonfatal_status(struct pci_dev *dev);
int pci_aer_clear_status(struct pci_dev *dev);
int pci_aer_raw_clear_status(struct pci_dev *dev);
#else
@@ -691,6 +692,7 @@ static inline void pci_no_aer(void) { }
static inline void pci_aer_init(struct pci_dev *d) { }
static inline void pci_aer_exit(struct pci_dev *d) { }
static inline void pci_aer_clear_fatal_status(struct pci_dev *dev) { }
+static inline void pci_aer_clear_nonfatal_status(struct pci_dev *dev) { }
static inline int pci_aer_clear_status(struct pci_dev *dev) { return -EINVAL; }
static inline int pci_aer_raw_clear_status(struct pci_dev *dev) { return -EINVAL; }
#endif
diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c
index 4e637121be23..e2ebd108339d 100644
--- a/drivers/pci/pcie/aer.c
+++ b/drivers/pci/pcie/aer.c
@@ -251,13 +251,13 @@ int pci_disable_pcie_error_reporting(struct pci_dev *dev)
}
EXPORT_SYMBOL_GPL(pci_disable_pcie_error_reporting);
-int pci_aer_clear_nonfatal_status(struct pci_dev *dev)
+void pci_aer_clear_nonfatal_status(struct pci_dev *dev)
{
int aer = dev->aer_cap;
u32 status, sev;
if (!pcie_aer_is_native(dev))
- return -EIO;
+ return;
/* Clear status bits for ERR_NONFATAL errors only */
pci_read_config_dword(dev, aer + PCI_ERR_UNCOR_STATUS, &status);
@@ -265,10 +265,7 @@ int pci_aer_clear_nonfatal_status(struct pci_dev *dev)
status &= ~sev;
if (status)
pci_write_config_dword(dev, aer + PCI_ERR_UNCOR_STATUS, status);
-
- return 0;
}
-EXPORT_SYMBOL_GPL(pci_aer_clear_nonfatal_status);
void pci_aer_clear_fatal_status(struct pci_dev *dev)
{
diff --git a/include/linux/aer.h b/include/linux/aer.h
index 154690c278cb..f638ad955deb 100644
--- a/include/linux/aer.h
+++ b/include/linux/aer.h
@@ -44,7 +44,6 @@ struct aer_capability_regs {
/* PCIe port driver needs this function to enable AER */
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);
@@ -57,10 +56,6 @@ static inline int pci_disable_pcie_error_reporting(struct pci_dev *dev)
{
return -EINVAL;
}
-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;
--
2.30.1 (Apple Git-130)
next prev parent reply other threads:[~2022-09-27 15:40 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-27 15:35 [PATCH v2 0/9] PCI/AER: Fix and optimize usage of status clearing api Zhuo Chen
2022-09-27 15:35 ` [PATCH v2 1/9] PCI/AER: Add pci_aer_clear_uncorrect_error_status() to PCI core Zhuo Chen
2022-09-27 19:31 ` Sathyanarayanan Kuppuswamy
2022-09-28 8:32 ` Zhuo Chen
2022-09-27 15:35 ` [PATCH v2 2/9] PCI/DPC: Use pci_aer_clear_uncorrect_error_status() to clear uncorrectable error status Zhuo Chen
2022-09-27 19:34 ` Sathyanarayanan Kuppuswamy
2022-09-27 15:35 ` [PATCH v2 3/9] NTB: Change to use pci_aer_clear_uncorrect_error_status() Zhuo Chen
2022-09-27 19:39 ` Sathyanarayanan Kuppuswamy
2022-09-28 4:20 ` [External] " Zhuo Chen
2022-09-28 4:30 ` Sathyanarayanan Kuppuswamy
2022-09-28 11:00 ` Serge Semin
2022-09-27 15:35 ` [PATCH v2 4/9] scsi: lpfc: " Zhuo Chen
2022-09-27 19:57 ` Sathyanarayanan Kuppuswamy
2022-09-27 15:35 ` Zhuo Chen [this message]
2022-09-27 19:59 ` [PATCH v2 5/9] PCI/AER: Unexport pci_aer_clear_nonfatal_status() Sathyanarayanan Kuppuswamy
2022-09-27 15:35 ` [PATCH v2 6/9] PCI/AER: Move check inside pcie_clear_device_status() Zhuo Chen
2022-09-27 15:35 ` [PATCH v2 7/9] PCI/AER: Use pcie_aer_is_native() to judge whether OS owns AER Zhuo Chen
2022-09-27 15:35 ` [PATCH v2 8/9] PCI/ERR: Clear fatal status when pci_channel_io_frozen Zhuo Chen
2022-09-27 15:35 ` [PATCH v2 9/9] PCI/AER: Refine status clearing process with api 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=20220927153524.49172-6-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).