diff mbox series

[net] net: mvpp2: allocate zeroed tx descriptors

Message ID 20171130094946.26647-1-antoine.tenart@free-electrons.com
State Accepted, archived
Delegated to: David Miller
Headers show
Series [net] net: mvpp2: allocate zeroed tx descriptors | expand

Commit Message

Antoine Tenart Nov. 30, 2017, 9:49 a.m. UTC 
From: Yan Markman <ymarkman@marvell.com>

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>
---
 drivers/net/ethernet/marvell/mvpp2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

David Miller Nov. 30, 2017, 2:14 p.m. UTC | #1 
From: Antoine Tenart <antoine.tenart@free-electrons.com>
Date: Thu, 30 Nov 2017 10:49:46 +0100

> From: Yan Markman <ymarkman@marvell.com>
> 
> 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>

Applied, thank you.
diff mbox series

Patch

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)