Commit 4ac92726 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Jakub Kicinski
Browse files

sfc: falcon: 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: Martin Habets <habetsm.xilinx@gmail.com>
Acked-by: default avatarEdward Cree <ecree.xilinx@gmail.com>
Acked-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent bdedf705

drivers/net/ethernet/sfc/falcon/efx.c

+0 −9
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <linux/ethtool.h>

#include <linux/topology.h>

#include <linux/gfp.h>

#include <linux/aer.h>

#include <linux/interrupt.h>

#include "net_driver.h"

#include "efx.h"
@@ -2765,8 +2764,6 @@ static void ef4_pci_remove(struct pci_dev *pci_dev) 


	ef4_fini_struct(efx);

	free_netdev(efx->net_dev);



	pci_disable_pcie_error_reporting(pci_dev);

};



/* NIC VPD information
@@ -2927,12 +2924,6 @@ static int ef4_pci_probe(struct pci_dev *pci_dev, 
		netif_warn(efx, probe, efx->net_dev,

			   "failed to create MTDs (%d)\n", rc);



	rc = pci_enable_pcie_error_reporting(pci_dev);

	if (rc && rc != -EINVAL)

		netif_notice(efx, probe, efx->net_dev,

			     "PCIE error reporting unavailable (%d).\n",

			     rc);



	return 0;



 fail4: