Commit ac917892 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Tony Nguyen
Browse files

igbvf: Remove useless DMA-32 fallback configuration 

As stated in [1], dma_set_mask() with a 64-bit mask never fails if
dev->dma_mask is non-NULL.
So, if it fails, the 32 bits case will also fail for the same reason.

So, if dma_set_mask_and_coherent() succeeds, 'pci_using_dac' is known to be
1.

Simplify code and remove some dead code accordingly.

[1]: https://lkml.org/lkml/2021/6/7/398



Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Tested-by: default avatarKonrad Jankowski <konrad0.jankowski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent f80f4dc3

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

+6 −16
Original line number Diff line number Diff line
@@ -2684,26 +2684,19 @@ static int igbvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	struct igbvf_adapter *adapter;

	struct e1000_hw *hw;

	const struct igbvf_info *ei = igbvf_info_tbl[ent->driver_data];



	static int cards_found;

	int err, pci_using_dac;

	int err;



	err = pci_enable_device_mem(pdev);

	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_regions(pdev, igbvf_driver_name);

	if (err)
@@ -2783,10 +2776,7 @@ static int igbvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	netdev->hw_features |= NETIF_F_GSO_PARTIAL |

			       IGBVF_GSO_PARTIAL_FEATURES;



	netdev->features = netdev->hw_features;



	if (pci_using_dac)

		netdev->features |= NETIF_F_HIGHDMA;

	netdev->features = netdev->hw_features | NETIF_F_HIGHDMA;



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

	netdev->mpls_features |= NETIF_F_HW_CSUM;