Commit 1e5fa9e2 authored by Ioana Radulescu's avatar Ioana Radulescu Committed by Greg Kroah-Hartman

staging: fsl-dpaa2/eth: Map Tx buffers as bidirectional

WRIOP hardware may need to write to the hardware annotation
area of Tx buffers (e.g. frame status bits) and also to
the data area (e.g. L4 checksum in frame header).

Map these buffers as DMA_BIDIRECTIONAL, otherwise the
write transaction through SMMU will not be allowed.
Signed-off-by: default avatarNipun Gupta <nipun.gupta@nxp.com>
Signed-off-by: default avatarIoana Radulescu <ruxandra.radulescu@nxp.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 08eb2397
...@@ -355,7 +355,7 @@ static int build_sg_fd(struct dpaa2_eth_priv *priv, ...@@ -355,7 +355,7 @@ static int build_sg_fd(struct dpaa2_eth_priv *priv,
sg_init_table(scl, nr_frags + 1); sg_init_table(scl, nr_frags + 1);
num_sg = skb_to_sgvec(skb, scl, 0, skb->len); num_sg = skb_to_sgvec(skb, scl, 0, skb->len);
num_dma_bufs = dma_map_sg(dev, scl, num_sg, DMA_TO_DEVICE); num_dma_bufs = dma_map_sg(dev, scl, num_sg, DMA_BIDIRECTIONAL);
if (unlikely(!num_dma_bufs)) { if (unlikely(!num_dma_bufs)) {
err = -ENOMEM; err = -ENOMEM;
goto dma_map_sg_failed; goto dma_map_sg_failed;
...@@ -406,7 +406,7 @@ static int build_sg_fd(struct dpaa2_eth_priv *priv, ...@@ -406,7 +406,7 @@ static int build_sg_fd(struct dpaa2_eth_priv *priv,
swa->num_dma_bufs = num_dma_bufs; swa->num_dma_bufs = num_dma_bufs;
/* Separately map the SGT buffer */ /* Separately map the SGT buffer */
addr = dma_map_single(dev, sgt_buf, sgt_buf_size, DMA_TO_DEVICE); addr = dma_map_single(dev, sgt_buf, sgt_buf_size, DMA_BIDIRECTIONAL);
if (unlikely(dma_mapping_error(dev, addr))) { if (unlikely(dma_mapping_error(dev, addr))) {
err = -ENOMEM; err = -ENOMEM;
goto dma_map_single_failed; goto dma_map_single_failed;
...@@ -423,7 +423,7 @@ static int build_sg_fd(struct dpaa2_eth_priv *priv, ...@@ -423,7 +423,7 @@ static int build_sg_fd(struct dpaa2_eth_priv *priv,
dma_map_single_failed: dma_map_single_failed:
kfree(sgt_buf); kfree(sgt_buf);
sgt_buf_alloc_failed: sgt_buf_alloc_failed:
dma_unmap_sg(dev, scl, num_sg, DMA_TO_DEVICE); dma_unmap_sg(dev, scl, num_sg, DMA_BIDIRECTIONAL);
dma_map_sg_failed: dma_map_sg_failed:
kfree(scl); kfree(scl);
return err; return err;
...@@ -461,7 +461,7 @@ static int build_single_fd(struct dpaa2_eth_priv *priv, ...@@ -461,7 +461,7 @@ static int build_single_fd(struct dpaa2_eth_priv *priv,
addr = dma_map_single(dev, buffer_start, addr = dma_map_single(dev, buffer_start,
skb_tail_pointer(skb) - buffer_start, skb_tail_pointer(skb) - buffer_start,
DMA_TO_DEVICE); DMA_BIDIRECTIONAL);
if (unlikely(dma_mapping_error(dev, addr))) if (unlikely(dma_mapping_error(dev, addr)))
return -ENOMEM; return -ENOMEM;
...@@ -510,7 +510,7 @@ static void free_tx_fd(const struct dpaa2_eth_priv *priv, ...@@ -510,7 +510,7 @@ static void free_tx_fd(const struct dpaa2_eth_priv *priv,
*/ */
dma_unmap_single(dev, fd_addr, dma_unmap_single(dev, fd_addr,
skb_tail_pointer(skb) - buffer_start, skb_tail_pointer(skb) - buffer_start,
DMA_TO_DEVICE); DMA_BIDIRECTIONAL);
} else if (fd_format == dpaa2_fd_sg) { } else if (fd_format == dpaa2_fd_sg) {
swa = (struct dpaa2_eth_swa *)skbh; swa = (struct dpaa2_eth_swa *)skbh;
skb = swa->skb; skb = swa->skb;
...@@ -519,13 +519,13 @@ static void free_tx_fd(const struct dpaa2_eth_priv *priv, ...@@ -519,13 +519,13 @@ static void free_tx_fd(const struct dpaa2_eth_priv *priv,
num_dma_bufs = swa->num_dma_bufs; num_dma_bufs = swa->num_dma_bufs;
/* Unmap the scatterlist */ /* Unmap the scatterlist */
dma_unmap_sg(dev, scl, num_sg, DMA_TO_DEVICE); dma_unmap_sg(dev, scl, num_sg, DMA_BIDIRECTIONAL);
kfree(scl); kfree(scl);
/* Unmap the SGT buffer */ /* Unmap the SGT buffer */
unmap_size = priv->tx_data_offset + unmap_size = priv->tx_data_offset +
sizeof(struct dpaa2_sg_entry) * (1 + num_dma_bufs); sizeof(struct dpaa2_sg_entry) * (1 + num_dma_bufs);
dma_unmap_single(dev, fd_addr, unmap_size, DMA_TO_DEVICE); dma_unmap_single(dev, fd_addr, unmap_size, DMA_BIDIRECTIONAL);
} else { } else {
/* Unsupported format, mark it as errored and give up */ /* Unsupported format, mark it as errored and give up */
if (status) if (status)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment