Commit 35c71aa0 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Tony Nguyen says:

====================
1GbE Intel Wired LAN Driver Updates 2022-01-27

Christophe Jaillet removes useless DMA-32 fallback calls from applicable
Intel drivers and simplifies code as a result of the removal.

* '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue:
  igbvf: Remove useless DMA-32 fallback configuration
  igb: Remove useless DMA-32 fallback configuration
  igc: Remove useless DMA-32 fallback configuration
  ice: Remove useless DMA-32 fallback configuration
  iavf: Remove useless DMA-32 fallback configuration
  e1000e: Remove useless DMA-32 fallback configuration
  i40e: Remove useless DMA-32 fallback configuration
  ixgbevf: Remove useless DMA-32 fallback configuration
  ixgbe: Remove useless DMA-32 fallback configuration
  ixgb: Remove useless DMA-32 fallback configuration
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 72d044e4 ac917892

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

+7 −15
Original line number Diff line number Diff line
@@ -7385,9 +7385,9 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	resource_size_t flash_start, flash_len;

	static int cards_found;

	u16 aspm_disable_flag = 0;

	int bars, i, err, pci_using_dac;

	u16 eeprom_data = 0;

	u16 eeprom_apme_mask = E1000_EEPROM_APME;

	int bars, i, err;

	s32 ret_val = 0;



	if (ei->flags2 & FLAG2_DISABLE_ASPM_L0S)
@@ -7401,18 +7401,12 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (err)

		return err;



	pci_using_dac = 0;

	err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

	if (!err) {

		pci_using_dac = 1;

	} else {

		err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));

	if (err) {

		dev_err(&pdev->dev,

			"No usable DMA configuration, aborting\n");

		goto err_dma;

	}

	}



	bars = pci_select_bars(pdev, IORESOURCE_MEM);

	err = pci_request_selected_regions_exclusive(pdev, bars,
@@ -7547,10 +7541,8 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	netdev->priv_flags |= IFF_UNICAST_FLT;



	if (pci_using_dac) {

	netdev->features |= NETIF_F_HIGHDMA;

	netdev->vlan_features |= NETIF_F_HIGHDMA;

	}



	/* MTU range: 68 - max_hw_frame_size */

	netdev->min_mtu = ETH_MIN_MTU;

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

+3 −6
Original line number Diff line number Diff line
@@ -15321,14 +15321,11 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	/* set up for high or low dma */

	err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

	if (err) {

		err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));

	if (err) {

		dev_err(&pdev->dev,

			"DMA configuration failed: 0x%x\n", err);

		goto err_dma;

	}

	}



	/* set up pci connections */

	err = pci_request_mem_regions(pdev, i40e_driver_name);

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

+3 −6
Original line number Diff line number Diff line
@@ -4367,14 +4367,11 @@ static int iavf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		return err;



	err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

	if (err) {

		err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));

	if (err) {

		dev_err(&pdev->dev,

			"DMA configuration failed: 0x%x\n", err);

		goto err_dma;

	}

	}



	err = pci_request_regions(pdev, iavf_driver_name);

	if (err) {

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

+0 −2
Original line number Diff line number Diff line
@@ -4459,8 +4459,6 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent) 


	/* set up for high or low DMA */

	err = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64));

	if (err)

		err = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));

	if (err) {

		dev_err(dev, "DMA configuration failed: 0x%x\n", err);

		return err;

drivers/net/ethernet/intel/igb/igb_main.c

+6 −13
Original line number Diff line number Diff line
@@ -3164,8 +3164,8 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	s32 ret_val;

	static int global_quad_port_a; /* global quad port a indication */

	const struct e1000_info *ei = igb_info_tbl[ent->driver_data];

	int err, pci_using_dac;

	u8 part_str[E1000_PBANUM_LENGTH];

	int err;



	/* Catch broken hardware that put the wrong VF device ID in

	 * the PCIe SR-IOV capability.
@@ -3180,18 +3180,12 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (err)

		return err;



	pci_using_dac = 0;

	err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

	if (!err) {

		pci_using_dac = 1;

	} else {

		err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));

	if (err) {

		dev_err(&pdev->dev,

			"No usable DMA configuration, aborting\n");

		goto err_dma;

	}

	}



	err = pci_request_mem_regions(pdev, igb_driver_name);

	if (err)
@@ -3306,7 +3300,6 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (hw->mac.type >= e1000_i350)

		netdev->hw_features |= NETIF_F_NTUPLE;



	if (pci_using_dac)

	netdev->features |= NETIF_F_HIGHDMA;



	netdev->vlan_features |= netdev->features | NETIF_F_TSO_MANGLEID;