Commit 2fba753c authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Jakub Kicinski

bnx2x: 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: Ariel Elior <aelior@marvell.com>
Cc: Sudarsana Kalluru <skalluru@marvell.com>
Cc: Manish Chopra <manishc@marvell.com>
Acked-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 5f00358b
...@@ -1486,7 +1486,6 @@ struct bnx2x { ...@@ -1486,7 +1486,6 @@ struct bnx2x {
#define IS_VF_FLAG (1 << 22) #define IS_VF_FLAG (1 << 22)
#define BC_SUPPORTS_RMMOD_CMD (1 << 23) #define BC_SUPPORTS_RMMOD_CMD (1 << 23)
#define HAS_PHYS_PORT_ID (1 << 24) #define HAS_PHYS_PORT_ID (1 << 24)
#define AER_ENABLED (1 << 25)
#define PTP_SUPPORTED (1 << 26) #define PTP_SUPPORTED (1 << 26)
#define TX_TIMESTAMPING_EN (1 << 27) #define TX_TIMESTAMPING_EN (1 << 27)
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/aer.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
...@@ -13037,14 +13036,6 @@ static const struct net_device_ops bnx2x_netdev_ops = { ...@@ -13037,14 +13036,6 @@ static const struct net_device_ops bnx2x_netdev_ops = {
.ndo_features_check = bnx2x_features_check, .ndo_features_check = bnx2x_features_check,
}; };
static void bnx2x_disable_pcie_error_reporting(struct bnx2x *bp)
{
if (bp->flags & AER_ENABLED) {
pci_disable_pcie_error_reporting(bp->pdev);
bp->flags &= ~AER_ENABLED;
}
}
static int bnx2x_init_dev(struct bnx2x *bp, struct pci_dev *pdev, static int bnx2x_init_dev(struct bnx2x *bp, struct pci_dev *pdev,
struct net_device *dev, unsigned long board_type) struct net_device *dev, unsigned long board_type)
{ {
...@@ -13157,13 +13148,6 @@ static int bnx2x_init_dev(struct bnx2x *bp, struct pci_dev *pdev, ...@@ -13157,13 +13148,6 @@ static int bnx2x_init_dev(struct bnx2x *bp, struct pci_dev *pdev,
/* Set PCIe reset type to fundamental for EEH recovery */ /* Set PCIe reset type to fundamental for EEH recovery */
pdev->needs_freset = 1; pdev->needs_freset = 1;
/* AER (Advanced Error reporting) configuration */
rc = pci_enable_pcie_error_reporting(pdev);
if (!rc)
bp->flags |= AER_ENABLED;
else
BNX2X_DEV_INFO("Failed To configure PCIe AER [%d]\n", rc);
/* /*
* Clean the following indirect addresses for all functions since it * Clean the following indirect addresses for all functions since it
* is not used by the driver. * is not used by the driver.
...@@ -14020,8 +14004,6 @@ static int bnx2x_init_one(struct pci_dev *pdev, ...@@ -14020,8 +14004,6 @@ static int bnx2x_init_one(struct pci_dev *pdev,
bnx2x_free_mem_bp(bp); bnx2x_free_mem_bp(bp);
init_one_exit: init_one_exit:
bnx2x_disable_pcie_error_reporting(bp);
if (bp->regview) if (bp->regview)
iounmap(bp->regview); iounmap(bp->regview);
...@@ -14102,7 +14084,6 @@ static void __bnx2x_remove(struct pci_dev *pdev, ...@@ -14102,7 +14084,6 @@ static void __bnx2x_remove(struct pci_dev *pdev,
pci_set_power_state(pdev, PCI_D3hot); pci_set_power_state(pdev, PCI_D3hot);
} }
bnx2x_disable_pcie_error_reporting(bp);
if (remove_netdev) { if (remove_netdev) {
if (bp->regview) if (bp->regview)
iounmap(bp->regview); iounmap(bp->regview);
......
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