OSDN Git Service

qed: Drop redundant pci_enable_pcie_error_reporting()
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 7 Mar 2023 18:19:22 +0000 (12:19 -0600)
committerJakub Kicinski <kuba@kernel.org>
Thu, 9 Mar 2023 07:34:38 +0000 (23:34 -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, 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: Ariel Elior <aelior@marvell.com>
Cc: Manish Chopra <manishc@marvell.com>
Acked-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/qlogic/qed/qed_main.c

index c91898b..f5af833 100644 (file)
@@ -23,7 +23,6 @@
 #include <linux/qed/qed_if.h>
 #include <linux/qed/qed_ll2_if.h>
 #include <net/devlink.h>
-#include <linux/aer.h>
 #include <linux/phylink.h>
 
 #include "qed.h"
@@ -259,8 +258,6 @@ static void qed_free_pci(struct qed_dev *cdev)
 {
        struct pci_dev *pdev = cdev->pdev;
 
-       pci_disable_pcie_error_reporting(pdev);
-
        if (cdev->doorbells && cdev->db_size)
                iounmap(cdev->doorbells);
        if (cdev->regview)
@@ -366,12 +363,6 @@ static int qed_init_pci(struct qed_dev *cdev, struct pci_dev *pdev)
                return -ENOMEM;
        }
 
-       /* AER (Advanced Error reporting) configuration */
-       rc = pci_enable_pcie_error_reporting(pdev);
-       if (rc)
-               DP_VERBOSE(cdev, NETIF_MSG_DRV,
-                          "Failed to configure PCIe AER [%d]\n", rc);
-
        return 0;
 
 err2: