Commit 7120075e authored by Christophe JAILLET's avatar Christophe JAILLET Committed by David S. Miller
Browse files

ethernet: s2io: Use dma_set_mask_and_coherent() and simplify code 

Use dma_set_mask_and_coherent() instead of unrolling it with some
dma_set_mask()+dma_set_coherent_mask().

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

That said, 'dma_flag' can only be 'true' after a successful
dma_set_mask_and_coherent().

Simplify code and remove some dead code accordingly, including the now
useless 'high_dma_flag' field in 'struct s2io_nic'.

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



Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6bf950a8

drivers/net/ethernet/neterion/s2io.c

+3 −15
Original line number Diff line number Diff line
@@ -7658,7 +7658,6 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre) 
	struct s2io_nic *sp;

	struct net_device *dev;

	int i, j, ret;

	int dma_flag = false;

	u32 mac_up, mac_down;

	u64 val64 = 0, tmp64 = 0;

	struct XENA_dev_config __iomem *bar0 = NULL;
@@ -7680,17 +7679,8 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre) 
		return ret;

	}



	if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) {

	if (!dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64))) {

		DBG_PRINT(INIT_DBG, "%s: Using 64bit DMA\n", __func__);

		dma_flag = true;

		if (dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {

			DBG_PRINT(ERR_DBG,

				  "Unable to obtain 64bit DMA for coherent allocations\n");

			pci_disable_device(pdev);

			return -ENOMEM;

		}

	} else if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(32))) {

		DBG_PRINT(INIT_DBG, "%s: Using 32bit DMA\n", __func__);

	} else {

		pci_disable_device(pdev);

		return -ENOMEM;
@@ -7720,7 +7710,6 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre) 
	sp = netdev_priv(dev);

	sp->dev = dev;

	sp->pdev = pdev;

	sp->high_dma_flag = dma_flag;

	sp->device_enabled_once = false;

	if (rx_ring_mode == 1)

		sp->rxd_mode = RXD_MODE_1;
@@ -7868,9 +7857,8 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre) 
		NETIF_F_TSO | NETIF_F_TSO6 |

		NETIF_F_RXCSUM | NETIF_F_LRO;

	dev->features |= dev->hw_features |

		NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX;

	if (sp->high_dma_flag == true)

		dev->features |= NETIF_F_HIGHDMA;

		NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX |

		NETIF_F_HIGHDMA;

	dev->watchdog_timeo = WATCH_DOG_TIMEOUT;

	INIT_WORK(&sp->rst_timer_task, s2io_restart_nic);

	INIT_WORK(&sp->set_link_task, s2io_set_link);

drivers/net/ethernet/neterion/s2io.h

+0 −1
Original line number Diff line number Diff line
@@ -873,7 +873,6 @@ struct s2io_nic { 
	struct mac_addr def_mac_addr[256];



	struct net_device_stats stats;

	int high_dma_flag;

	int device_enabled_once;



	char name[60];