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

Commit 29691591 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma 

Pull rdma fixes from Doug Ledford:
 "First round of -rc fixes for 4.10 kernel:

   - a series of qedr fixes
   - a series of rxe fixes
   - one i40iw fix
   - one cma fix
   - one cxgb4 fix"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
  IB/rxe: Don't check for null ptr in send()
  IB/rxe: Drop future atomic/read packets rather than retrying
  IB/rxe: Use BTH_PSN_MASK when ACKing duplicate sends
  qedr: Always notify the verb consumer of flushed CQEs
  qedr: clear the vendor error field in the work completion
  qedr: post_send/recv according to QP state
  qedr: ignore inline flag in read verbs
  qedr: modify QP state to error when destroying it
  qedr: return correct value on modify qp
  qedr: return error if destroy CQ failed
  qedr: configure the number of CQEs on CQ creation
  i40iw: Set 128B as the only supported RQ WQE size
  IB/cma: Fix a race condition in iboe_addr_get_sgid()
  IB/rxe: Fix a memory leak in rxe_qp_cleanup()
  iw_cxgb4: set correct FetchBurstMax for QPs
parents f290cbac 5cc8fabc

drivers/infiniband/hw/cxgb4/qp.c

+3 −2
Original line number Diff line number Diff line
@@ -321,7 +321,8 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq, 
		FW_RI_RES_WR_DCAEN_V(0) |

		FW_RI_RES_WR_DCACPU_V(0) |

		FW_RI_RES_WR_FBMIN_V(2) |

		FW_RI_RES_WR_FBMAX_V(2) |

		(t4_sq_onchip(&wq->sq) ? FW_RI_RES_WR_FBMAX_V(2) :

					 FW_RI_RES_WR_FBMAX_V(3)) |

		FW_RI_RES_WR_CIDXFTHRESHO_V(0) |

		FW_RI_RES_WR_CIDXFTHRESH_V(0) |

		FW_RI_RES_WR_EQSIZE_V(eqsize));
@@ -345,7 +346,7 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq, 
		FW_RI_RES_WR_DCAEN_V(0) |

		FW_RI_RES_WR_DCACPU_V(0) |

		FW_RI_RES_WR_FBMIN_V(2) |

		FW_RI_RES_WR_FBMAX_V(2) |

		FW_RI_RES_WR_FBMAX_V(3) |

		FW_RI_RES_WR_CIDXFTHRESHO_V(0) |

		FW_RI_RES_WR_CIDXFTHRESH_V(0) |

		FW_RI_RES_WR_EQSIZE_V(eqsize));

drivers/infiniband/hw/i40iw/i40iw_ctrl.c

+20 −5
Original line number Diff line number Diff line
@@ -358,13 +358,16 @@ void i40iw_qp_add_qos(struct i40iw_sc_qp *qp) 
 * @dev: sc device struct

 * @pd: sc pd ptr

 * @pd_id: pd_id for allocated pd

 * @abi_ver: ABI version from user context, -1 if not valid

 */

static void i40iw_sc_pd_init(struct i40iw_sc_dev *dev,

			     struct i40iw_sc_pd *pd,

			     u16 pd_id)

			     u16 pd_id,

			     int abi_ver)

{

	pd->size = sizeof(*pd);

	pd->pd_id = pd_id;

	pd->abi_ver = abi_ver;

	pd->dev = dev;

}
@@ -2252,6 +2255,7 @@ static enum i40iw_status_code i40iw_sc_qp_init(struct i40iw_sc_qp *qp, 
					      offset);



	info->qp_uk_init_info.wqe_alloc_reg = wqe_alloc_reg;

	info->qp_uk_init_info.abi_ver = qp->pd->abi_ver;

	ret_code = i40iw_qp_uk_init(&qp->qp_uk, &info->qp_uk_init_info);

	if (ret_code)

		return ret_code;
@@ -2270,10 +2274,21 @@ static enum i40iw_status_code i40iw_sc_qp_init(struct i40iw_sc_qp *qp, 
						    false);

	i40iw_debug(qp->dev, I40IW_DEBUG_WQE, "%s: hw_sq_size[%04d] sq_ring.size[%04d]\n",

		    __func__, qp->hw_sq_size, qp->qp_uk.sq_ring.size);



	switch (qp->pd->abi_ver) {

	case 4:

		ret_code = i40iw_fragcnt_to_wqesize_rq(qp->qp_uk.max_rq_frag_cnt,

						       &wqe_size);

		if (ret_code)

			return ret_code;

		break;

	case 5: /* fallthrough until next ABI version */

	default:

		if (qp->qp_uk.max_rq_frag_cnt > I40IW_MAX_WQ_FRAGMENT_COUNT)

			return I40IW_ERR_INVALID_FRAG_COUNT;

		wqe_size = I40IW_MAX_WQE_SIZE_RQ;

		break;

	}

	qp->hw_rq_size = i40iw_get_encoded_wqe_size(qp->qp_uk.rq_size *

				(wqe_size / I40IW_QP_WQE_MIN_SIZE), false);

	i40iw_debug(qp->dev, I40IW_DEBUG_WQE,

drivers/infiniband/hw/i40iw/i40iw_puda.c

+1 −1
Original line number Diff line number Diff line
@@ -930,7 +930,7 @@ enum i40iw_status_code i40iw_puda_create_rsrc(struct i40iw_sc_vsi *vsi, 
	INIT_LIST_HEAD(&rsrc->txpend);



	rsrc->tx_wqe_avail_cnt = info->sq_size - 1;

	dev->iw_pd_ops->pd_init(dev, &rsrc->sc_pd, info->pd_id);

	dev->iw_pd_ops->pd_init(dev, &rsrc->sc_pd, info->pd_id, -1);

	rsrc->qp_id = info->qp_id;

	rsrc->cq_id = info->cq_id;

	rsrc->sq_size = info->sq_size;

drivers/infiniband/hw/i40iw/i40iw_type.h

+3 −1
Original line number Diff line number Diff line
@@ -280,6 +280,7 @@ struct i40iw_sc_pd { 
	u32 size;

	struct i40iw_sc_dev *dev;

	u16 pd_id;

	int abi_ver;

};



struct i40iw_cqp_quanta {
@@ -852,6 +853,7 @@ struct i40iw_qp_init_info { 
	u64 host_ctx_pa;

	u64 q2_pa;

	u64 shadow_area_pa;

	int abi_ver;

	u8 sq_tph_val;

	u8 rq_tph_val;

	u8 type;
@@ -1051,7 +1053,7 @@ struct i40iw_aeq_ops { 
};



struct i40iw_pd_ops {

	void (*pd_init)(struct i40iw_sc_dev *, struct i40iw_sc_pd *, u16);

	void (*pd_init)(struct i40iw_sc_dev *, struct i40iw_sc_pd *, u16, int);

};



struct i40iw_priv_qp_ops {

drivers/infiniband/hw/i40iw/i40iw_ucontext.h

+2 −2
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ 


#include <linux/types.h>



#define I40IW_ABI_USERSPACE_VER 4

#define I40IW_ABI_KERNEL_VER    4

#define I40IW_ABI_VER 5



struct i40iw_alloc_ucontext_req {

	__u32 reserved32;

	__u8 userspace_ver;