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 7/9] PCI/AER: Use pcie_aer_is_native() to judge whether OS owns AER
Date: Tue, 27 Sep 2022 23:35:22 +0800 [thread overview]
Message-ID: <20220927153524.49172-8-chenzhuo.1@bytedance.com> (raw)
In-Reply-To: <20220927153524.49172-1-chenzhuo.1@bytedance.com>
Use pcie_aer_is_native() in place of "host->native_aer ||
pcie_ports_native" to judge whether OS owns AER in aer_root_reset().
Replace "dev->aer_cap && (pcie_ports_native || host->native_aer)" in
get_port_device_capability() with pcie_aer_is_native(), which has no
functional changes.
Signed-off-by: Zhuo Chen <chenzhuo.1@bytedance.com>
---
drivers/pci/pcie/aer.c | 5 ++---
drivers/pci/pcie/portdrv_core.c | 3 +--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c
index e2320ab27a31..a6d29269ccf2 100644
--- a/drivers/pci/pcie/aer.c
+++ b/drivers/pci/pcie/aer.c
@@ -1403,7 +1403,6 @@ static pci_ers_result_t aer_root_reset(struct pci_dev *dev)
int type = pci_pcie_type(dev);
struct pci_dev *root;
int aer;
- struct pci_host_bridge *host = pci_find_host_bridge(dev->bus);
u32 reg32;
int rc;
@@ -1424,7 +1423,7 @@ static pci_ers_result_t aer_root_reset(struct pci_dev *dev)
*/
aer = root ? root->aer_cap : 0;
- if ((host->native_aer || pcie_ports_native) && aer) {
+ if (aer && pcie_aer_is_native(root)) {
/* Disable Root's interrupt in response to error messages */
pci_read_config_dword(root, aer + PCI_ERR_ROOT_COMMAND, ®32);
reg32 &= ~ROOT_PORT_INTR_ON_MESG_MASK;
@@ -1443,7 +1442,7 @@ static pci_ers_result_t aer_root_reset(struct pci_dev *dev)
pci_is_root_bus(dev->bus) ? "Root" : "Downstream", rc);
}
- if ((host->native_aer || pcie_ports_native) && aer) {
+ if (aer && pcie_aer_is_native(root)) {
/* Clear Root Error Status */
pci_read_config_dword(root, aer + PCI_ERR_ROOT_STATUS, ®32);
pci_write_config_dword(root, aer + PCI_ERR_ROOT_STATUS, reg32);
diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index 1ac7fec47d6f..844297c0c85e 100644
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -221,8 +221,7 @@ static int get_port_device_capability(struct pci_dev *dev)
}
#ifdef CONFIG_PCIEAER
- if (dev->aer_cap && pci_aer_available() &&
- (pcie_ports_native || host->native_aer))
+ if (pcie_aer_is_native(dev) && pci_aer_available())
services |= PCIE_PORT_SERVICE_AER;
#endif
--
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 ` [PATCH v2 5/9] PCI/AER: Unexport pci_aer_clear_nonfatal_status() Zhuo Chen
2022-09-27 19:59 ` 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 ` Zhuo Chen [this message]
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-8-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).