qed: Split rdma content between qed_rdma and qed_roce

This patch places common iWARP / RoCE code in qed_rdma
and roce specific code in qed_roce

There is one new function ( qed_roce_setup ) added, the rest
of the patch removes content from the files and removes some
static definitions.

Signed-off-by: Michal Kalderon <Michal.Kalderon@cavium.com>
Signed-off-by: Yuval Mintz <Yuval.Mintz@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/ethernet/qlogic/qed/qed_rdma.c b/drivers/net/ethernet/qlogic/qed/qed_rdma.c
index 9dc41a8..cb620e0 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_rdma.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_rdma.c
@@ -53,39 +53,14 @@
 #include "qed_ll2.h"
 #include "qed_mcp.h"
 #include "qed_reg_addr.h"
-#include "qed_roce.h"
 #include <linux/qed/qed_roce_if.h>
+#include "qed_rdma.h"
+#include "qed_roce.h"
 #include "qed_sp.h"
 
-static void qed_roce_free_real_icid(struct qed_hwfn *p_hwfn, u16 icid);
 
-static int
-qed_roce_async_event(struct qed_hwfn *p_hwfn,
-		     u8 fw_event_code,
-		     u16 echo, union event_ring_data *data, u8 fw_return_code)
-{
-	if (fw_event_code == ROCE_ASYNC_EVENT_DESTROY_QP_DONE) {
-		u16 icid =
-		    (u16)le32_to_cpu(data->rdma_data.rdma_destroy_qp_data.cid);
-
-		/* icid release in this async event can occur only if the icid
-		 * was offloaded to the FW. In case it wasn't offloaded this is
-		 * handled in qed_roce_sp_destroy_qp.
-		 */
-		qed_roce_free_real_icid(p_hwfn, icid);
-	} else {
-		struct qed_rdma_events *events = &p_hwfn->p_rdma_info->events;
-
-		events->affiliated_event(p_hwfn->p_rdma_info->events.context,
-					 fw_event_code,
-				     (void *)&data->rdma_data.async_handle);
-	}
-
-	return 0;
-}
-
-static int qed_rdma_bmap_alloc(struct qed_hwfn *p_hwfn,
-			       struct qed_bmap *bmap, u32 max_count, char *name)
+int qed_rdma_bmap_alloc(struct qed_hwfn *p_hwfn,
+			struct qed_bmap *bmap, u32 max_count, char *name)
 {
 	DP_VERBOSE(p_hwfn, QED_MSG_RDMA, "max_count = %08x\n", max_count);
 
@@ -102,8 +77,8 @@ static int qed_rdma_bmap_alloc(struct qed_hwfn *p_hwfn,
 	return 0;
 }
 
-static int qed_rdma_bmap_alloc_id(struct qed_hwfn *p_hwfn,
-				  struct qed_bmap *bmap, u32 *id_num)
+int qed_rdma_bmap_alloc_id(struct qed_hwfn *p_hwfn,
+			   struct qed_bmap *bmap, u32 *id_num)
 {
 	*id_num = find_first_zero_bit(bmap->bitmap, bmap->max_count);
 	if (*id_num >= bmap->max_count)
@@ -117,8 +92,8 @@ static int qed_rdma_bmap_alloc_id(struct qed_hwfn *p_hwfn,
 	return 0;
 }
 
-static void qed_bmap_set_id(struct qed_hwfn *p_hwfn,
-			    struct qed_bmap *bmap, u32 id_num)
+void qed_bmap_set_id(struct qed_hwfn *p_hwfn,
+		     struct qed_bmap *bmap, u32 id_num)
 {
 	if (id_num >= bmap->max_count)
 		return;
@@ -126,8 +101,8 @@ static void qed_bmap_set_id(struct qed_hwfn *p_hwfn,
 	__set_bit(id_num, bmap->bitmap);
 }
 
-static void qed_bmap_release_id(struct qed_hwfn *p_hwfn,
-				struct qed_bmap *bmap, u32 id_num)
+void qed_bmap_release_id(struct qed_hwfn *p_hwfn,
+			 struct qed_bmap *bmap, u32 id_num)
 {
 	bool b_acquired;
 
@@ -145,8 +120,8 @@ static void qed_bmap_release_id(struct qed_hwfn *p_hwfn,
 		   bmap->name, id_num);
 }
 
-static int qed_bmap_test_id(struct qed_hwfn *p_hwfn,
-			    struct qed_bmap *bmap, u32 id_num)
+int qed_bmap_test_id(struct qed_hwfn *p_hwfn,
+		     struct qed_bmap *bmap, u32 id_num)
 {
 	if (id_num >= bmap->max_count)
 		return -1;
@@ -159,7 +134,7 @@ static bool qed_bmap_is_empty(struct qed_bmap *bmap)
 	return bmap->max_count == find_first_bit(bmap->bitmap, bmap->max_count);
 }
 
-static u32 qed_rdma_get_sb_id(void *p_hwfn, u32 rel_sb_id)
+u32 qed_rdma_get_sb_id(void *p_hwfn, u32 rel_sb_id)
 {
 	/* First sb id for RoCE is after all the l2 sb */
 	return FEAT_NUM((struct qed_hwfn *)p_hwfn, QED_PF_L2_QUE) + rel_sb_id;
@@ -302,8 +277,8 @@ static int qed_rdma_alloc(struct qed_hwfn *p_hwfn,
 	return rc;
 }
 
-static void qed_rdma_bmap_free(struct qed_hwfn *p_hwfn,
-			       struct qed_bmap *bmap, bool check)
+void qed_rdma_bmap_free(struct qed_hwfn *p_hwfn,
+			struct qed_bmap *bmap, bool check)
 {
 	int weight = bitmap_weight(bmap->bitmap, bmap->max_count);
 	int last_line = bmap->max_count / (64 * 8);
@@ -666,33 +641,12 @@ static int qed_rdma_setup(struct qed_hwfn *p_hwfn,
 	if (rc)
 		return rc;
 
-	qed_spq_register_async_cb(p_hwfn, PROTOCOLID_ROCE,
-				  qed_roce_async_event);
+	qed_roce_setup(p_hwfn);
 
 	return qed_rdma_start_fw(p_hwfn, params, p_ptt);
 }
 
-void qed_roce_stop(struct qed_hwfn *p_hwfn)
-{
-	struct qed_bmap *rcid_map = &p_hwfn->p_rdma_info->real_cid_map;
-	int wait_count = 0;
-
-	/* when destroying a_RoCE QP the control is returned to the user after
-	 * the synchronous part. The asynchronous part may take a little longer.
-	 * We delay for a short while if an async destroy QP is still expected.
-	 * Beyond the added delay we clear the bitmap anyway.
-	 */
-	while (bitmap_weight(rcid_map->bitmap, rcid_map->max_count)) {
-		msleep(100);
-		if (wait_count++ > 20) {
-			DP_NOTICE(p_hwfn, "cid bitmap wait timed out\n");
-			break;
-		}
-	}
-	qed_spq_unregister_async_cb(p_hwfn, PROTOCOLID_ROCE);
-}
-
-static int qed_rdma_stop(void *rdma_cxt)
+int qed_rdma_stop(void *rdma_cxt)
 {
 	struct qed_hwfn *p_hwfn = (struct qed_hwfn *)rdma_cxt;
 	struct rdma_close_func_ramrod_data *p_ramrod;
@@ -1146,904 +1100,13 @@ err:	dma_free_coherent(&p_hwfn->cdev->pdev->dev,
 	return rc;
 }
 
-static void qed_rdma_set_fw_mac(u16 *p_fw_mac, u8 *p_qed_mac)
+void qed_rdma_set_fw_mac(u16 *p_fw_mac, u8 *p_qed_mac)
 {
 	p_fw_mac[0] = cpu_to_le16((p_qed_mac[0] << 8) + p_qed_mac[1]);
 	p_fw_mac[1] = cpu_to_le16((p_qed_mac[2] << 8) + p_qed_mac[3]);
 	p_fw_mac[2] = cpu_to_le16((p_qed_mac[4] << 8) + p_qed_mac[5]);
 }
 
-static void qed_rdma_copy_gids(struct qed_rdma_qp *qp, __le32 *src_gid,
-			       __le32 *dst_gid)
-{
-	u32 i;
-
-	if (qp->roce_mode == ROCE_V2_IPV4) {
-		/* The IPv4 addresses shall be aligned to the highest word.
-		 * The lower words must be zero.
-		 */
-		memset(src_gid, 0, sizeof(union qed_gid));
-		memset(dst_gid, 0, sizeof(union qed_gid));
-		src_gid[3] = cpu_to_le32(qp->sgid.ipv4_addr);
-		dst_gid[3] = cpu_to_le32(qp->dgid.ipv4_addr);
-	} else {
-		/* GIDs and IPv6 addresses coincide in location and size */
-		for (i = 0; i < ARRAY_SIZE(qp->sgid.dwords); i++) {
-			src_gid[i] = cpu_to_le32(qp->sgid.dwords[i]);
-			dst_gid[i] = cpu_to_le32(qp->dgid.dwords[i]);
-		}
-	}
-}
-
-static enum roce_flavor qed_roce_mode_to_flavor(enum roce_mode roce_mode)
-{
-	enum roce_flavor flavor;
-
-	switch (roce_mode) {
-	case ROCE_V1:
-		flavor = PLAIN_ROCE;
-		break;
-	case ROCE_V2_IPV4:
-		flavor = RROCE_IPV4;
-		break;
-	case ROCE_V2_IPV6:
-		flavor = ROCE_V2_IPV6;
-		break;
-	default:
-		flavor = MAX_ROCE_MODE;
-		break;
-	}
-	return flavor;
-}
-
-void qed_roce_free_cid_pair(struct qed_hwfn *p_hwfn, u16 cid)
-{
-	spin_lock_bh(&p_hwfn->p_rdma_info->lock);
-	qed_bmap_release_id(p_hwfn, &p_hwfn->p_rdma_info->cid_map, cid);
-	qed_bmap_release_id(p_hwfn, &p_hwfn->p_rdma_info->cid_map, cid + 1);
-	spin_unlock_bh(&p_hwfn->p_rdma_info->lock);
-}
-
-static int qed_roce_alloc_cid(struct qed_hwfn *p_hwfn, u16 *cid)
-{
-	struct qed_rdma_info *p_rdma_info = p_hwfn->p_rdma_info;
-	u32 responder_icid;
-	u32 requester_icid;
-	int rc;
-
-	spin_lock_bh(&p_hwfn->p_rdma_info->lock);
-	rc = qed_rdma_bmap_alloc_id(p_hwfn, &p_rdma_info->cid_map,
-				    &responder_icid);
-	if (rc) {
-		spin_unlock_bh(&p_rdma_info->lock);
-		return rc;
-	}
-
-	rc = qed_rdma_bmap_alloc_id(p_hwfn, &p_rdma_info->cid_map,
-				    &requester_icid);
-
-	spin_unlock_bh(&p_rdma_info->lock);
-	if (rc)
-		goto err;
-
-	/* the two icid's should be adjacent */
-	if ((requester_icid - responder_icid) != 1) {
-		DP_NOTICE(p_hwfn, "Failed to allocate two adjacent qp's'\n");
-		rc = -EINVAL;
-		goto err;
-	}
-
-	responder_icid += qed_cxt_get_proto_cid_start(p_hwfn,
-						      p_rdma_info->proto);
-	requester_icid += qed_cxt_get_proto_cid_start(p_hwfn,
-						      p_rdma_info->proto);
-
-	/* If these icids require a new ILT line allocate DMA-able context for
-	 * an ILT page
-	 */
-	rc = qed_cxt_dynamic_ilt_alloc(p_hwfn, QED_ELEM_CXT, responder_icid);
-	if (rc)
-		goto err;
-
-	rc = qed_cxt_dynamic_ilt_alloc(p_hwfn, QED_ELEM_CXT, requester_icid);
-	if (rc)
-		goto err;
-
-	*cid = (u16)responder_icid;
-	return rc;
-
-err:
-	spin_lock_bh(&p_rdma_info->lock);
-	qed_bmap_release_id(p_hwfn, &p_rdma_info->cid_map, responder_icid);
-	qed_bmap_release_id(p_hwfn, &p_rdma_info->cid_map, requester_icid);
-
-	spin_unlock_bh(&p_rdma_info->lock);
-	DP_VERBOSE(p_hwfn, QED_MSG_RDMA,
-		   "Allocate CID - failed, rc = %d\n", rc);
-	return rc;
-}
-
-static void qed_roce_set_real_cid(struct qed_hwfn *p_hwfn, u32 cid)
-{
-	spin_lock_bh(&p_hwfn->p_rdma_info->lock);
-	qed_bmap_set_id(p_hwfn, &p_hwfn->p_rdma_info->real_cid_map, cid);
-	spin_unlock_bh(&p_hwfn->p_rdma_info->lock);
-}
-
-static int qed_roce_sp_create_responder(struct qed_hwfn *p_hwfn,
-					struct qed_rdma_qp *qp)
-{
-	struct roce_create_qp_resp_ramrod_data *p_ramrod;
-	struct qed_sp_init_data init_data;
-	enum roce_flavor roce_flavor;
-	struct qed_spq_entry *p_ent;
-	u16 regular_latency_queue;
-	enum protocol_type proto;
-	int rc;
-
-	DP_VERBOSE(p_hwfn, QED_MSG_RDMA, "icid = %08x\n", qp->icid);
-
-	/* Allocate DMA-able memory for IRQ */
-	qp->irq_num_pages = 1;
-	qp->irq = dma_alloc_coherent(&p_hwfn->cdev->pdev->dev,
-				     RDMA_RING_PAGE_SIZE,
-				     &qp->irq_phys_addr, GFP_KERNEL);
-	if (!qp->irq) {
-		rc = -ENOMEM;
-		DP_NOTICE(p_hwfn,
-			  "qed create responder failed: cannot allocate memory (irq). rc = %d\n",
-			  rc);
-		return rc;
-	}
-
-	/* Get SPQ entry */
-	memset(&init_data, 0, sizeof(init_data));
-	init_data.cid = qp->icid;
-	init_data.opaque_fid = p_hwfn->hw_info.opaque_fid;
-	init_data.comp_mode = QED_SPQ_MODE_EBLOCK;
-
-	rc = qed_sp_init_request(p_hwfn, &p_ent, ROCE_RAMROD_CREATE_QP,
-				 PROTOCOLID_ROCE, &init_data);
-	if (rc)
-		goto err;
-
-	p_ramrod = &p_ent->ramrod.roce_create_qp_resp;
-
-	p_ramrod->flags = 0;
-
-	roce_flavor = qed_roce_mode_to_flavor(qp->roce_mode);
-	SET_FIELD(p_ramrod->flags,
-		  ROCE_CREATE_QP_RESP_RAMROD_DATA_ROCE_FLAVOR, roce_flavor);
-
-	SET_FIELD(p_ramrod->flags,
-		  ROCE_CREATE_QP_RESP_RAMROD_DATA_RDMA_RD_EN,
-		  qp->incoming_rdma_read_en);
-
-	SET_FIELD(p_ramrod->flags,
-		  ROCE_CREATE_QP_RESP_RAMROD_DATA_RDMA_WR_EN,
-		  qp->incoming_rdma_write_en);
-
-	SET_FIELD(p_ramrod->flags,
-		  ROCE_CREATE_QP_RESP_RAMROD_DATA_ATOMIC_EN,
-		  qp->incoming_atomic_en);
-
-	SET_FIELD(p_ramrod->flags,
-		  ROCE_CREATE_QP_RESP_RAMROD_DATA_E2E_FLOW_CONTROL_EN,
-		  qp->e2e_flow_control_en);
-
-	SET_FIELD(p_ramrod->flags,
-		  ROCE_CREATE_QP_RESP_RAMROD_DATA_SRQ_FLG, qp->use_srq);
-
-	SET_FIELD(p_ramrod->flags,
-		  ROCE_CREATE_QP_RESP_RAMROD_DATA_RESERVED_KEY_EN,
-		  qp->fmr_and_reserved_lkey);
-
-	SET_FIELD(p_ramrod->flags,
-		  ROCE_CREATE_QP_RESP_RAMROD_DATA_MIN_RNR_NAK_TIMER,
-		  qp->min_rnr_nak_timer);
-
-	p_ramrod->max_ird = qp->max_rd_atomic_resp;
-	p_ramrod->traffic_class = qp->traffic_class_tos;
-	p_ramrod->hop_limit = qp->hop_limit_ttl;
-	p_ramrod->irq_num_pages = qp->irq_num_pages;
-	p_ramrod->p_key = cpu_to_le16(qp->pkey);
-	p_ramrod->flow_label = cpu_to_le32(qp->flow_label);
-	p_ramrod->dst_qp_id = cpu_to_le32(qp->dest_qp);
-	p_ramrod->mtu = cpu_to_le16(qp->mtu);
-	p_ramrod->initial_psn = cpu_to_le32(qp->rq_psn);
-	p_ramrod->pd = cpu_to_le16(qp->pd);
-	p_ramrod->rq_num_pages = cpu_to_le16(qp->rq_num_pages);
-	DMA_REGPAIR_LE(p_ramrod->rq_pbl_addr, qp->rq_pbl_ptr);
-	DMA_REGPAIR_LE(p_ramrod->irq_pbl_addr, qp->irq_phys_addr);
-	qed_rdma_copy_gids(qp, p_ramrod->src_gid, p_ramrod->dst_gid);
-	p_ramrod->qp_handle_for_async.hi = cpu_to_le32(qp->qp_handle_async.hi);
-	p_ramrod->qp_handle_for_async.lo = cpu_to_le32(qp->qp_handle_async.lo);
-	p_ramrod->qp_handle_for_cqe.hi = cpu_to_le32(qp->qp_handle.hi);
-	p_ramrod->qp_handle_for_cqe.lo = cpu_to_le32(qp->qp_handle.lo);
-	p_ramrod->cq_cid = cpu_to_le32((p_hwfn->hw_info.opaque_fid << 16) |
-				       qp->rq_cq_id);
-
-	regular_latency_queue = qed_get_cm_pq_idx(p_hwfn, PQ_FLAGS_OFLD);
-
-	p_ramrod->regular_latency_phy_queue =
-	    cpu_to_le16(regular_latency_queue);
-	p_ramrod->low_latency_phy_queue =
-	    cpu_to_le16(regular_latency_queue);
-
-	p_ramrod->dpi = cpu_to_le16(qp->dpi);
-
-	qed_rdma_set_fw_mac(p_ramrod->remote_mac_addr, qp->remote_mac_addr);
-	qed_rdma_set_fw_mac(p_ramrod->local_mac_addr, qp->local_mac_addr);
-
-	p_ramrod->udp_src_port = qp->udp_src_port;
-	p_ramrod->vlan_id = cpu_to_le16(qp->vlan_id);
-	p_ramrod->srq_id.srq_idx = cpu_to_le16(qp->srq_id);
-	p_ramrod->srq_id.opaque_fid = cpu_to_le16(p_hwfn->hw_info.opaque_fid);
-
-	p_ramrod->stats_counter_id = RESC_START(p_hwfn, QED_RDMA_STATS_QUEUE) +
-				     qp->stats_queue;
-
-	rc = qed_spq_post(p_hwfn, p_ent, NULL);
-
-	DP_VERBOSE(p_hwfn, QED_MSG_RDMA,
-		   "rc = %d regular physical queue = 0x%x\n", rc,
-		   regular_latency_queue);
-
-	if (rc)
-		goto err;
-
-	qp->resp_offloaded = true;
-	qp->cq_prod = 0;
-
-	proto = p_hwfn->p_rdma_info->proto;
-	qed_roce_set_real_cid(p_hwfn, qp->icid -
-			      qed_cxt_get_proto_cid_start(p_hwfn, proto));
-
-	return rc;
-
-err:
-	DP_NOTICE(p_hwfn, "create responder - failed, rc = %d\n", rc);
-	dma_free_coherent(&p_hwfn->cdev->pdev->dev,
-			  qp->irq_num_pages * RDMA_RING_PAGE_SIZE,
-			  qp->irq, qp->irq_phys_addr);
-
-	return rc;
-}
-
-static int qed_roce_sp_create_requester(struct qed_hwfn *p_hwfn,
-					struct qed_rdma_qp *qp)
-{
-	struct roce_create_qp_req_ramrod_data *p_ramrod;
-	struct qed_sp_init_data init_data;
-	enum roce_flavor roce_flavor;
-	struct qed_spq_entry *p_ent;
-	u16 regular_latency_queue;
-	enum protocol_type proto;
-	int rc;
-
-	DP_VERBOSE(p_hwfn, QED_MSG_RDMA, "icid = %08x\n", qp->icid);
-
-	/* Allocate DMA-able memory for ORQ */
-	qp->orq_num_pages = 1;
-	qp->orq = dma_alloc_coherent(&p_hwfn->cdev->pdev->dev,
-				     RDMA_RING_PAGE_SIZE,
-				     &qp->orq_phys_addr, GFP_KERNEL);
-	if (!qp->orq) {
-		rc = -ENOMEM;
-		DP_NOTICE(p_hwfn,
-			  "qed create requester failed: cannot allocate memory (orq). rc = %d\n",
-			  rc);
-		return rc;
-	}
-
-	/* Get SPQ entry */
-	memset(&init_data, 0, sizeof(init_data));
-	init_data.cid = qp->icid + 1;
-	init_data.opaque_fid = p_hwfn->hw_info.opaque_fid;
-	init_data.comp_mode = QED_SPQ_MODE_EBLOCK;
-
-	rc = qed_sp_init_request(p_hwfn, &p_ent,
-				 ROCE_RAMROD_CREATE_QP,
-				 PROTOCOLID_ROCE, &init_data);
-	if (rc)
-		goto err;
-
-	p_ramrod = &p_ent->ramrod.roce_create_qp_req;
-
-	p_ramrod->flags = 0;
-
-	roce_flavor = qed_roce_mode_to_flavor(qp->roce_mode);
-	SET_FIELD(p_ramrod->flags,
-		  ROCE_CREATE_QP_REQ_RAMROD_DATA_ROCE_FLAVOR, roce_flavor);
-
-	SET_FIELD(p_ramrod->flags,
-		  ROCE_CREATE_QP_REQ_RAMROD_DATA_FMR_AND_RESERVED_EN,
-		  qp->fmr_and_reserved_lkey);
-
-	SET_FIELD(p_ramrod->flags,
-		  ROCE_CREATE_QP_REQ_RAMROD_DATA_SIGNALED_COMP, qp->signal_all);
-
-	SET_FIELD(p_ramrod->flags,
-		  ROCE_CREATE_QP_REQ_RAMROD_DATA_ERR_RETRY_CNT, qp->retry_cnt);
-
-	SET_FIELD(p_ramrod->flags,
-		  ROCE_CREATE_QP_REQ_RAMROD_DATA_RNR_NAK_CNT,
-		  qp->rnr_retry_cnt);
-
-	p_ramrod->max_ord = qp->max_rd_atomic_req;
-	p_ramrod->traffic_class = qp->traffic_class_tos;
-	p_ramrod->hop_limit = qp->hop_limit_ttl;
-	p_ramrod->orq_num_pages = qp->orq_num_pages;
-	p_ramrod->p_key = cpu_to_le16(qp->pkey);
-	p_ramrod->flow_label = cpu_to_le32(qp->flow_label);
-	p_ramrod->dst_qp_id = cpu_to_le32(qp->dest_qp);
-	p_ramrod->ack_timeout_val = cpu_to_le32(qp->ack_timeout);
-	p_ramrod->mtu = cpu_to_le16(qp->mtu);
-	p_ramrod->initial_psn = cpu_to_le32(qp->sq_psn);
-	p_ramrod->pd = cpu_to_le16(qp->pd);
-	p_ramrod->sq_num_pages = cpu_to_le16(qp->sq_num_pages);
-	DMA_REGPAIR_LE(p_ramrod->sq_pbl_addr, qp->sq_pbl_ptr);
-	DMA_REGPAIR_LE(p_ramrod->orq_pbl_addr, qp->orq_phys_addr);
-	qed_rdma_copy_gids(qp, p_ramrod->src_gid, p_ramrod->dst_gid);
-	p_ramrod->qp_handle_for_async.hi = cpu_to_le32(qp->qp_handle_async.hi);
-	p_ramrod->qp_handle_for_async.lo = cpu_to_le32(qp->qp_handle_async.lo);
-	p_ramrod->qp_handle_for_cqe.hi = cpu_to_le32(qp->qp_handle.hi);
-	p_ramrod->qp_handle_for_cqe.lo = cpu_to_le32(qp->qp_handle.lo);
-	p_ramrod->cq_cid =
-	    cpu_to_le32((p_hwfn->hw_info.opaque_fid << 16) | qp->sq_cq_id);
-
-	regular_latency_queue = qed_get_cm_pq_idx(p_hwfn, PQ_FLAGS_OFLD);
-
-	p_ramrod->regular_latency_phy_queue =
-	    cpu_to_le16(regular_latency_queue);
-	p_ramrod->low_latency_phy_queue =
-	    cpu_to_le16(regular_latency_queue);
-
-	p_ramrod->dpi = cpu_to_le16(qp->dpi);
-
-	qed_rdma_set_fw_mac(p_ramrod->remote_mac_addr, qp->remote_mac_addr);
-	qed_rdma_set_fw_mac(p_ramrod->local_mac_addr, qp->local_mac_addr);
-
-	p_ramrod->udp_src_port = qp->udp_src_port;
-	p_ramrod->vlan_id = cpu_to_le16(qp->vlan_id);
-	p_ramrod->stats_counter_id = RESC_START(p_hwfn, QED_RDMA_STATS_QUEUE) +
-				     qp->stats_queue;
-
-	rc = qed_spq_post(p_hwfn, p_ent, NULL);
-
-	DP_VERBOSE(p_hwfn, QED_MSG_RDMA, "rc = %d\n", rc);
-
-	if (rc)
-		goto err;
-
-	qp->req_offloaded = true;
-	proto = p_hwfn->p_rdma_info->proto;
-	qed_roce_set_real_cid(p_hwfn,
-			      qp->icid + 1 -
-			      qed_cxt_get_proto_cid_start(p_hwfn, proto));
-
-	return rc;
-
-err:
-	DP_NOTICE(p_hwfn, "Create requested - failed, rc = %d\n", rc);
-	dma_free_coherent(&p_hwfn->cdev->pdev->dev,
-			  qp->orq_num_pages * RDMA_RING_PAGE_SIZE,
-			  qp->orq, qp->orq_phys_addr);
-	return rc;
-}
-
-static int qed_roce_sp_modify_responder(struct qed_hwfn *p_hwfn,
-					struct qed_rdma_qp *qp,
-					bool move_to_err, u32 modify_flags)
-{
-	struct roce_modify_qp_resp_ramrod_data *p_ramrod;
-	struct qed_sp_init_data init_data;
-	struct qed_spq_entry *p_ent;
-	int rc;
-
-	DP_VERBOSE(p_hwfn, QED_MSG_RDMA, "icid = %08x\n", qp->icid);
-
-	if (move_to_err && !qp->resp_offloaded)
-		return 0;
-
-	/* Get SPQ entry */
-	memset(&init_data, 0, sizeof(init_data));
-	init_data.cid = qp->icid;
-	init_data.opaque_fid = p_hwfn->hw_info.opaque_fid;
-	init_data.comp_mode = QED_SPQ_MODE_EBLOCK;
-
-	rc = qed_sp_init_request(p_hwfn, &p_ent,
-				 ROCE_EVENT_MODIFY_QP,
-				 PROTOCOLID_ROCE, &init_data);
-	if (rc) {
-		DP_NOTICE(p_hwfn, "rc = %d\n", rc);
-		return rc;
-	}
-
-	p_ramrod = &p_ent->ramrod.roce_modify_qp_resp;
-
-	p_ramrod->flags = 0;
-
-	SET_FIELD(p_ramrod->flags,
-		  ROCE_MODIFY_QP_RESP_RAMROD_DATA_MOVE_TO_ERR_FLG, move_to_err);
-
-	SET_FIELD(p_ramrod->flags,
-		  ROCE_MODIFY_QP_RESP_RAMROD_DATA_RDMA_RD_EN,
-		  qp->incoming_rdma_read_en);
-
-	SET_FIELD(p_ramrod->flags,
-		  ROCE_MODIFY_QP_RESP_RAMROD_DATA_RDMA_WR_EN,
-		  qp->incoming_rdma_write_en);
-
-	SET_FIELD(p_ramrod->flags,
-		  ROCE_MODIFY_QP_RESP_RAMROD_DATA_ATOMIC_EN,
-		  qp->incoming_atomic_en);
-
-	SET_FIELD(p_ramrod->flags,
-		  ROCE_CREATE_QP_RESP_RAMROD_DATA_E2E_FLOW_CONTROL_EN,
-		  qp->e2e_flow_control_en);
-
-	SET_FIELD(p_ramrod->flags,
-		  ROCE_MODIFY_QP_RESP_RAMROD_DATA_RDMA_OPS_EN_FLG,
-		  GET_FIELD(modify_flags,
-			    QED_RDMA_MODIFY_QP_VALID_RDMA_OPS_EN));
-
-	SET_FIELD(p_ramrod->flags,
-		  ROCE_MODIFY_QP_RESP_RAMROD_DATA_P_KEY_FLG,
-		  GET_FIELD(modify_flags, QED_ROCE_MODIFY_QP_VALID_PKEY));
-
-	SET_FIELD(p_ramrod->flags,
-		  ROCE_MODIFY_QP_RESP_RAMROD_DATA_ADDRESS_VECTOR_FLG,
-		  GET_FIELD(modify_flags,
-			    QED_ROCE_MODIFY_QP_VALID_ADDRESS_VECTOR));
-
-	SET_FIELD(p_ramrod->flags,
-		  ROCE_MODIFY_QP_RESP_RAMROD_DATA_MAX_IRD_FLG,
-		  GET_FIELD(modify_flags,
-			    QED_RDMA_MODIFY_QP_VALID_MAX_RD_ATOMIC_RESP));
-
-	SET_FIELD(p_ramrod->flags,
-		  ROCE_MODIFY_QP_RESP_RAMROD_DATA_MIN_RNR_NAK_TIMER_FLG,
-		  GET_FIELD(modify_flags,
-			    QED_ROCE_MODIFY_QP_VALID_MIN_RNR_NAK_TIMER));
-
-	p_ramrod->fields = 0;
-	SET_FIELD(p_ramrod->fields,
-		  ROCE_MODIFY_QP_RESP_RAMROD_DATA_MIN_RNR_NAK_TIMER,
-		  qp->min_rnr_nak_timer);
-
-	p_ramrod->max_ird = qp->max_rd_atomic_resp;
-	p_ramrod->traffic_class = qp->traffic_class_tos;
-	p_ramrod->hop_limit = qp->hop_limit_ttl;
-	p_ramrod->p_key = cpu_to_le16(qp->pkey);
-	p_ramrod->flow_label = cpu_to_le32(qp->flow_label);
-	p_ramrod->mtu = cpu_to_le16(qp->mtu);
-	qed_rdma_copy_gids(qp, p_ramrod->src_gid, p_ramrod->dst_gid);
-	rc = qed_spq_post(p_hwfn, p_ent, NULL);
-
-	DP_VERBOSE(p_hwfn, QED_MSG_RDMA, "Modify responder, rc = %d\n", rc);
-	return rc;
-}
-
-static int qed_roce_sp_modify_requester(struct qed_hwfn *p_hwfn,
-					struct qed_rdma_qp *qp,
-					bool move_to_sqd,
-					bool move_to_err, u32 modify_flags)
-{
-	struct roce_modify_qp_req_ramrod_data *p_ramrod;
-	struct qed_sp_init_data init_data;
-	struct qed_spq_entry *p_ent;
-	int rc;
-
-	DP_VERBOSE(p_hwfn, QED_MSG_RDMA, "icid = %08x\n", qp->icid);
-
-	if (move_to_err && !(qp->req_offloaded))
-		return 0;
-
-	/* Get SPQ entry */
-	memset(&init_data, 0, sizeof(init_data));
-	init_data.cid = qp->icid + 1;
-	init_data.opaque_fid = p_hwfn->hw_info.opaque_fid;
-	init_data.comp_mode = QED_SPQ_MODE_EBLOCK;
-
-	rc = qed_sp_init_request(p_hwfn, &p_ent,
-				 ROCE_EVENT_MODIFY_QP,
-				 PROTOCOLID_ROCE, &init_data);
-	if (rc) {
-		DP_NOTICE(p_hwfn, "rc = %d\n", rc);
-		return rc;
-	}
-
-	p_ramrod = &p_ent->ramrod.roce_modify_qp_req;
-
-	p_ramrod->flags = 0;
-
-	SET_FIELD(p_ramrod->flags,
-		  ROCE_MODIFY_QP_REQ_RAMROD_DATA_MOVE_TO_ERR_FLG, move_to_err);
-
-	SET_FIELD(p_ramrod->flags,
-		  ROCE_MODIFY_QP_REQ_RAMROD_DATA_MOVE_TO_SQD_FLG, move_to_sqd);
-
-	SET_FIELD(p_ramrod->flags,
-		  ROCE_MODIFY_QP_REQ_RAMROD_DATA_EN_SQD_ASYNC_NOTIFY,
-		  qp->sqd_async);
-
-	SET_FIELD(p_ramrod->flags,
-		  ROCE_MODIFY_QP_REQ_RAMROD_DATA_P_KEY_FLG,
-		  GET_FIELD(modify_flags, QED_ROCE_MODIFY_QP_VALID_PKEY));
-
-	SET_FIELD(p_ramrod->flags,
-		  ROCE_MODIFY_QP_REQ_RAMROD_DATA_ADDRESS_VECTOR_FLG,
-		  GET_FIELD(modify_flags,
-			    QED_ROCE_MODIFY_QP_VALID_ADDRESS_VECTOR));
-
-	SET_FIELD(p_ramrod->flags,
-		  ROCE_MODIFY_QP_REQ_RAMROD_DATA_MAX_ORD_FLG,
-		  GET_FIELD(modify_flags,
-			    QED_RDMA_MODIFY_QP_VALID_MAX_RD_ATOMIC_REQ));
-
-	SET_FIELD(p_ramrod->flags,
-		  ROCE_MODIFY_QP_REQ_RAMROD_DATA_RNR_NAK_CNT_FLG,
-		  GET_FIELD(modify_flags,
-			    QED_ROCE_MODIFY_QP_VALID_RNR_RETRY_CNT));
-
-	SET_FIELD(p_ramrod->flags,
-		  ROCE_MODIFY_QP_REQ_RAMROD_DATA_ERR_RETRY_CNT_FLG,
-		  GET_FIELD(modify_flags, QED_ROCE_MODIFY_QP_VALID_RETRY_CNT));
-
-	SET_FIELD(p_ramrod->flags,
-		  ROCE_MODIFY_QP_REQ_RAMROD_DATA_ACK_TIMEOUT_FLG,
-		  GET_FIELD(modify_flags,
-			    QED_ROCE_MODIFY_QP_VALID_ACK_TIMEOUT));
-
-	p_ramrod->fields = 0;
-	SET_FIELD(p_ramrod->fields,
-		  ROCE_MODIFY_QP_REQ_RAMROD_DATA_ERR_RETRY_CNT, qp->retry_cnt);
-
-	SET_FIELD(p_ramrod->fields,
-		  ROCE_MODIFY_QP_REQ_RAMROD_DATA_RNR_NAK_CNT,
-		  qp->rnr_retry_cnt);
-
-	p_ramrod->max_ord = qp->max_rd_atomic_req;
-	p_ramrod->traffic_class = qp->traffic_class_tos;
-	p_ramrod->hop_limit = qp->hop_limit_ttl;
-	p_ramrod->p_key = cpu_to_le16(qp->pkey);
-	p_ramrod->flow_label = cpu_to_le32(qp->flow_label);
-	p_ramrod->ack_timeout_val = cpu_to_le32(qp->ack_timeout);
-	p_ramrod->mtu = cpu_to_le16(qp->mtu);
-	qed_rdma_copy_gids(qp, p_ramrod->src_gid, p_ramrod->dst_gid);
-	rc = qed_spq_post(p_hwfn, p_ent, NULL);
-
-	DP_VERBOSE(p_hwfn, QED_MSG_RDMA, "Modify requester, rc = %d\n", rc);
-	return rc;
-}
-
-static int qed_roce_sp_destroy_qp_responder(struct qed_hwfn *p_hwfn,
-					    struct qed_rdma_qp *qp,
-					    u32 *num_invalidated_mw,
-					    u32 *cq_prod)
-{
-	struct roce_destroy_qp_resp_output_params *p_ramrod_res;
-	struct roce_destroy_qp_resp_ramrod_data *p_ramrod;
-	struct qed_sp_init_data init_data;
-	struct qed_spq_entry *p_ent;
-	dma_addr_t ramrod_res_phys;
-	int rc;
-
-	DP_VERBOSE(p_hwfn, QED_MSG_RDMA, "icid = %08x\n", qp->icid);
-
-	*num_invalidated_mw = 0;
-	*cq_prod = qp->cq_prod;
-
-	if (!qp->resp_offloaded) {
-		/* If a responder was never offload, we need to free the cids
-		 * allocated in create_qp as a FW async event will never arrive
-		 */
-		u32 cid;
-
-		cid = qp->icid -
-		      qed_cxt_get_proto_cid_start(p_hwfn,
-						  p_hwfn->p_rdma_info->proto);
-		qed_roce_free_cid_pair(p_hwfn, (u16)cid);
-
-		return 0;
-	}
-
-	/* Get SPQ entry */
-	memset(&init_data, 0, sizeof(init_data));
-	init_data.cid = qp->icid;
-	init_data.opaque_fid = p_hwfn->hw_info.opaque_fid;
-	init_data.comp_mode = QED_SPQ_MODE_EBLOCK;
-
-	rc = qed_sp_init_request(p_hwfn, &p_ent,
-				 ROCE_RAMROD_DESTROY_QP,
-				 PROTOCOLID_ROCE, &init_data);
-	if (rc)
-		return rc;
-
-	p_ramrod = &p_ent->ramrod.roce_destroy_qp_resp;
-
-	p_ramrod_res = (struct roce_destroy_qp_resp_output_params *)
-	    dma_alloc_coherent(&p_hwfn->cdev->pdev->dev, sizeof(*p_ramrod_res),
-			       &ramrod_res_phys, GFP_KERNEL);
-
-	if (!p_ramrod_res) {
-		rc = -ENOMEM;
-		DP_NOTICE(p_hwfn,
-			  "qed destroy responder failed: cannot allocate memory (ramrod). rc = %d\n",
-			  rc);
-		return rc;
-	}
-
-	DMA_REGPAIR_LE(p_ramrod->output_params_addr, ramrod_res_phys);
-
-	rc = qed_spq_post(p_hwfn, p_ent, NULL);
-	if (rc)
-		goto err;
-
-	*num_invalidated_mw = le32_to_cpu(p_ramrod_res->num_invalidated_mw);
-	*cq_prod = le32_to_cpu(p_ramrod_res->cq_prod);
-	qp->cq_prod = *cq_prod;
-
-	/* Free IRQ - only if ramrod succeeded, in case FW is still using it */
-	dma_free_coherent(&p_hwfn->cdev->pdev->dev,
-			  qp->irq_num_pages * RDMA_RING_PAGE_SIZE,
-			  qp->irq, qp->irq_phys_addr);
-
-	qp->resp_offloaded = false;
-
-	DP_VERBOSE(p_hwfn, QED_MSG_RDMA, "Destroy responder, rc = %d\n", rc);
-
-err:
-	dma_free_coherent(&p_hwfn->cdev->pdev->dev,
-			  sizeof(struct roce_destroy_qp_resp_output_params),
-			  p_ramrod_res, ramrod_res_phys);
-
-	return rc;
-}
-
-static int qed_roce_sp_destroy_qp_requester(struct qed_hwfn *p_hwfn,
-					    struct qed_rdma_qp *qp,
-					    u32 *num_bound_mw)
-{
-	struct roce_destroy_qp_req_output_params *p_ramrod_res;
-	struct roce_destroy_qp_req_ramrod_data *p_ramrod;
-	struct qed_sp_init_data init_data;
-	struct qed_spq_entry *p_ent;
-	dma_addr_t ramrod_res_phys;
-	int rc = -ENOMEM;
-
-	DP_VERBOSE(p_hwfn, QED_MSG_RDMA, "icid = %08x\n", qp->icid);
-
-	if (!qp->req_offloaded)
-		return 0;
-
-	p_ramrod_res = (struct roce_destroy_qp_req_output_params *)
-		       dma_alloc_coherent(&p_hwfn->cdev->pdev->dev,
-					  sizeof(*p_ramrod_res),
-					  &ramrod_res_phys, GFP_KERNEL);
-	if (!p_ramrod_res) {
-		DP_NOTICE(p_hwfn,
-			  "qed destroy requester failed: cannot allocate memory (ramrod)\n");
-		return rc;
-	}
-
-	/* Get SPQ entry */
-	memset(&init_data, 0, sizeof(init_data));
-	init_data.cid = qp->icid + 1;
-	init_data.opaque_fid = p_hwfn->hw_info.opaque_fid;
-	init_data.comp_mode = QED_SPQ_MODE_EBLOCK;
-
-	rc = qed_sp_init_request(p_hwfn, &p_ent, ROCE_RAMROD_DESTROY_QP,
-				 PROTOCOLID_ROCE, &init_data);
-	if (rc)
-		goto err;
-
-	p_ramrod = &p_ent->ramrod.roce_destroy_qp_req;
-	DMA_REGPAIR_LE(p_ramrod->output_params_addr, ramrod_res_phys);
-
-	rc = qed_spq_post(p_hwfn, p_ent, NULL);
-	if (rc)
-		goto err;
-
-	*num_bound_mw = le32_to_cpu(p_ramrod_res->num_bound_mw);
-
-	/* Free ORQ - only if ramrod succeeded, in case FW is still using it */
-	dma_free_coherent(&p_hwfn->cdev->pdev->dev,
-			  qp->orq_num_pages * RDMA_RING_PAGE_SIZE,
-			  qp->orq, qp->orq_phys_addr);
-
-	qp->req_offloaded = false;
-
-	DP_VERBOSE(p_hwfn, QED_MSG_RDMA, "Destroy requester, rc = %d\n", rc);
-
-err:
-	dma_free_coherent(&p_hwfn->cdev->pdev->dev, sizeof(*p_ramrod_res),
-			  p_ramrod_res, ramrod_res_phys);
-
-	return rc;
-}
-
-static int qed_roce_query_qp(struct qed_hwfn *p_hwfn,
-			     struct qed_rdma_qp *qp,
-			     struct qed_rdma_query_qp_out_params *out_params)
-{
-	struct roce_query_qp_resp_output_params *p_resp_ramrod_res;
-	struct roce_query_qp_req_output_params *p_req_ramrod_res;
-	struct roce_query_qp_resp_ramrod_data *p_resp_ramrod;
-	struct roce_query_qp_req_ramrod_data *p_req_ramrod;
-	struct qed_sp_init_data init_data;
-	dma_addr_t resp_ramrod_res_phys;
-	dma_addr_t req_ramrod_res_phys;
-	struct qed_spq_entry *p_ent;
-	bool rq_err_state;
-	bool sq_err_state;
-	bool sq_draining;
-	int rc = -ENOMEM;
-
-	if ((!(qp->resp_offloaded)) && (!(qp->req_offloaded))) {
-		/* We can't send ramrod to the fw since this qp wasn't offloaded
-		 * to the fw yet
-		 */
-		out_params->draining = false;
-		out_params->rq_psn = qp->rq_psn;
-		out_params->sq_psn = qp->sq_psn;
-		out_params->state = qp->cur_state;
-
-		DP_VERBOSE(p_hwfn, QED_MSG_RDMA, "No QPs as no offload\n");
-		return 0;
-	}
-
-	if (!(qp->resp_offloaded)) {
-		DP_NOTICE(p_hwfn,
-			  "The responder's qp should be offloded before requester's\n");
-		return -EINVAL;
-	}
-
-	/* Send a query responder ramrod to FW to get RQ-PSN and state */
-	p_resp_ramrod_res = (struct roce_query_qp_resp_output_params *)
-	    dma_alloc_coherent(&p_hwfn->cdev->pdev->dev,
-			       sizeof(*p_resp_ramrod_res),
-			       &resp_ramrod_res_phys, GFP_KERNEL);
-	if (!p_resp_ramrod_res) {
-		DP_NOTICE(p_hwfn,
-			  "qed query qp failed: cannot allocate memory (ramrod)\n");
-		return rc;
-	}
-
-	/* Get SPQ entry */
-	memset(&init_data, 0, sizeof(init_data));
-	init_data.cid = qp->icid;
-	init_data.opaque_fid = p_hwfn->hw_info.opaque_fid;
-	init_data.comp_mode = QED_SPQ_MODE_EBLOCK;
-	rc = qed_sp_init_request(p_hwfn, &p_ent, ROCE_RAMROD_QUERY_QP,
-				 PROTOCOLID_ROCE, &init_data);
-	if (rc)
-		goto err_resp;
-
-	p_resp_ramrod = &p_ent->ramrod.roce_query_qp_resp;
-	DMA_REGPAIR_LE(p_resp_ramrod->output_params_addr, resp_ramrod_res_phys);
-
-	rc = qed_spq_post(p_hwfn, p_ent, NULL);
-	if (rc)
-		goto err_resp;
-
-	out_params->rq_psn = le32_to_cpu(p_resp_ramrod_res->psn);
-	rq_err_state = GET_FIELD(le32_to_cpu(p_resp_ramrod_res->err_flag),
-				 ROCE_QUERY_QP_RESP_OUTPUT_PARAMS_ERROR_FLG);
-
-	dma_free_coherent(&p_hwfn->cdev->pdev->dev, sizeof(*p_resp_ramrod_res),
-			  p_resp_ramrod_res, resp_ramrod_res_phys);
-
-	if (!(qp->req_offloaded)) {
-		/* Don't send query qp for the requester */
-		out_params->sq_psn = qp->sq_psn;
-		out_params->draining = false;
-
-		if (rq_err_state)
-			qp->cur_state = QED_ROCE_QP_STATE_ERR;
-
-		out_params->state = qp->cur_state;
-
-		return 0;
-	}
-
-	/* Send a query requester ramrod to FW to get SQ-PSN and state */
-	p_req_ramrod_res = (struct roce_query_qp_req_output_params *)
-			   dma_alloc_coherent(&p_hwfn->cdev->pdev->dev,
-					      sizeof(*p_req_ramrod_res),
-					      &req_ramrod_res_phys,
-					      GFP_KERNEL);
-	if (!p_req_ramrod_res) {
-		rc = -ENOMEM;
-		DP_NOTICE(p_hwfn,
-			  "qed query qp failed: cannot allocate memory (ramrod)\n");
-		return rc;
-	}
-
-	/* Get SPQ entry */
-	init_data.cid = qp->icid + 1;
-	rc = qed_sp_init_request(p_hwfn, &p_ent, ROCE_RAMROD_QUERY_QP,
-				 PROTOCOLID_ROCE, &init_data);
-	if (rc)
-		goto err_req;
-
-	p_req_ramrod = &p_ent->ramrod.roce_query_qp_req;
-	DMA_REGPAIR_LE(p_req_ramrod->output_params_addr, req_ramrod_res_phys);
-
-	rc = qed_spq_post(p_hwfn, p_ent, NULL);
-	if (rc)
-		goto err_req;
-
-	out_params->sq_psn = le32_to_cpu(p_req_ramrod_res->psn);
-	sq_err_state = GET_FIELD(le32_to_cpu(p_req_ramrod_res->flags),
-				 ROCE_QUERY_QP_REQ_OUTPUT_PARAMS_ERR_FLG);
-	sq_draining =
-		GET_FIELD(le32_to_cpu(p_req_ramrod_res->flags),
-			  ROCE_QUERY_QP_REQ_OUTPUT_PARAMS_SQ_DRAINING_FLG);
-
-	dma_free_coherent(&p_hwfn->cdev->pdev->dev, sizeof(*p_req_ramrod_res),
-			  p_req_ramrod_res, req_ramrod_res_phys);
-
-	out_params->draining = false;
-
-	if (rq_err_state || sq_err_state)
-		qp->cur_state = QED_ROCE_QP_STATE_ERR;
-	else if (sq_draining)
-		out_params->draining = true;
-	out_params->state = qp->cur_state;
-
-	return 0;
-
-err_req:
-	dma_free_coherent(&p_hwfn->cdev->pdev->dev, sizeof(*p_req_ramrod_res),
-			  p_req_ramrod_res, req_ramrod_res_phys);
-	return rc;
-err_resp:
-	dma_free_coherent(&p_hwfn->cdev->pdev->dev, sizeof(*p_resp_ramrod_res),
-			  p_resp_ramrod_res, resp_ramrod_res_phys);
-	return rc;
-}
-
-static int qed_roce_destroy_qp(struct qed_hwfn *p_hwfn, struct qed_rdma_qp *qp)
-{
-	u32 num_invalidated_mw = 0;
-	u32 num_bound_mw = 0;
-	u32 cq_prod;
-	int rc;
-
-	/* Destroys the specified QP */
-	if ((qp->cur_state != QED_ROCE_QP_STATE_RESET) &&
-	    (qp->cur_state != QED_ROCE_QP_STATE_ERR) &&
-	    (qp->cur_state != QED_ROCE_QP_STATE_INIT)) {
-		DP_NOTICE(p_hwfn,
-			  "QP must be in error, reset or init state before destroying it\n");
-		return -EINVAL;
-	}
-
-	if (qp->cur_state != QED_ROCE_QP_STATE_RESET) {
-		rc = qed_roce_sp_destroy_qp_responder(p_hwfn, qp,
-						      &num_invalidated_mw,
-						      &cq_prod);
-		if (rc)
-			return rc;
-
-		/* Send destroy requester ramrod */
-		rc = qed_roce_sp_destroy_qp_requester(p_hwfn, qp,
-						      &num_bound_mw);
-		if (rc)
-			return rc;
-
-		if (num_invalidated_mw != num_bound_mw) {
-			DP_NOTICE(p_hwfn,
-				  "number of invalidate memory windows is different from bounded ones\n");
-			return -EINVAL;
-		}
-	}
-
-	return 0;
-}
-
 static int qed_rdma_query_qp(void *rdma_cxt,
 			     struct qed_rdma_qp *qp,
 			     struct qed_rdma_query_qp_out_params *out_params)
@@ -2170,114 +1233,6 @@ qed_rdma_create_qp(void *rdma_cxt,
 	return qp;
 }
 
-static int qed_roce_modify_qp(struct qed_hwfn *p_hwfn,
-			      struct qed_rdma_qp *qp,
-			      enum qed_roce_qp_state prev_state,
-			      struct qed_rdma_modify_qp_in_params *params)
-{
-	u32 num_invalidated_mw = 0, num_bound_mw = 0;
-	int rc = 0;
-
-	/* Perform additional operations according to the current state and the
-	 * next state
-	 */
-	if (((prev_state == QED_ROCE_QP_STATE_INIT) ||
-	     (prev_state == QED_ROCE_QP_STATE_RESET)) &&
-	    (qp->cur_state == QED_ROCE_QP_STATE_RTR)) {
-		/* Init->RTR or Reset->RTR */
-		rc = qed_roce_sp_create_responder(p_hwfn, qp);
-		return rc;
-	} else if ((prev_state == QED_ROCE_QP_STATE_RTR) &&
-		   (qp->cur_state == QED_ROCE_QP_STATE_RTS)) {
-		/* RTR-> RTS */
-		rc = qed_roce_sp_create_requester(p_hwfn, qp);
-		if (rc)
-			return rc;
-
-		/* Send modify responder ramrod */
-		rc = qed_roce_sp_modify_responder(p_hwfn, qp, false,
-						  params->modify_flags);
-		return rc;
-	} else if ((prev_state == QED_ROCE_QP_STATE_RTS) &&
-		   (qp->cur_state == QED_ROCE_QP_STATE_RTS)) {
-		/* RTS->RTS */
-		rc = qed_roce_sp_modify_responder(p_hwfn, qp, false,
-						  params->modify_flags);
-		if (rc)
-			return rc;
-
-		rc = qed_roce_sp_modify_requester(p_hwfn, qp, false, false,
-						  params->modify_flags);
-		return rc;
-	} else if ((prev_state == QED_ROCE_QP_STATE_RTS) &&
-		   (qp->cur_state == QED_ROCE_QP_STATE_SQD)) {
-		/* RTS->SQD */
-		rc = qed_roce_sp_modify_requester(p_hwfn, qp, true, false,
-						  params->modify_flags);
-		return rc;
-	} else if ((prev_state == QED_ROCE_QP_STATE_SQD) &&
-		   (qp->cur_state == QED_ROCE_QP_STATE_SQD)) {
-		/* SQD->SQD */
-		rc = qed_roce_sp_modify_responder(p_hwfn, qp, false,
-						  params->modify_flags);
-		if (rc)
-			return rc;
-
-		rc = qed_roce_sp_modify_requester(p_hwfn, qp, false, false,
-						  params->modify_flags);
-		return rc;
-	} else if ((prev_state == QED_ROCE_QP_STATE_SQD) &&
-		   (qp->cur_state == QED_ROCE_QP_STATE_RTS)) {
-		/* SQD->RTS */
-		rc = qed_roce_sp_modify_responder(p_hwfn, qp, false,
-						  params->modify_flags);
-		if (rc)
-			return rc;
-
-		rc = qed_roce_sp_modify_requester(p_hwfn, qp, false, false,
-						  params->modify_flags);
-
-		return rc;
-	} else if (qp->cur_state == QED_ROCE_QP_STATE_ERR) {
-		/* ->ERR */
-		rc = qed_roce_sp_modify_responder(p_hwfn, qp, true,
-						  params->modify_flags);
-		if (rc)
-			return rc;
-
-		rc = qed_roce_sp_modify_requester(p_hwfn, qp, false, true,
-						  params->modify_flags);
-		return rc;
-	} else if (qp->cur_state == QED_ROCE_QP_STATE_RESET) {
-		/* Any state -> RESET */
-		u32 cq_prod;
-
-		/* Send destroy responder ramrod */
-		rc = qed_roce_sp_destroy_qp_responder(p_hwfn,
-						      qp,
-						      &num_invalidated_mw,
-						      &cq_prod);
-
-		if (rc)
-			return rc;
-
-		qp->cq_prod = cq_prod;
-
-		rc = qed_roce_sp_destroy_qp_requester(p_hwfn, qp,
-						      &num_bound_mw);
-
-		if (num_invalidated_mw != num_bound_mw) {
-			DP_NOTICE(p_hwfn,
-				  "number of invalidate memory windows is different from bounded ones\n");
-			return -EINVAL;
-		}
-	} else {
-		DP_VERBOSE(p_hwfn, QED_MSG_RDMA, "0\n");
-	}
-
-	return rc;
-}
-
 static int qed_rdma_modify_qp(void *rdma_cxt,
 			      struct qed_rdma_qp *qp,
 			      struct qed_rdma_modify_qp_in_params *params)
@@ -2599,37 +1554,12 @@ static int qed_rdma_deregister_tid(void *rdma_cxt, u32 itid)
 	return rc;
 }
 
-static void qed_roce_free_real_icid(struct qed_hwfn *p_hwfn, u16 icid)
-{
-	struct qed_rdma_info *p_rdma_info = p_hwfn->p_rdma_info;
-	u32 start_cid, cid, xcid;
-
-	/* an even icid belongs to a responder while an odd icid belongs to a
-	 * requester. The 'cid' received as an input can be either. We calculate
-	 * the "partner" icid and call it xcid. Only if both are free then the
-	 * "cid" map can be cleared.
-	 */
-	start_cid = qed_cxt_get_proto_cid_start(p_hwfn, p_rdma_info->proto);
-	cid = icid - start_cid;
-	xcid = cid ^ 1;
-
-	spin_lock_bh(&p_rdma_info->lock);
-
-	qed_bmap_release_id(p_hwfn, &p_rdma_info->real_cid_map, cid);
-	if (qed_bmap_test_id(p_hwfn, &p_rdma_info->real_cid_map, xcid) == 0) {
-		qed_bmap_release_id(p_hwfn, &p_rdma_info->cid_map, cid);
-		qed_bmap_release_id(p_hwfn, &p_rdma_info->cid_map, xcid);
-	}
-
-	spin_unlock_bh(&p_hwfn->p_rdma_info->lock);
-}
-
 static void *qed_rdma_get_rdma_ctx(struct qed_dev *cdev)
 {
 	return QED_LEADING_HWFN(cdev);
 }
 
-static bool qed_rdma_allocated_qps(struct qed_hwfn *p_hwfn)
+bool qed_rdma_allocated_qps(struct qed_hwfn *p_hwfn)
 {
 	bool result;
 
@@ -2646,7 +1576,7 @@ static bool qed_rdma_allocated_qps(struct qed_hwfn *p_hwfn)
 	return result;
 }
 
-static void qed_rdma_dpm_conf(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt)
+void qed_rdma_dpm_conf(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt)
 {
 	u32 val;
 
@@ -2658,19 +1588,6 @@ static void qed_rdma_dpm_conf(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt)
 		   val, p_hwfn->dcbx_no_edpm, p_hwfn->db_bar_no_edpm);
 }
 
-void qed_roce_dpm_dcbx(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt)
-{
-	u8 val;
-
-	/* if any QPs are already active, we want to disable DPM, since their
-	 * context information contains information from before the latest DCBx
-	 * update. Otherwise enable it.
-	 */
-	val = qed_rdma_allocated_qps(p_hwfn) ? true : false;
-	p_hwfn->dcbx_no_edpm = (u8)val;
-
-	qed_rdma_dpm_conf(p_hwfn, p_ptt);
-}
 
 void qed_rdma_dpm_bar(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt)
 {