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: 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 v3 9/9] PCI/AER: Refine status clearing process with api
Date: Wed, 28 Sep 2022 18:59:46 +0800 [thread overview]
Message-ID: <20220928105946.12469-10-chenzhuo.1@bytedance.com> (raw)
In-Reply-To: <20220928105946.12469-1-chenzhuo.1@bytedance.com>
Statements clearing status in aer_enable_rootport() is functionally
equivalent with pcie_clear_device_status() and pci_aer_clear_status().
So replace them, which has no functional changes.
After commit 20e15e673b05 ("PCI/AER: Add pci_aer_raw_clear_status()
to unconditionally clear Error Status"), pci_aer_raw_clear_status()
is only used by the EDR path, so we add note in function comment.
Signed-off-by: Zhuo Chen <chenzhuo.1@bytedance.com>
---
drivers/pci/pcie/aer.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c
index a6d29269ccf2..bd5ecfa4860f 100644
--- a/drivers/pci/pcie/aer.c
+++ b/drivers/pci/pcie/aer.c
@@ -306,6 +306,8 @@ EXPORT_SYMBOL_GPL(pci_aer_clear_uncorrect_error_status);
* Clearing AER error status registers unconditionally, regardless of
* whether they're owned by firmware or the OS.
*
+ * Used only by the EDR path. Other paths should use pci_aer_clear_status().
+ *
* Returns 0 on success, or negative on failure.
*/
int pci_aer_raw_clear_status(struct pci_dev *dev)
@@ -1277,24 +1279,17 @@ static void aer_enable_rootport(struct aer_rpc *rpc)
{
struct pci_dev *pdev = rpc->rpd;
int aer = pdev->aer_cap;
- u16 reg16;
u32 reg32;
/* Clear PCIe Capability's Device Status */
- pcie_capability_read_word(pdev, PCI_EXP_DEVSTA, ®16);
- pcie_capability_write_word(pdev, PCI_EXP_DEVSTA, reg16);
+ pcie_clear_device_status(pdev);
/* Disable system error generation in response to error messages */
pcie_capability_clear_word(pdev, PCI_EXP_RTCTL,
SYSTEM_ERROR_INTR_ON_MESG_MASK);
/* Clear error status */
- pci_read_config_dword(pdev, aer + PCI_ERR_ROOT_STATUS, ®32);
- pci_write_config_dword(pdev, aer + PCI_ERR_ROOT_STATUS, reg32);
- pci_read_config_dword(pdev, aer + PCI_ERR_COR_STATUS, ®32);
- pci_write_config_dword(pdev, aer + PCI_ERR_COR_STATUS, reg32);
- pci_read_config_dword(pdev, aer + PCI_ERR_UNCOR_STATUS, ®32);
- pci_write_config_dword(pdev, aer + PCI_ERR_UNCOR_STATUS, reg32);
+ pci_aer_clear_status(pdev);
/*
* Enable error reporting for the root port device and downstream port
--
2.30.1 (Apple Git-130)
next prev parent reply other threads:[~2022-09-28 11:02 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 ` [PATCH v3 1/9] PCI/AER: Add pci_aer_clear_uncorrect_error_status() to PCI core Zhuo Chen
2023-03-15 21:29 ` 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 ` Zhuo Chen [this message]
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-10-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).