Commit 1fccc781 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Jakub Kicinski

net: txgbe: Drop redundant pci_enable_pcie_error_reporting()

pci_enable_pcie_error_reporting() enables the device to send ERR_*
Messages.  Since f26e58bf ("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: default avatarBjorn Helgaas <bhelgaas@google.com>
Cc: Jiawen Wu <jiawenwu@trustnetic.com>
Cc: Mengyuan Lou <mengyuanlou@net-swift.com>
Acked-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent a7edf8e5
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/aer.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <net/ip.h> #include <net/ip.h>
...@@ -538,7 +537,6 @@ static int txgbe_probe(struct pci_dev *pdev, ...@@ -538,7 +537,6 @@ static int txgbe_probe(struct pci_dev *pdev,
goto err_pci_disable_dev; goto err_pci_disable_dev;
} }
pci_enable_pcie_error_reporting(pdev);
pci_set_master(pdev); pci_set_master(pdev);
netdev = devm_alloc_etherdev_mqs(&pdev->dev, netdev = devm_alloc_etherdev_mqs(&pdev->dev,
...@@ -698,7 +696,6 @@ static int txgbe_probe(struct pci_dev *pdev, ...@@ -698,7 +696,6 @@ static int txgbe_probe(struct pci_dev *pdev,
err_free_mac_table: err_free_mac_table:
kfree(wx->mac_table); kfree(wx->mac_table);
err_pci_release_regions: err_pci_release_regions:
pci_disable_pcie_error_reporting(pdev);
pci_release_selected_regions(pdev, pci_release_selected_regions(pdev,
pci_select_bars(pdev, IORESOURCE_MEM)); pci_select_bars(pdev, IORESOURCE_MEM));
err_pci_disable_dev: err_pci_disable_dev:
...@@ -729,8 +726,6 @@ static void txgbe_remove(struct pci_dev *pdev) ...@@ -729,8 +726,6 @@ static void txgbe_remove(struct pci_dev *pdev)
kfree(wx->mac_table); kfree(wx->mac_table);
wx_clear_interrupt_scheme(wx); wx_clear_interrupt_scheme(wx);
pci_disable_pcie_error_reporting(pdev);
pci_disable_device(pdev); pci_disable_device(pdev);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment