Commit c925ed5f authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue 

Tony Nguyen says:

====================
Intel Wired LAN: Remove redundant Device Control Error Reporting Enable

Bjorn Helgaas says:

Since f26e58bf ("PCI/AER: Enable error reporting when AER is native"),
the PCI core sets the Device Control bits that enable error reporting for
PCIe devices.

This series removes redundant calls to pci_enable_pcie_error_reporting()
that do the same thing from several NIC drivers.

There are several more drivers where this should be removed; I started with
just the Intel drivers here.

* '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue:
  ixgbe: Remove redundant pci_enable_pcie_error_reporting()
  igc: Remove redundant pci_enable_pcie_error_reporting()
  igb: Remove redundant pci_enable_pcie_error_reporting()
  ice: Remove redundant pci_enable_pcie_error_reporting()
  iavf: Remove redundant pci_enable_pcie_error_reporting()
  i40e: Remove redundant pci_enable_pcie_error_reporting()
  fm10k: Remove redundant pci_enable_pcie_error_reporting()
  e1000e: Remove redundant pci_enable_pcie_error_reporting()
====================

Link: https://lore.kernel.org/r/20230130192519.686446-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 67971c38 dec6b801

drivers/net/ethernet/intel/e1000e/netdev.c

+0 −7
Original line number Diff line number Diff line
@@ -7418,9 +7418,6 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (err)

		goto err_pci_reg;



	/* AER (Advanced Error Reporting) hooks */

	pci_enable_pcie_error_reporting(pdev);



	pci_set_master(pdev);

	/* PCI config space info */

	err = pci_save_state(pdev);
@@ -7708,7 +7705,6 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
err_ioremap:

	free_netdev(netdev);

err_alloc_etherdev:

	pci_disable_pcie_error_reporting(pdev);

	pci_release_mem_regions(pdev);

err_pci_reg:

err_dma:
@@ -7775,9 +7771,6 @@ static void e1000_remove(struct pci_dev *pdev) 


	free_netdev(netdev);



	/* AER disable */

	pci_disable_pcie_error_reporting(pdev);



	pci_disable_device(pdev);

}

drivers/net/ethernet/intel/fm10k/fm10k_pci.c

+0 −5
Original line number Diff line number Diff line
@@ -2127,8 +2127,6 @@ static int fm10k_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);

	pci_save_state(pdev);
@@ -2227,7 +2225,6 @@ static int fm10k_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
err_ioremap:

	free_netdev(netdev);

err_alloc_netdev:

	pci_disable_pcie_error_reporting(pdev);

	pci_release_mem_regions(pdev);

err_pci_reg:

err_dma:
@@ -2281,8 +2278,6 @@ static void fm10k_remove(struct pci_dev *pdev) 


	pci_release_mem_regions(pdev);



	pci_disable_pcie_error_reporting(pdev);



	pci_disable_device(pdev);

}

drivers/net/ethernet/intel/i40e/i40e_main.c

+0 −4
Original line number Diff line number Diff line
@@ -15589,7 +15589,6 @@ static int i40e_init_recovery_mode(struct i40e_pf *pf, struct i40e_hw *hw) 
	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 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
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 @@ static void i40e_remove(struct pci_dev *pdev) 
	kfree(pf);

	pci_release_mem_regions(pdev);



	pci_disable_pcie_error_reporting(pdev);

	pci_disable_device(pdev);

}

drivers/net/ethernet/intel/iavf/iavf_main.c

+0 −5
Original line number Diff line number Diff line
@@ -4868,8 +4868,6 @@ static int iavf_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);



	netdev = alloc_etherdev_mq(sizeof(struct iavf_adapter),
@@ -4957,7 +4955,6 @@ static int iavf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
err_alloc_wq:

	free_netdev(netdev);

err_alloc_etherdev:

	pci_disable_pcie_error_reporting(pdev);

	pci_release_regions(pdev);

err_pci_reg:

err_dma:
@@ -5175,8 +5172,6 @@ static void iavf_remove(struct pci_dev *pdev) 


	free_netdev(netdev);



	pci_disable_pcie_error_reporting(pdev);



	pci_disable_device(pdev);

}

drivers/net/ethernet/intel/ice/ice_main.c

+0 −3
Original line number Diff line number Diff line
@@ -4664,7 +4664,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;
@@ -4981,7 +4980,6 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent) 
	ice_devlink_destroy_regions(pf);

	ice_deinit_hw(hw);

err_exit_unroll:

	pci_disable_pcie_error_reporting(pdev);

	pci_disable_device(pdev);

	return err;

}
@@ -5113,7 +5111,6 @@ static void ice_remove(struct pci_dev *pdev) 
	ice_reset(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);

}