diff mbox series

[v2] PCI/AER: Change to use helper pcie_aer_is_native() in some places

Message ID 1612490648-44817-1-git-send-email-tanxiaofei@huawei.com
State New
Headers show
Series [v2] PCI/AER: Change to use helper pcie_aer_is_native() in some places | expand

Commit Message

Xiaofei Tan Feb. 5, 2021, 2:04 a.m. UTC
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>

---
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(-)

Comments

Kelley, Sean V Feb. 26, 2021, 5:47 p.m. UTC | #1
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, &reg32);
     		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, &reg32);
     		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
diff mbox series

Patch

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, &reg32);
 		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, &reg32);
 		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;
 
 		/*