mirror of
https://github.com/torvalds/linux.git
synced 2024-12-10 05:01:26 +00:00
ixgbe: 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: 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:
parent
64953720a2
commit
4d361c6fd8
@ -10632,9 +10632,9 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
struct ixgbe_adapter *adapter = NULL;
|
||||
struct ixgbe_hw *hw;
|
||||
const struct ixgbe_info *ii = ixgbe_info_tbl[ent->driver_data];
|
||||
int i, err, pci_using_dac, expected_gts;
|
||||
unsigned int indices = MAX_TX_QUEUES;
|
||||
u8 part_str[IXGBE_PBANUM_LENGTH];
|
||||
int i, err, expected_gts;
|
||||
bool disable_dev = false;
|
||||
#ifdef IXGBE_FCOE
|
||||
u16 device_caps;
|
||||
@ -10654,16 +10654,11 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
if (!dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64))) {
|
||||
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;
|
||||
}
|
||||
pci_using_dac = 0;
|
||||
err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
|
||||
if (err) {
|
||||
dev_err(&pdev->dev,
|
||||
"No usable DMA configuration, aborting\n");
|
||||
goto err_dma;
|
||||
}
|
||||
|
||||
err = pci_request_mem_regions(pdev, ixgbe_driver_name);
|
||||
@ -10861,8 +10856,7 @@ skip_sriov:
|
||||
netdev->hw_features |= NETIF_F_NTUPLE |
|
||||
NETIF_F_HW_TC;
|
||||
|
||||
if (pci_using_dac)
|
||||
netdev->features |= NETIF_F_HIGHDMA;
|
||||
netdev->features |= NETIF_F_HIGHDMA;
|
||||
|
||||
netdev->vlan_features |= netdev->features | NETIF_F_TSO_MANGLEID;
|
||||
netdev->hw_enc_features |= netdev->vlan_features;
|
||||
|
Loading…
Reference in New Issue
Block a user