diff mbox series

[07/28] net/fungible: Drop redundant pci_enable_pcie_error_reporting()

Message ID 20230307181940.868828-8-helgaas@kernel.org (mailing list archive)
State Accepted
Commit 49f79ac22f89476cb2eac018676490e33a7c4a10
Delegated to: Netdev Maintainers
Headers show
Series PCI/AER: Remove redundant Device Control Error Reporting Enable | expand

Checks

Context Check Description
netdev/series_format fail Series longer than 15 patches (and no cover letter); Target tree name not specified in the subject
netdev/tree_selection success Guessed tree name to be net-next, async
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 20 this patch: 20
netdev/cc_maintainers success CCed 7 of 7 maintainers
netdev/build_clang success Errors and warnings before: 18 this patch: 18
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 20 this patch: 20
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 28 lines checked
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0

Commit Message

Bjorn Helgaas March 7, 2023, 6:19 p.m. UTC 
From: Bjorn Helgaas <bhelgaas@google.com>

pci_enable_pcie_error_reporting() enables the device to send ERR_*
Messages.  Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is
native"), the PCI core does this for all devices during enumeration, so the
driver doesn't need to do it itself.

Remove the redundant pci_enable_pcie_error_reporting() call from the
driver.  Also remove the corresponding pci_disable_pcie_error_reporting()
from the driver .remove() path.

Note that this only controls ERR_* Messages from the device.  An ERR_*
Message may cause the Root Port to generate an interrupt, depending on the
AER Root Error Command register managed by the AER service driver.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Dimitris Michailidis <dmichail@fungible.com>
---
 drivers/net/ethernet/fungible/funcore/fun_dev.c | 5 -----
 1 file changed, 5 deletions(-)

Comments

Dimitris Michailidis March 7, 2023, 7:17 p.m. UTC | #1 
On Tue, Mar 7, 2023 at 10:20 AM Bjorn Helgaas <helgaas@kernel.org> wrote:
>
> From: Bjorn Helgaas <bhelgaas@google.com>
>
> pci_enable_pcie_error_reporting() enables the device to send ERR_*
> Messages.  Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is
> native"), the PCI core does this for all devices during enumeration, so the
> driver doesn't need to do it itself.
>
> Remove the redundant pci_enable_pcie_error_reporting() call from the
> driver.  Also remove the corresponding pci_disable_pcie_error_reporting()
> from the driver .remove() path.
>
> Note that this only controls ERR_* Messages from the device.  An ERR_*
> Message may cause the Root Port to generate an interrupt, depending on the
> AER Root Error Command register managed by the AER service driver.
>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> Cc: Dimitris Michailidis <dmichail@fungible.com>

Acked-by: Dimitris Michailidis <dmichail@fungible.com>

> ---
>  drivers/net/ethernet/fungible/funcore/fun_dev.c | 5 -----
>  1 file changed, 5 deletions(-)
>
> diff --git a/drivers/net/ethernet/fungible/funcore/fun_dev.c b/drivers/net/ethernet/fungible/funcore/fun_dev.c
> index fb5120d90f26..3680f83feba2 100644
> --- a/drivers/net/ethernet/fungible/funcore/fun_dev.c
> +++ b/drivers/net/ethernet/fungible/funcore/fun_dev.c
> @@ -1,6 +1,5 @@
>  // SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause)
>
> -#include <linux/aer.h>
>  #include <linux/bitmap.h>
>  #include <linux/delay.h>
>  #include <linux/interrupt.h>
> @@ -748,7 +747,6 @@ void fun_dev_disable(struct fun_dev *fdev)
>         pci_free_irq_vectors(pdev);
>
>         pci_clear_master(pdev);
> -       pci_disable_pcie_error_reporting(pdev);
>         pci_disable_device(pdev);
>
>         fun_unmap_bars(fdev);
> @@ -781,8 +779,6 @@ int fun_dev_enable(struct fun_dev *fdev, struct pci_dev *pdev,
>                 goto unmap;
>         }
>
> -       pci_enable_pcie_error_reporting(pdev);
> -
>         rc = sanitize_dev(fdev);
>         if (rc)
>                 goto disable_dev;
> @@ -830,7 +826,6 @@ int fun_dev_enable(struct fun_dev *fdev, struct pci_dev *pdev,
>  free_irqs:
>         pci_free_irq_vectors(pdev);
>  disable_dev:
> -       pci_disable_pcie_error_reporting(pdev);
>         pci_disable_device(pdev);
>  unmap:
>         fun_unmap_bars(fdev);
> --
> 2.25.1
>
diff mbox series

Patch

diff --git a/drivers/net/ethernet/fungible/funcore/fun_dev.c b/drivers/net/ethernet/fungible/funcore/fun_dev.c
index fb5120d90f26..3680f83feba2 100644
--- a/drivers/net/ethernet/fungible/funcore/fun_dev.c
+++ b/drivers/net/ethernet/fungible/funcore/fun_dev.c
@@ -1,6 +1,5 @@ 
 // SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause)
 
-#include <linux/aer.h>
 #include <linux/bitmap.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
@@ -748,7 +747,6 @@  void fun_dev_disable(struct fun_dev *fdev)
 	pci_free_irq_vectors(pdev);
 
 	pci_clear_master(pdev);
-	pci_disable_pcie_error_reporting(pdev);
 	pci_disable_device(pdev);
 
 	fun_unmap_bars(fdev);
@@ -781,8 +779,6 @@  int fun_dev_enable(struct fun_dev *fdev, struct pci_dev *pdev,
 		goto unmap;
 	}
 
-	pci_enable_pcie_error_reporting(pdev);
-
 	rc = sanitize_dev(fdev);
 	if (rc)
 		goto disable_dev;
@@ -830,7 +826,6 @@  int fun_dev_enable(struct fun_dev *fdev, struct pci_dev *pdev,
 free_irqs:
 	pci_free_irq_vectors(pdev);
 disable_dev:
-	pci_disable_pcie_error_reporting(pdev);
 	pci_disable_device(pdev);
 unmap:
 	fun_unmap_bars(fdev);