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

Commit fabd545c authored Oct 21, 2016 by Manish Chopra Committed by David S. Miller Oct 22, 2016

qede: Fix incorrrect usage of APIs for un-mapping DMA memory



Driver uses incorrect APIs to unmap DMA memory which were
mapped using dma_map_single(). This patch fixes it to use
appropriate APIs for un-mapping DMA memory.

Signed-off-by: Manish Chopra <manish.chopra@cavium.com>
Signed-off-by: Yuval Mintz <Yuval.Mintz@cavium.com>
Signed-off-by: Sudarsana Reddy Kalluru <Sudarsana.Kalluru@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 15c6de2c

drivers/net/ethernet/qlogic/qede/qede_ethtool.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1199,7 +1199,7 @@ static int qede_selftest_transmit_traffic(struct qede_dev *edev,
		}

		first_bd = (struct eth_tx_1st_bd *)qed_chain_consume(&txq->tx_pbl);
		dma_unmap_page(&edev->pdev->dev, BD_UNMAP_ADDR(first_bd),
		dma_unmap_single(&edev->pdev->dev, BD_UNMAP_ADDR(first_bd),
		BD_UNMAP_LEN(first_bd), DMA_TO_DEVICE);
		txq->sw_tx_cons++;
		txq->sw_tx_ring[idx].skb = NULL;

drivers/net/ethernet/qlogic/qede/qede_main.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -313,7 +313,7 @@ static int qede_free_tx_pkt(struct qede_dev *edev,
		split_bd_len = BD_UNMAP_LEN(split);
		bds_consumed++;
		}
		dma_unmap_page(&edev->pdev->dev, BD_UNMAP_ADDR(first_bd),
		dma_unmap_single(&edev->pdev->dev, BD_UNMAP_ADDR(first_bd),
		BD_UNMAP_LEN(first_bd) + split_bd_len, DMA_TO_DEVICE);

		/* Unmap the data of the skb frags */
		@@ -359,7 +359,7 @@ static void qede_free_failed_tx_pkt(struct qede_dev *edev,
		nbd--;
		}

		dma_unmap_page(&edev->pdev->dev, BD_UNMAP_ADDR(first_bd),
		dma_unmap_single(&edev->pdev->dev, BD_UNMAP_ADDR(first_bd),
		BD_UNMAP_LEN(first_bd) + split_bd_len, DMA_TO_DEVICE);

		/* Unmap the data of the skb frags */