Commit 7e01b408 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'pci-aer-remove-redundant-device-control-error-reporting-enable' 

Bjorn Helgaas says:

====================
PCI/AER: Remove redundant Device Control Error Reporting Enable

From: Bjorn Helgaas <bhelgaas@google.com>

Since f26e58bf ("PCI/AER: Enable error reporting when AER is native"),
which appeared in v6.0, the PCI core has enabled PCIe error reporting for
all devices during enumeration.

Remove driver code to do this and remove unnecessary includes of
<linux/aer.h> from several other drivers.

Intel folks, sorry that I missed removing the <linux/aer.h> includes in the
first series.
====================

Link: https://lore.kernel.org/r/20230307181940.868828-1-helgaas@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 6bf0ad7f f3468e39

drivers/net/ethernet/atheros/alx/main.c

+0 −4
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
#include <linux/ipv6.h>

#include <linux/if_vlan.h>

#include <linux/mdio.h>

#include <linux/aer.h>

#include <linux/bitops.h>

#include <linux/netdevice.h>

#include <linux/etherdevice.h>
@@ -1745,7 +1744,6 @@ static int alx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto out_pci_disable;

	}



	pci_enable_pcie_error_reporting(pdev);

	pci_set_master(pdev);



	if (!pdev->pm_cap) {
@@ -1879,7 +1877,6 @@ static int alx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	free_netdev(netdev);

out_pci_release:

	pci_release_mem_regions(pdev);

	pci_disable_pcie_error_reporting(pdev);

out_pci_disable:

	pci_disable_device(pdev);

	return err;
@@ -1897,7 +1894,6 @@ static void alx_remove(struct pci_dev *pdev) 
	iounmap(hw->hw_addr);

	pci_release_mem_regions(pdev);



	pci_disable_pcie_error_reporting(pdev);

	pci_disable_device(pdev);



	mutex_destroy(&alx->mtx);

drivers/net/ethernet/broadcom/bnx2.c

+0 −21
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ 
#include <linux/cache.h>

#include <linux/firmware.h>

#include <linux/log2.h>

#include <linux/aer.h>

#include <linux/crash_dump.h>



#if IS_ENABLED(CONFIG_CNIC)
@@ -8093,7 +8092,6 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev) 
	int rc, i, j;

	u32 reg;

	u64 dma_mask, persist_dma_mask;

	int err;



	SET_NETDEV_DEV(dev, &pdev->dev);

	bp = netdev_priv(dev);
@@ -8176,12 +8174,6 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev) 
		bp->flags |= BNX2_FLAG_PCIE;

		if (BNX2_CHIP_REV(bp) == BNX2_CHIP_REV_Ax)

			bp->flags |= BNX2_FLAG_JUMBO_BROKEN;



		/* AER (Advanced Error Reporting) hooks */

		err = pci_enable_pcie_error_reporting(pdev);

		if (!err)

			bp->flags |= BNX2_FLAG_AER_ENABLED;



	} else {

		bp->pcix_cap = pci_find_capability(pdev, PCI_CAP_ID_PCIX);

		if (bp->pcix_cap == 0) {
@@ -8460,11 +8452,6 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev) 
	return 0;



err_out_unmap:

	if (bp->flags & BNX2_FLAG_AER_ENABLED) {

		pci_disable_pcie_error_reporting(pdev);

		bp->flags &= ~BNX2_FLAG_AER_ENABLED;

	}



	pci_iounmap(pdev, bp->regview);

	bp->regview = NULL;
@@ -8638,11 +8625,6 @@ bnx2_remove_one(struct pci_dev *pdev) 
	bnx2_free_stats_blk(dev);

	kfree(bp->temp_stats_blk);



	if (bp->flags & BNX2_FLAG_AER_ENABLED) {

		pci_disable_pcie_error_reporting(pdev);

		bp->flags &= ~BNX2_FLAG_AER_ENABLED;

	}



	bnx2_release_firmware(bp);



	free_netdev(dev);
@@ -8766,9 +8748,6 @@ static pci_ers_result_t bnx2_io_slot_reset(struct pci_dev *pdev) 
	}

	rtnl_unlock();



	if (!(bp->flags & BNX2_FLAG_AER_ENABLED))

		return result;



	return result;

}

drivers/net/ethernet/broadcom/bnx2.h

+0 −1
Original line number Diff line number Diff line
@@ -6808,7 +6808,6 @@ struct bnx2 { 
#define BNX2_FLAG_JUMBO_BROKEN		0x00000800

#define BNX2_FLAG_CAN_KEEP_VLAN		0x00001000

#define BNX2_FLAG_BROKEN_STATS		0x00002000

#define BNX2_FLAG_AER_ENABLED		0x00004000



	struct bnx2_napi	bnx2_napi[BNX2_MAX_MSIX_VEC];

drivers/net/ethernet/broadcom/bnx2x/bnx2x.h

+0 −1
Original line number Diff line number Diff line
@@ -1486,7 +1486,6 @@ struct bnx2x { 
#define IS_VF_FLAG			(1 << 22)

#define BC_SUPPORTS_RMMOD_CMD		(1 << 23)

#define HAS_PHYS_PORT_ID		(1 << 24)

#define AER_ENABLED			(1 << 25)

#define PTP_SUPPORTED			(1 << 26)

#define TX_TIMESTAMPING_EN		(1 << 27)

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+0 −19
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <linux/slab.h>

#include <linux/interrupt.h>

#include <linux/pci.h>

#include <linux/aer.h>

#include <linux/init.h>

#include <linux/netdevice.h>

#include <linux/etherdevice.h>
@@ -13037,14 +13036,6 @@ static const struct net_device_ops bnx2x_netdev_ops = { 
	.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,

			  struct net_device *dev, unsigned long board_type)

{
@@ -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 */

	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

	 * is not used by the driver.
@@ -14020,8 +14004,6 @@ static int bnx2x_init_one(struct pci_dev *pdev, 
	bnx2x_free_mem_bp(bp);



init_one_exit:

	bnx2x_disable_pcie_error_reporting(bp);



	if (bp->regview)

		iounmap(bp->regview);
@@ -14102,7 +14084,6 @@ static void __bnx2x_remove(struct pci_dev *pdev, 
		pci_set_power_state(pdev, PCI_D3hot);

	}



	bnx2x_disable_pcie_error_reporting(bp);

	if (remove_netdev) {

		if (bp->regview)

			iounmap(bp->regview);