leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ixgbevf: Remove useless DMA-32 fallback configuration

Browse Source 
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>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Alexander Lobakin <alexandr.lobakin@intel.com>
Tested-by: Gurucharan G <gurucharanx.g@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
This commit is contained in:
Christophe JAILLET 2022-01-09 18:22:26 +01:00 committed by Tony Nguyen
parent 4d361c6fd8
commit 90b83d0139
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
View File

@ -4511,22 +4511,17 @@ static int ixgbevf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
struct ixgbevf_adapter *adapter = NULL; struct ixgbevf_adapter *adapter = NULL;
struct ixgbe_hw *hw = NULL; struct ixgbe_hw *hw = NULL;
const struct ixgbevf_info *ii = ixgbevf_info_tbl[ent->driver_data]; const struct ixgbevf_info *ii = ixgbevf_info_tbl[ent->driver_data];
int err, pci_using_dac;
bool disable_dev = false; bool disable_dev = false;
int err;
err = pci_enable_device(pdev); err = pci_enable_device(pdev);
if (err) if (err)
return err; return err;
if (!dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64))) { err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
pci_using_dac = 1; if (err) {
} else { dev_err(&pdev->dev, "No usable DMA configuration, aborting\n");
err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); goto err_dma;
if (err) {
dev_err(&pdev->dev, "No usable DMA configuration, aborting\n");
goto err_dma;
}
pci_using_dac = 0;
} }
err = pci_request_regions(pdev, ixgbevf_driver_name); err = pci_request_regions(pdev, ixgbevf_driver_name);
@ -4606,10 +4601,7 @@ static int ixgbevf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
netdev->hw_features |= NETIF_F_GSO_PARTIAL | netdev->hw_features |= NETIF_F_GSO_PARTIAL |
IXGBEVF_GSO_PARTIAL_FEATURES; IXGBEVF_GSO_PARTIAL_FEATURES;
netdev->features = netdev->hw_features; netdev->features = netdev->hw_features | NETIF_F_HIGHDMA;
if (pci_using_dac)
netdev->features |= NETIF_F_HIGHDMA;
netdev->vlan_features |= netdev->features | NETIF_F_TSO_MANGLEID; netdev->vlan_features |= netdev->features | NETIF_F_TSO_MANGLEID;
netdev->mpls_features |= NETIF_F_SG | netdev->mpls_features |= NETIF_F_SG |