From: Ilya Lesokhin <ilyal@mellanox.com>

Date: Mon, 28 Aug 2017 09:47:32 +0300

Subject: net/mlx5: FPGA, Call DMA unmap with the right size

Patch-mainline: v4.18-rc1

Git-commit: 36dd4902004c39b7e8a16a7cf1535faa7ecfa921

References: bsc#1046303 FATE#322944

When mlx5_fpga_conn_unmap_buf is called buf->sg[0].size

should equal the actual buffer size, not the message size.

Otherwise we will trigger the following dma debug warning

"DMA-API: device driver frees DMA memory with different size"

Fixes: 537a50574175 ('net/mlx5: FPGA, Add high-speed connection routines')

Signed-off-by: Ilya Lesokhin <ilyal@mellanox.com>

Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>

---

 drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c |    3 +--

 1 file changed, 1 insertion(+), 2 deletions(-)

--- a/drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c

+++ b/drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c

@@ -255,8 +255,6 @@ static void mlx5_fpga_conn_rq_cqe(struct

 	ix = be16_to_cpu(cqe->wqe_counter) & (conn->qp.rq.size - 1);

 	buf = conn->qp.rq.bufs[ix];

 	conn->qp.rq.bufs[ix] = NULL;

-	if (!status)

-		buf->sg[0].size = be32_to_cpu(cqe->byte_cnt);

 	conn->qp.rq.cc++;

 	if (unlikely(status && (status != MLX5_CQE_SYNDROME_WR_FLUSH_ERR)))

@@ -274,6 +272,7 @@ static void mlx5_fpga_conn_rq_cqe(struct

 		return;

 	}

+	buf->sg[0].size = be32_to_cpu(cqe->byte_cnt);

 	mlx5_fpga_dbg(conn->fdev, "Message with %u bytes received successfully\n",

 		      buf->sg[0].size);

 	conn->recv_cb(conn->cb_arg, buf);