]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
igc: Remove useless DMA-32 fallback configuration
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Sun, 9 Jan 2022 18:38:49 +0000 (19:38 +0100)
committerTony Nguyen <anthony.l.nguyen@intel.com>
Thu, 27 Jan 2022 16:58:24 +0000 (08:58 -0800)
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: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
drivers/net/ethernet/intel/igc/igc_main.c

index 2f17f36e94fde9b7f94bd0d3f025011dd7a1be6f..6b51baadee3da444e3ab9c0dcdce7424fcdb2760 100644 (file)
@@ -6251,23 +6251,17 @@ static int igc_probe(struct pci_dev *pdev,
        struct net_device *netdev;
        struct igc_hw *hw;
        const struct igc_info *ei = igc_info_tbl[ent->driver_data];
-       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;
-               }
+       if (err) {
+               dev_err(&pdev->dev,
+                       "No usable DMA configuration, aborting\n");
+               goto err_dma;
        }
 
        err = pci_request_mem_regions(pdev, igc_driver_name);
@@ -6367,8 +6361,7 @@ static int igc_probe(struct pci_dev *pdev,
        netdev->hw_features |= NETIF_F_HW_VLAN_CTAG_RX;
        netdev->hw_features |= netdev->features;
 
-       if (pci_using_dac)
-               netdev->features |= NETIF_F_HIGHDMA;
+       netdev->features |= NETIF_F_HIGHDMA;
 
        netdev->vlan_features |= netdev->features | NETIF_F_TSO_MANGLEID;
        netdev->mpls_features |= NETIF_F_HW_CSUM;