i40e: Remove redundant pci_enable_pcie_error_reporting()
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 18 Jan 2023 23:46:07 +0000 (17:46 -0600)
committerTony Nguyen <anthony.l.nguyen@intel.com>
Mon, 30 Jan 2023 17:35:04 +0000 (09:35 -0800)
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.

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 doesn't control interrupt generation by the Root Port; that
is controlled by the AER Root Error Command register, which is managed by
the AER service driver.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: Tony Nguyen <anthony.l.nguyen@intel.com>
Cc: intel-wired-lan@lists.osuosl.org
Cc: netdev@vger.kernel.org
Tested-by: Gurucharan G <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
drivers/net/ethernet/intel/i40e/i40e_main.c

index 53d0083..43693f9 100644 (file)
@@ -15589,7 +15589,6 @@ err_switch_setup:
        timer_shutdown_sync(&pf->service_timer);
        i40e_shutdown_adminq(hw);
        iounmap(hw->hw_addr);
-       pci_disable_pcie_error_reporting(pf->pdev);
        pci_release_mem_regions(pf->pdev);
        pci_disable_device(pf->pdev);
        kfree(pf);
@@ -15660,7 +15659,6 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                goto err_pci_reg;
        }
 
-       pci_enable_pcie_error_reporting(pdev);
        pci_set_master(pdev);
 
        /* Now that we have a PCI connection, we need to do the
@@ -16218,7 +16216,6 @@ err_pf_reset:
 err_ioremap:
        kfree(pf);
 err_pf_alloc:
-       pci_disable_pcie_error_reporting(pdev);
        pci_release_mem_regions(pdev);
 err_pci_reg:
 err_dma:
@@ -16366,7 +16363,6 @@ unmap:
        kfree(pf);
        pci_release_mem_regions(pdev);
 
-       pci_disable_pcie_error_reporting(pdev);
        pci_disable_device(pdev);
 }