diff options
| author | Yan Markman | 2017-11-30 10:49:46 +0100 |
|---|---|---|
| committer | David S. Miller | 2017-11-30 15:12:46 +0100 |
| commit | a154f8e399a063137fc42b961f437248d55ece29 (patch) | |
| tree | 45f0606df6b9718f9badda498e91e2788319f3e2 /drivers/net/ethernet/marvell | |
| parent | Merge tag 'nfsd-4.15-1' of git://linux-nfs.org/~bfields/linux (diff) | |
| download | kernel-qcow2-linux-a154f8e399a063137fc42b961f437248d55ece29.tar.gz kernel-qcow2-linux-a154f8e399a063137fc42b961f437248d55ece29.tar.xz kernel-qcow2-linux-a154f8e399a063137fc42b961f437248d55ece29.zip | |
net: mvpp2: allocate zeroed tx descriptors
Reserved and unused fields in the Tx descriptors should be 0. The PPv2
driver doesn't clear them at run-time (for performance reasons) but
these descriptors aren't zeroed when allocated, which can lead to
unpredictable behaviors. This patch fixes this by using
dma_zalloc_coherent instead of dma_alloc_coherent.
Fixes: 3f518509dedc ("ethernet: Add new driver for Marvell Armada 375 network unit")
Signed-off-by: Yan Markman <ymarkman@marvell.com>
[Antoine: commit message]
Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/marvell')
| -rw-r--r-- | drivers/net/ethernet/marvell/mvpp2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c index d83a78be98a2..fed2b2f909fc 100644 --- a/drivers/net/ethernet/marvell/mvpp2.c +++ b/drivers/net/ethernet/marvell/mvpp2.c @@ -5598,7 +5598,7 @@ static int mvpp2_aggr_txq_init(struct platform_device *pdev, u32 txq_dma; /* Allocate memory for TX descriptors */ - aggr_txq->descs = dma_alloc_coherent(&pdev->dev, + aggr_txq->descs = dma_zalloc_coherent(&pdev->dev, MVPP2_AGGR_TXQ_SIZE * MVPP2_DESC_ALIGNED_SIZE, &aggr_txq->descs_dma, GFP_KERNEL); if (!aggr_txq->descs) |