[for-next 4/4] RDMA/ionic: use the v2 atomic send WQE layout

[Abhijit Gangurde]

From: Gregor Dick <gregor.dick@xxxxxxx>

Firmware with RDMA version 2 reads the atomic local operand from the v2
atomic body. The lkey follows compare_low, and the 8-byte local VA is at
offset 32. Version 1 keeps the SGE layout. Select the body with the same
RDMA version that already selects the atomic opcode.

Signed-off-by: Gregor Dick <gregor.dick@xxxxxxx>
Signed-off-by: Abhijit Gangurde <abhijit.gangurde@xxxxxxx>
---
 drivers/infiniband/hw/ionic/ionic_datapath.c | 12 +++++++++---
 drivers/infiniband/hw/ionic/ionic_fw.h       | 15 +++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/drivers/infiniband/hw/ionic/ionic_datapath.c b/drivers/infiniband/hw/ionic/ionic_datapath.c
index 5b6f10256b49..75f82c21cc03 100644
--- a/drivers/infiniband/hw/ionic/ionic_datapath.c
+++ b/drivers/infiniband/hw/ionic/ionic_datapath.c
@@ -1050,9 +1050,15 @@ static int ionic_prep_atomic(struct ionic_qp *qp,
 	wqe->atomic.remote_rkey = cpu_to_be32(wr->rkey);
 
 	wqe->base.num_sge_key = 1;
-	wqe->atomic.sge.va = cpu_to_be64(wr->wr.sg_list[0].addr);
-	wqe->atomic.sge.len = cpu_to_be32(8);
-	wqe->atomic.sge.lkey = cpu_to_be32(wr->wr.sg_list[0].lkey);
+
+	if (dev->lif_cfg.rdma_version >= 2) {
+		wqe->atomic_v2.local_va = cpu_to_be64(wr->wr.sg_list[0].addr);
+		wqe->atomic_v2.lkey = cpu_to_be32(wr->wr.sg_list[0].lkey);
+	} else {
+		wqe->atomic.sge.va = cpu_to_be64(wr->wr.sg_list[0].addr);
+		wqe->atomic.sge.len = cpu_to_be32(8);
+		wqe->atomic.sge.lkey = cpu_to_be32(wr->wr.sg_list[0].lkey);
+	}
 
 	meta->len = 8;
 	ionic_prep_base(qp, &wr->wr, meta, wqe);
diff --git a/drivers/infiniband/hw/ionic/ionic_fw.h b/drivers/infiniband/hw/ionic/ionic_fw.h
index 100138e4cae7..3f8b69e114a7 100644
--- a/drivers/infiniband/hw/ionic/ionic_fw.h
+++ b/drivers/infiniband/hw/ionic/ionic_fw.h
@@ -495,6 +495,20 @@ struct ionic_v1_atomic_bdy {
 	struct ionic_sge		sge;
 };
 
+/* v2 atomic wqe body */
+struct ionic_v2_atomic_bdy {
+	__be32				remote_va_high;
+	__be32				remote_va_low;
+	__be32				remote_rkey;
+	__be32				swap_add_high;
+	__be32				swap_add_low;
+	__be32				compare_high;
+	__be32				compare_low;
+	__be32				lkey;
+	__be64				local_va;
+	__u8				rsvd_expdb[8];
+};
+
 /* v1 reg mr wqe body */
 struct ionic_v1_reg_mr_bdy {
 	__be64				va;
@@ -524,6 +538,7 @@ struct ionic_v1_wqe {
 		struct ionic_v1_recv_bdy	recv;
 		struct ionic_v1_common_bdy	common;
 		struct ionic_v1_atomic_bdy	atomic;
+		struct ionic_v2_atomic_bdy	atomic_v2;
 		struct ionic_v1_reg_mr_bdy	reg_mr;
 		struct ionic_v1_bind_mw_bdy	bind_mw;
 	};
-- 
2.43.0