Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b0dfc17 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'hisilicon-fixes' 



Jiangfeng Xiao says:

====================
net: hisilicon: Fix a few problems with hip04_eth

During the use of the hip04_eth driver,
several problems were found,
which solved the hip04_tx_reclaim reentry problem,
fixed the problem that hip04_mac_start_xmit never
returns NETDEV_TX_BUSY
and the dma_map_single failed on the arm64 platform.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5b0bce24 96a50c0d

drivers/net/ethernet/hisilicon/hip04_eth.c

+16 −12
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ struct hip04_priv { 
	unsigned int reg_inten;



	struct napi_struct napi;

	struct device *dev;

	struct net_device *ndev;



	struct tx_desc *tx_desc;
@@ -248,7 +249,7 @@ struct hip04_priv { 


static inline unsigned int tx_count(unsigned int head, unsigned int tail)

{

	return (head - tail) % (TX_DESC_NUM - 1);

	return (head - tail) % TX_DESC_NUM;

}



static void hip04_config_port(struct net_device *ndev, u32 speed, u32 duplex)
@@ -465,7 +466,7 @@ static int hip04_tx_reclaim(struct net_device *ndev, bool force) 
		}



		if (priv->tx_phys[tx_tail]) {

			dma_unmap_single(&ndev->dev, priv->tx_phys[tx_tail],

			dma_unmap_single(priv->dev, priv->tx_phys[tx_tail],

					 priv->tx_skb[tx_tail]->len,

					 DMA_TO_DEVICE);

			priv->tx_phys[tx_tail] = 0;
@@ -516,8 +517,8 @@ hip04_mac_start_xmit(struct sk_buff *skb, struct net_device *ndev) 
		return NETDEV_TX_BUSY;

	}



	phys = dma_map_single(&ndev->dev, skb->data, skb->len, DMA_TO_DEVICE);

	if (dma_mapping_error(&ndev->dev, phys)) {

	phys = dma_map_single(priv->dev, skb->data, skb->len, DMA_TO_DEVICE);

	if (dma_mapping_error(priv->dev, phys)) {

		dev_kfree_skb(skb);

		return NETDEV_TX_OK;

	}
@@ -585,6 +586,9 @@ static int hip04_rx_poll(struct napi_struct *napi, int budget) 
	u16 len;

	u32 err;



	/* clean up tx descriptors */

	tx_remaining = hip04_tx_reclaim(ndev, false);



	while (cnt && !last) {

		buf = priv->rx_buf[priv->rx_head];

		skb = build_skb(buf, priv->rx_buf_size);
@@ -593,7 +597,7 @@ static int hip04_rx_poll(struct napi_struct *napi, int budget) 
			goto refill;

		}



		dma_unmap_single(&ndev->dev, priv->rx_phys[priv->rx_head],

		dma_unmap_single(priv->dev, priv->rx_phys[priv->rx_head],

				 RX_BUF_SIZE, DMA_FROM_DEVICE);

		priv->rx_phys[priv->rx_head] = 0;
@@ -622,9 +626,9 @@ static int hip04_rx_poll(struct napi_struct *napi, int budget) 
		buf = netdev_alloc_frag(priv->rx_buf_size);

		if (!buf)

			goto done;

		phys = dma_map_single(&ndev->dev, buf,

		phys = dma_map_single(priv->dev, buf,

				      RX_BUF_SIZE, DMA_FROM_DEVICE);

		if (dma_mapping_error(&ndev->dev, phys))

		if (dma_mapping_error(priv->dev, phys))

			goto done;

		priv->rx_buf[priv->rx_head] = buf;

		priv->rx_phys[priv->rx_head] = phys;
@@ -645,8 +649,7 @@ static int hip04_rx_poll(struct napi_struct *napi, int budget) 
	}

	napi_complete_done(napi, rx);

done:

	/* clean up tx descriptors and start a new timer if necessary */

	tx_remaining = hip04_tx_reclaim(ndev, false);

	/* start a new timer if necessary */

	if (rx < budget && tx_remaining)

		hip04_start_tx_timer(priv);
@@ -728,9 +731,9 @@ static int hip04_mac_open(struct net_device *ndev) 
	for (i = 0; i < RX_DESC_NUM; i++) {

		dma_addr_t phys;



		phys = dma_map_single(&ndev->dev, priv->rx_buf[i],

		phys = dma_map_single(priv->dev, priv->rx_buf[i],

				      RX_BUF_SIZE, DMA_FROM_DEVICE);

		if (dma_mapping_error(&ndev->dev, phys))

		if (dma_mapping_error(priv->dev, phys))

			return -EIO;



		priv->rx_phys[i] = phys;
@@ -764,7 +767,7 @@ static int hip04_mac_stop(struct net_device *ndev) 


	for (i = 0; i < RX_DESC_NUM; i++) {

		if (priv->rx_phys[i]) {

			dma_unmap_single(&ndev->dev, priv->rx_phys[i],

			dma_unmap_single(priv->dev, priv->rx_phys[i],

					 RX_BUF_SIZE, DMA_FROM_DEVICE);

			priv->rx_phys[i] = 0;

		}
@@ -907,6 +910,7 @@ static int hip04_mac_probe(struct platform_device *pdev) 
		return -ENOMEM;



	priv = netdev_priv(ndev);

	priv->dev = d;

	priv->ndev = ndev;

	platform_set_drvdata(pdev, ndev);

	SET_NETDEV_DEV(ndev, &pdev->dev);