ice: Remove redundant pci_enable_pcie_error_reporting()
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 18 Jan 2023 23:46:09 +0000 (17:46 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 25 Oct 2023 10:03:12 +0000 (12:03 +0200)
[ Upstream commit ba153552c18d7eb839ec0bad7d7484e29ba4719c ]

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>
Stable-dep-of: 0288c3e709e5 ("ice: reset first in crash dump kernels")
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/intel/ice/ice_main.c

index ae73320..f0f3936 100644 (file)
@@ -4723,7 +4723,6 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)
                return err;
        }
 
-       pci_enable_pcie_error_reporting(pdev);
        pci_set_master(pdev);
 
        pf->pdev = pdev;
@@ -5016,7 +5015,6 @@ err_init_pf_unroll:
        ice_devlink_destroy_regions(pf);
        ice_deinit_hw(hw);
 err_exit_unroll:
-       pci_disable_pcie_error_reporting(pdev);
        pci_disable_device(pdev);
        return err;
 }
@@ -5142,7 +5140,6 @@ static void ice_remove(struct pci_dev *pdev)
        ice_reset(&pf->hw, ICE_RESET_PFR);
        pci_wait_for_pending_transaction(pdev);
        ice_clear_interrupt_scheme(pf);
-       pci_disable_pcie_error_reporting(pdev);
        pci_disable_device(pdev);
 }