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

Commit 8c32c4f2 authored by Doug Ledford's avatar Doug Ledford
Browse files

Merge branch 'k.o/for-4.12-rc' into k.o/for-4.13-mlx-shared

parents 4931c6ef d4702645

drivers/infiniband/core/addr.c

+1 −9
Original line number Diff line number Diff line
@@ -449,12 +449,7 @@ static int addr6_resolve(struct sockaddr_in6 *src_in, 
		return ret;



	rt = (struct rt6_info *)dst;

	if (ipv6_addr_any(&fl6.saddr)) {

		ret = ipv6_dev_get_saddr(addr->net, ip6_dst_idev(dst)->dev,

					 &fl6.daddr, 0, &fl6.saddr);

		if (ret)

			goto put;



	if (ipv6_addr_any(&src_in->sin6_addr)) {

		src_in->sin6_family = AF_INET6;

		src_in->sin6_addr = fl6.saddr;

	}
@@ -471,9 +466,6 @@ static int addr6_resolve(struct sockaddr_in6 *src_in, 


	*pdst = dst;

	return 0;

put:

	dst_release(dst);

	return ret;

}

#else

static int addr6_resolve(struct sockaddr_in6 *src_in,

drivers/infiniband/hw/bnxt_re/bnxt_re.h

+4 −0
Original line number Diff line number Diff line
@@ -56,6 +56,10 @@ 
#define BNXT_RE_MAX_SRQC_COUNT		(64 * 1024)

#define BNXT_RE_MAX_CQ_COUNT		(64 * 1024)



#define BNXT_RE_UD_QP_HW_STALL		0x400000



#define BNXT_RE_RQ_WQE_THRESHOLD	32



struct bnxt_re_work {

	struct work_struct	work;

	unsigned long		event;

drivers/infiniband/hw/bnxt_re/ib_verbs.c

+347 −124

File changed.

Preview size limit exceeded, changes collapsed.

drivers/infiniband/hw/bnxt_re/ib_verbs.h

+16 −6
Original line number Diff line number Diff line
@@ -44,11 +44,23 @@ struct bnxt_re_gid_ctx { 
	u32			refcnt;

};



#define BNXT_RE_FENCE_BYTES	64

struct bnxt_re_fence_data {

	u32 size;

	u8 va[BNXT_RE_FENCE_BYTES];

	dma_addr_t dma_addr;

	struct bnxt_re_mr *mr;

	struct ib_mw *mw;

	struct bnxt_qplib_swqe bind_wqe;

	u32 bind_rkey;

};



struct bnxt_re_pd {

	struct bnxt_re_dev	*rdev;

	struct ib_pd		ib_pd;

	struct bnxt_qplib_pd	qplib_pd;

	struct bnxt_qplib_dpi	dpi;

	struct bnxt_re_fence_data fence;

};



struct bnxt_re_ah {
@@ -62,6 +74,7 @@ struct bnxt_re_qp { 
	struct bnxt_re_dev	*rdev;

	struct ib_qp		ib_qp;

	spinlock_t		sq_lock;	/* protect sq */

	spinlock_t		rq_lock;	/* protect rq */

	struct bnxt_qplib_qp	qplib_qp;

	struct ib_umem		*sumem;

	struct ib_umem		*rumem;
@@ -181,12 +194,9 @@ int bnxt_re_map_mr_sg(struct ib_mr *ib_mr, struct scatterlist *sg, int sg_nents, 
struct ib_mr *bnxt_re_alloc_mr(struct ib_pd *ib_pd, enum ib_mr_type mr_type,

			       u32 max_num_sg);

int bnxt_re_dereg_mr(struct ib_mr *mr);

struct ib_fmr *bnxt_re_alloc_fmr(struct ib_pd *pd, int mr_access_flags,

				 struct ib_fmr_attr *fmr_attr);

int bnxt_re_map_phys_fmr(struct ib_fmr *fmr, u64 *page_list, int list_len,

			 u64 iova);

int bnxt_re_unmap_fmr(struct list_head *fmr_list);

int bnxt_re_dealloc_fmr(struct ib_fmr *fmr);

struct ib_mw *bnxt_re_alloc_mw(struct ib_pd *ib_pd, enum ib_mw_type type,

			       struct ib_udata *udata);

int bnxt_re_dealloc_mw(struct ib_mw *mw);

struct ib_mr *bnxt_re_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,

				  u64 virt_addr, int mr_access_flags,

				  struct ib_udata *udata);

drivers/infiniband/hw/bnxt_re/main.c

+0 −4
Original line number Diff line number Diff line
@@ -507,10 +507,6 @@ static int bnxt_re_register_ib(struct bnxt_re_dev *rdev) 
	ibdev->dereg_mr			= bnxt_re_dereg_mr;

	ibdev->alloc_mr			= bnxt_re_alloc_mr;

	ibdev->map_mr_sg		= bnxt_re_map_mr_sg;

	ibdev->alloc_fmr		= bnxt_re_alloc_fmr;

	ibdev->map_phys_fmr		= bnxt_re_map_phys_fmr;

	ibdev->unmap_fmr		= bnxt_re_unmap_fmr;

	ibdev->dealloc_fmr		= bnxt_re_dealloc_fmr;



	ibdev->reg_user_mr		= bnxt_re_reg_user_mr;

	ibdev->alloc_ucontext		= bnxt_re_alloc_ucontext;