Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e8dddba authored by Kalderon, Michal's avatar Kalderon, Michal Committed by David S. Miller
Browse files

qed: Cleanup qed_roce before duplicating it 



The next patch in the series will duplicate qed_roce as part
of code preprations for iWARP support. Do some cleanup before
duplicating

Signed-off-by: default avatarMichal Kalderon <Michal.Kalderon@cavium.com>
Signed-off-by: default avatarYuval Mintz <Yuval.Mintz@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e8628307

drivers/net/ethernet/qlogic/qed/qed_roce.c

+12 −39
Original line number Original line Diff line number Diff line
@@ -35,11 +35,7 @@ 
#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/dma-mapping.h>

#include <linux/dma-mapping.h>

#include <linux/errno.h>

#include <linux/errno.h>

#include <linux/if_ether.h>

#include <linux/if_vlan.h>

#include <linux/io.h>

#include <linux/io.h>

#include <linux/ip.h>

#include <linux/ipv6.h>

#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/list.h>

#include <linux/list.h>

#include <linux/module.h>

#include <linux/module.h>
@@ -48,10 +44,6 @@ 
#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/spinlock.h>

#include <linux/spinlock.h>

#include <linux/string.h>

#include <linux/string.h>

#include <linux/tcp.h>

#include <linux/bitops.h>

#include <linux/qed/qed_roce_if.h>

#include <linux/qed/qed_roce_if.h>

#include "qed.h"

#include "qed.h"

#include "qed_cxt.h"

#include "qed_cxt.h"

#include "qed_hsi.h"

#include "qed_hsi.h"
@@ -61,10 +53,9 @@ 
#include "qed_ll2.h"

#include "qed_ll2.h"

#include "qed_mcp.h"

#include "qed_mcp.h"

#include "qed_reg_addr.h"

#include "qed_reg_addr.h"

#include "qed_sp.h"

#include "qed_roce.h"

#include "qed_roce.h"

#include "qed_ll2.h"

#include <linux/qed/qed_roce_if.h>

#include <linux/qed/qed_ll2_if.h>

#include "qed_sp.h"





static void qed_roce_free_real_icid(struct qed_hwfn *p_hwfn, u16 icid);

static void qed_roce_free_real_icid(struct qed_hwfn *p_hwfn, u16 icid);
@@ -100,13 +91,10 @@ static int qed_rdma_bmap_alloc(struct qed_hwfn *p_hwfn, 




	bmap->max_count = max_count;

	bmap->max_count = max_count;





	bmap->bitmap = kzalloc(BITS_TO_LONGS(max_count) * sizeof(long),

	bmap->bitmap = kcalloc(BITS_TO_LONGS(max_count), sizeof(long),

			       GFP_KERNEL);

			       GFP_KERNEL);

	if (!bmap->bitmap) {

	if (!bmap->bitmap)

		DP_NOTICE(p_hwfn,

			  "qed bmap alloc failed: cannot allocate memory (bitmap)\n");

		return -ENOMEM;

		return -ENOMEM;

	}





	snprintf(bmap->name, QED_RDMA_MAX_BMAP_NAME, "%s", name);

	snprintf(bmap->name, QED_RDMA_MAX_BMAP_NAME, "%s", name);
@@ -189,12 +177,8 @@ static int qed_rdma_alloc(struct qed_hwfn *p_hwfn, 




	/* Allocate a struct with current pf rdma info */

	/* Allocate a struct with current pf rdma info */

	p_rdma_info = kzalloc(sizeof(*p_rdma_info), GFP_KERNEL);

	p_rdma_info = kzalloc(sizeof(*p_rdma_info), GFP_KERNEL);

	if (!p_rdma_info) {

	if (!p_rdma_info)

		DP_NOTICE(p_hwfn,

			  "qed rdma alloc failed: cannot allocate memory (rdma info). rc = %d\n",

			  rc);

		return rc;

		return rc;

	}





	p_hwfn->p_rdma_info = p_rdma_info;

	p_hwfn->p_rdma_info = p_rdma_info;

	p_rdma_info->proto = PROTOCOLID_ROCE;

	p_rdma_info->proto = PROTOCOLID_ROCE;
@@ -217,21 +201,13 @@ static int qed_rdma_alloc(struct qed_hwfn *p_hwfn, 




	/* Allocate a struct with device params and fill it */

	/* Allocate a struct with device params and fill it */

	p_rdma_info->dev = kzalloc(sizeof(*p_rdma_info->dev), GFP_KERNEL);

	p_rdma_info->dev = kzalloc(sizeof(*p_rdma_info->dev), GFP_KERNEL);

	if (!p_rdma_info->dev) {

	if (!p_rdma_info->dev)

		DP_NOTICE(p_hwfn,

			  "qed rdma alloc failed: cannot allocate memory (rdma info dev). rc = %d\n",

			  rc);

		goto free_rdma_info;

		goto free_rdma_info;

	}





	/* Allocate a struct with port params and fill it */

	/* Allocate a struct with port params and fill it */

	p_rdma_info->port = kzalloc(sizeof(*p_rdma_info->port), GFP_KERNEL);

	p_rdma_info->port = kzalloc(sizeof(*p_rdma_info->port), GFP_KERNEL);

	if (!p_rdma_info->port) {

	if (!p_rdma_info->port)

		DP_NOTICE(p_hwfn,

			  "qed rdma alloc failed: cannot allocate memory (rdma info port). rc = %d\n",

			  rc);

		goto free_rdma_dev;

		goto free_rdma_dev;

	}





	/* Allocate bit map for pd's */

	/* Allocate bit map for pd's */

	rc = qed_rdma_bmap_alloc(p_hwfn, &p_rdma_info->pd_map, RDMA_MAX_PDS,

	rc = qed_rdma_bmap_alloc(p_hwfn, &p_rdma_info->pd_map, RDMA_MAX_PDS,
@@ -1108,6 +1084,7 @@ qed_rdma_destroy_cq(void *rdma_cxt, 
	struct qed_sp_init_data init_data;

	struct qed_sp_init_data init_data;

	struct qed_spq_entry *p_ent;

	struct qed_spq_entry *p_ent;

	dma_addr_t ramrod_res_phys;

	dma_addr_t ramrod_res_phys;

	enum protocol_type proto;

	int rc = -ENOMEM;

	int rc = -ENOMEM;





	DP_VERBOSE(p_hwfn, QED_MSG_RDMA, "icid = %08x\n", in_params->icid);

	DP_VERBOSE(p_hwfn, QED_MSG_RDMA, "icid = %08x\n", in_params->icid);
@@ -1128,11 +1105,11 @@ qed_rdma_destroy_cq(void *rdma_cxt, 
	init_data.cid = in_params->icid;

	init_data.cid = in_params->icid;

	init_data.opaque_fid = p_hwfn->hw_info.opaque_fid;

	init_data.opaque_fid = p_hwfn->hw_info.opaque_fid;

	init_data.comp_mode = QED_SPQ_MODE_EBLOCK;

	init_data.comp_mode = QED_SPQ_MODE_EBLOCK;



	proto = p_hwfn->p_rdma_info->proto;

	/* Send destroy CQ ramrod */

	/* Send destroy CQ ramrod */

	rc = qed_sp_init_request(p_hwfn, &p_ent,

	rc = qed_sp_init_request(p_hwfn, &p_ent,

				 RDMA_RAMROD_DESTROY_CQ,

				 RDMA_RAMROD_DESTROY_CQ,

				 p_hwfn->p_rdma_info->proto, &init_data);

				 proto, &init_data);

	if (rc)

	if (rc)

		goto err;

		goto err;
@@ -1155,9 +1132,7 @@ qed_rdma_destroy_cq(void *rdma_cxt, 
	qed_bmap_release_id(p_hwfn,

	qed_bmap_release_id(p_hwfn,

			    &p_hwfn->p_rdma_info->cq_map,

			    &p_hwfn->p_rdma_info->cq_map,

			    (in_params->icid -

			    (in_params->icid -

			     qed_cxt_get_proto_cid_start(p_hwfn,

			     qed_cxt_get_proto_cid_start(p_hwfn, proto)));

							 p_hwfn->

							 p_rdma_info->proto)));





	spin_unlock_bh(&p_hwfn->p_rdma_info->lock);

	spin_unlock_bh(&p_hwfn->p_rdma_info->lock);
@@ -2153,10 +2128,8 @@ qed_rdma_create_qp(void *rdma_cxt, 
	}

	}





	qp = kzalloc(sizeof(*qp), GFP_KERNEL);

	qp = kzalloc(sizeof(*qp), GFP_KERNEL);

	if (!qp) {

	if (!qp)

		DP_NOTICE(p_hwfn, "Failed to allocate qed_rdma_qp\n");

		return NULL;

		return NULL;

	}





	rc = qed_roce_alloc_cid(p_hwfn, &qp->icid);

	rc = qed_roce_alloc_cid(p_hwfn, &qp->icid);

	qp->qpid = ((0xFF << 16) | qp->icid);

	qp->qpid = ((0xFF << 16) | qp->icid);