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

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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  RDMA/nes: Formatting cleanup
  RDMA/nes: Add support for SFP+ PHY
  RDMA/nes: Use LRO
  IPoIB: Copy child MTU from parent
  IB/mthca: Avoid changing userspace ABI to handle DMA write barrier attribute
  IB/mthca: Avoid recycling old FMR R_Keys too soon
  mlx4_core: Avoid recycling old FMR R_Keys too soon
  IB/ehca: Allocate event queue size depending on max number of CQs and QPs
  IPoIB: Use separate CQ for UD send completions
  IB/iser: Count FMR alignment violations per session
  IB/iser: Move high-volume debug output to higher debug level
  IB/ehca: handle negative return value from ibmebus_request_irq() properly
  RDMA/cxgb3: Support peer-2-peer connection setup
  RDMA/cxgb3: Set the max_mr_size device attribute correctly
  RDMA/cxgb3: Correctly serialize peer abort path
  mlx4_core: Add a way to set the "collapsed" CQ flag
parents eeb85d0b 7495ab68

drivers/infiniband/hw/cxgb3/cxio_hal.c

+16 −2
Original line number Diff line number Diff line
@@ -456,7 +456,8 @@ void cxio_count_scqes(struct t3_cq *cq, struct t3_wq *wq, int *count) 
	ptr = cq->sw_rptr;

	while (!Q_EMPTY(ptr, cq->sw_wptr)) {

		cqe = cq->sw_queue + (Q_PTR2IDX(ptr, cq->size_log2));

		if ((SQ_TYPE(*cqe) || (CQE_OPCODE(*cqe) == T3_READ_RESP)) &&

		if ((SQ_TYPE(*cqe) ||

		     ((CQE_OPCODE(*cqe) == T3_READ_RESP) && wq->oldest_read)) &&

		    (CQE_QPID(*cqe) == wq->qpid))

			(*count)++;

		ptr++;
@@ -829,7 +830,8 @@ int cxio_rdma_init(struct cxio_rdev *rdev_p, struct t3_rdma_init_attr *attr) 
	wqe->mpaattrs = attr->mpaattrs;

	wqe->qpcaps = attr->qpcaps;

	wqe->ulpdu_size = cpu_to_be16(attr->tcp_emss);

	wqe->flags = cpu_to_be32(attr->flags);

	wqe->rqe_count = cpu_to_be16(attr->rqe_count);

	wqe->flags_rtr_type = cpu_to_be16(attr->flags|V_RTR_TYPE(attr->rtr_type));

	wqe->ord = cpu_to_be32(attr->ord);

	wqe->ird = cpu_to_be32(attr->ird);

	wqe->qp_dma_addr = cpu_to_be64(attr->qp_dma_addr);
@@ -1134,6 +1136,18 @@ int cxio_poll_cq(struct t3_wq *wq, struct t3_cq *cq, struct t3_cqe *cqe, 
	 */

	if (RQ_TYPE(*hw_cqe) && (CQE_OPCODE(*hw_cqe) == T3_READ_RESP)) {



		/*

		 * If this is an unsolicited read response, then the read

		 * was generated by the kernel driver as part of peer-2-peer

		 * connection setup.  So ignore the completion.

		 */

		if (!wq->oldest_read) {

			if (CQE_STATUS(*hw_cqe))

				wq->error = 1;

			ret = -1;

			goto skip_cqe;

		}



		/*

		 * Don't write to the HWCQ, so create a new read req CQE

		 * in local memory.

drivers/infiniband/hw/cxgb3/cxio_hal.h

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#define T3_MAX_PBL_SIZE 256

#define T3_MAX_RQ_SIZE 1024

#define T3_MAX_NUM_STAG (1<<15)

#define T3_MAX_MR_SIZE 0x100000000ULL



#define T3_STAG_UNSET 0xffffffff

drivers/infiniband/hw/cxgb3/cxio_wr.h

+17 −4
Original line number Diff line number Diff line
@@ -278,6 +278,17 @@ enum t3_qp_caps { 
	uP_RI_QP_STAG0_ENABLE = 0x10

} __attribute__ ((packed));



enum rdma_init_rtr_types {

	RTR_READ = 1,

	RTR_WRITE = 2,

	RTR_SEND = 3,

};



#define S_RTR_TYPE	2

#define M_RTR_TYPE	0x3

#define V_RTR_TYPE(x)	((x) << S_RTR_TYPE)

#define G_RTR_TYPE(x)	((((x) >> S_RTR_TYPE)) & M_RTR_TYPE)



struct t3_rdma_init_attr {

	u32 tid;

	u32 qpid;
@@ -293,7 +304,9 @@ struct t3_rdma_init_attr { 
	u32 ird;

	u64 qp_dma_addr;

	u32 qp_dma_size;

	u32 flags;

	enum rdma_init_rtr_types rtr_type;

	u16 flags;

	u16 rqe_count;

	u32 irs;

};
@@ -309,8 +322,8 @@ struct t3_rdma_init_wr { 
	u8 mpaattrs;		/* 5 */

	u8 qpcaps;

	__be16 ulpdu_size;

	__be32 flags;		/* bits 31-1 - reservered */

				/* bit     0 - set if RECV posted */

	__be16 flags_rtr_type;

	__be16 rqe_count;

	__be32 ord;		/* 6 */

	__be32 ird;

	__be64 qp_dma_addr;	/* 7 */
@@ -324,7 +337,7 @@ struct t3_genbit { 
};



enum rdma_init_wr_flags {

	RECVS_POSTED = (1<<0),

	MPA_INITIATOR = (1<<0),

	PRIV_QP = (1<<1),

};

drivers/infiniband/hw/cxgb3/iwch.c

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ static void rnic_init(struct iwch_dev *rnicp) 
	rnicp->attr.max_phys_buf_entries = T3_MAX_PBL_SIZE;

	rnicp->attr.max_pds = T3_MAX_NUM_PD - 1;

	rnicp->attr.mem_pgsizes_bitmask = 0x7FFF;	/* 4KB-128MB */

	rnicp->attr.max_mr_size = T3_MAX_MR_SIZE;

	rnicp->attr.can_resize_wq = 0;

	rnicp->attr.max_rdma_reads_per_qp = 8;

	rnicp->attr.max_rdma_read_resources =

drivers/infiniband/hw/cxgb3/iwch.h

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ struct iwch_rnic_attributes { 
	 * size (4k)^i.  Phys block list mode unsupported.

	 */

	u32 mem_pgsizes_bitmask;

	u64 max_mr_size;

	u8 can_resize_wq;



	/*