From: "Kelley, Sean V" <sean.v.kelley@intel.com>
To: Xiaofei Tan <tanxiaofei@huawei.com>,
"bhelgaas@google.com" <bhelgaas@google.com>,
"sathyanarayanan.kuppuswamy@linux.intel.com"
<sathyanarayanan.kuppuswamy@linux.intel.com>,
"Jonathan.Cameron@huawei.com" <Jonathan.Cameron@huawei.com>,
"refactormyself@gmail.com" <refactormyself@gmail.com>
Cc: "linux-pci@vger.kernel.org" <linux-pci@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linuxarm@huawei.com" <linuxarm@huawei.com>
Subject: Re: [PATCH v2] PCI/AER: Change to use helper pcie_aer_is_native() in some places
Date: Fri, 26 Feb 2021 17:47:16 +0000 [thread overview]
Message-ID: <24F76C61-22AA-466A-88EA-8C143616BA84@intel.com> (raw)
In-Reply-To: <1612490648-44817-1-git-send-email-tanxiaofei@huawei.com>
On 2/4/21, 6:07 PM, "Xiaofei Tan" <tanxiaofei@huawei.com> wrote:
Use helper function pcie_aer_is_native() in some places to keep
the code tidy. No function changes.
Signed-off-by: Xiaofei Tan <tanxiaofei@huawei.com>
Reviewed-by: Krzysztof Wilczyński <kw@linux.com>
Nice use of the helper and good suggestion from Krzysztof.
Acked-by: Sean V Kelley <sean.v.kelley@intel.com>
---
Changes from v1 to v2:
- Add the fix suggested by Krzysztof.
---
drivers/pci/pcie/aer.c | 4 ++--
drivers/pci/pcie/err.c | 2 +-
drivers/pci/pcie/portdrv_core.c | 3 +--
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c
index 77b0f2c..03212d0 100644
--- a/drivers/pci/pcie/aer.c
+++ b/drivers/pci/pcie/aer.c
@@ -1397,7 +1397,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 (pcie_aer_is_native(dev) && aer) {
/* 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;
@@ -1417,7 +1417,7 @@ static pci_ers_result_t aer_root_reset(struct pci_dev *dev)
pci_info(dev, "Root Port link has been reset (%d)\n", rc);
}
- if ((host->native_aer || pcie_ports_native) && aer) {
+ if (pcie_aer_is_native(dev) && aer) {
/* 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/err.c b/drivers/pci/pcie/err.c
index 510f31f..1d6cfb9 100644
--- a/drivers/pci/pcie/err.c
+++ b/drivers/pci/pcie/err.c
@@ -237,7 +237,7 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,
* this status. In that case, the signaling device may not even be
* visible to the OS.
*/
- if (host->native_aer || pcie_ports_native) {
+ if (pcie_aer_is_native(dev)) {
pcie_clear_device_status(bridge);
pci_aer_clear_nonfatal_status(bridge);
}
diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index e1fed664..3b3743e 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 (pci_aer_available() && pcie_aer_is_native(dev)) {
services |= PCIE_PORT_SERVICE_AER;
/*
--
2.8.1
next prev parent reply other threads:[~2021-02-26 17:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-05 2:04 [PATCH v2] PCI/AER: Change to use helper pcie_aer_is_native() in some places Xiaofei Tan
2021-02-26 17:47 ` Kelley, Sean V [this message]
2021-07-28 22:08 ` 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=24F76C61-22AA-466A-88EA-8C143616BA84@intel.com \
--to=sean.v.kelley@intel.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=refactormyself@gmail.com \
--cc=sathyanarayanan.kuppuswamy@linux.intel.com \
--cc=tanxiaofei@huawei.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).