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

Commit ee45bea4 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'qed-rdma-bug-fixes' 



Michal Kalderon says:

====================
qed: rdma bug fixes

This patch contains two small bug fixes related to RDMA.
Both related to resource reservations.
====================

Signed-off-by: default avatarMichal Kalderon <Michal.Kalderon@cavium.com>
Signed-off-by: default avatarAriel Elior <Ariel.Elior@cavium.com>

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 88d1d76d 1fe280a0

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

+17 −14
Original line number Diff line number Diff line
@@ -358,10 +358,27 @@ static void qed_rdma_resc_free(struct qed_hwfn *p_hwfn) 
	kfree(p_rdma_info);

}



static void qed_rdma_free_tid(void *rdma_cxt, u32 itid)

{

        struct qed_hwfn *p_hwfn = (struct qed_hwfn *)rdma_cxt;



        DP_VERBOSE(p_hwfn, QED_MSG_RDMA, "itid = %08x\n", itid);



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

        qed_bmap_release_id(p_hwfn, &p_hwfn->p_rdma_info->tid_map, itid);

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

}



static void qed_rdma_free_reserved_lkey(struct qed_hwfn *p_hwfn)

{

	qed_rdma_free_tid(p_hwfn, p_hwfn->p_rdma_info->dev->reserved_lkey);

}



static void qed_rdma_free(struct qed_hwfn *p_hwfn)

{

	DP_VERBOSE(p_hwfn, QED_MSG_RDMA, "Freeing RDMA\n");



	qed_rdma_free_reserved_lkey(p_hwfn);

	qed_rdma_resc_free(p_hwfn);

}
@@ -615,9 +632,6 @@ static int qed_rdma_reserve_lkey(struct qed_hwfn *p_hwfn) 
{

	struct qed_rdma_device *dev = p_hwfn->p_rdma_info->dev;



	/* The first DPI is reserved for the Kernel */

	__set_bit(0, p_hwfn->p_rdma_info->dpi_map.bitmap);



	/* Tid 0 will be used as the key for "reserved MR".

	 * The driver should allocate memory for it so it can be loaded but no

	 * ramrod should be passed on it.
@@ -797,17 +811,6 @@ static struct qed_rdma_device *qed_rdma_query_device(void *rdma_cxt) 
	return p_hwfn->p_rdma_info->dev;

}



static void qed_rdma_free_tid(void *rdma_cxt, u32 itid)

{

	struct qed_hwfn *p_hwfn = (struct qed_hwfn *)rdma_cxt;



	DP_VERBOSE(p_hwfn, QED_MSG_RDMA, "itid = %08x\n", itid);



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

	qed_bmap_release_id(p_hwfn, &p_hwfn->p_rdma_info->tid_map, itid);

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

}



static void qed_rdma_cnq_prod_update(void *rdma_cxt, u8 qz_offset, u16 prod)

{

	struct qed_hwfn *p_hwfn;