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

Commit 9118626a 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: Update missed conversion of flush_scheduled_work()
  RDMA/ucma: Copy iWARP route information on queries
  RDMA/amso1100: Fix compile warnings
  RDMA/cxgb4: Set the correct device physical function for iWARP connections
  RDMA/cxgb4: Limit MAXBURST EQ context field to 256B
  IB/qib: Hold link for TX SERDES settings
  mlx4_core: Add ConnectX-3 device IDs
parents aba99437 e51c7b1a

drivers/infiniband/core/sa_query.c

+1 −1
Original line number Diff line number Diff line
@@ -1079,7 +1079,7 @@ static void ib_sa_remove_one(struct ib_device *device) 


	ib_unregister_event_handler(&sa_dev->event_handler);



	flush_scheduled_work();

	flush_workqueue(ib_wq);



	for (i = 0; i <= sa_dev->end_port - sa_dev->start_port; ++i) {

		if (rdma_port_get_link_layer(device, i + 1) == IB_LINK_LAYER_INFINIBAND) {

drivers/infiniband/core/ucma.c

+20 −2
Original line number Diff line number Diff line
@@ -636,6 +636,16 @@ static void ucma_copy_iboe_route(struct rdma_ucm_query_route_resp *resp, 
	}

}



static void ucma_copy_iw_route(struct rdma_ucm_query_route_resp *resp,

			       struct rdma_route *route)

{

	struct rdma_dev_addr *dev_addr;



	dev_addr = &route->addr.dev_addr;

	rdma_addr_get_dgid(dev_addr, (union ib_gid *) &resp->ib_route[0].dgid);

	rdma_addr_get_sgid(dev_addr, (union ib_gid *) &resp->ib_route[0].sgid);

}



static ssize_t ucma_query_route(struct ucma_file *file,

				const char __user *inbuf,

				int in_len, int out_len)
@@ -670,8 +680,10 @@ static ssize_t ucma_query_route(struct ucma_file *file, 


	resp.node_guid = (__force __u64) ctx->cm_id->device->node_guid;

	resp.port_num = ctx->cm_id->port_num;

	if (rdma_node_get_transport(ctx->cm_id->device->node_type) == RDMA_TRANSPORT_IB) {

		switch (rdma_port_get_link_layer(ctx->cm_id->device, ctx->cm_id->port_num)) {

	switch (rdma_node_get_transport(ctx->cm_id->device->node_type)) {

	case RDMA_TRANSPORT_IB:

		switch (rdma_port_get_link_layer(ctx->cm_id->device,

			ctx->cm_id->port_num)) {

		case IB_LINK_LAYER_INFINIBAND:

			ucma_copy_ib_route(&resp, &ctx->cm_id->route);

			break;
@@ -681,6 +693,12 @@ static ssize_t ucma_query_route(struct ucma_file *file, 
		default:

			break;

		}

		break;

	case RDMA_TRANSPORT_IWARP:

		ucma_copy_iw_route(&resp, &ctx->cm_id->route);

		break;

	default:

		break;

	}



out:

drivers/infiniband/hw/amso1100/c2_vq.c

+3 −3
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ struct c2_vq_req *vq_req_alloc(struct c2_dev *c2dev) 
	r = kmalloc(sizeof(struct c2_vq_req), GFP_KERNEL);

	if (r) {

		init_waitqueue_head(&r->wait_object);

		r->reply_msg = (u64) NULL;

		r->reply_msg = 0;

		r->event = 0;

		r->cm_id = NULL;

		r->qp = NULL;
@@ -123,7 +123,7 @@ struct c2_vq_req *vq_req_alloc(struct c2_dev *c2dev) 
 */

void vq_req_free(struct c2_dev *c2dev, struct c2_vq_req *r)

{

	r->reply_msg = (u64) NULL;

	r->reply_msg = 0;

	if (atomic_dec_and_test(&r->refcnt)) {

		kfree(r);

	}
@@ -151,7 +151,7 @@ void vq_req_get(struct c2_dev *c2dev, struct c2_vq_req *r) 
void vq_req_put(struct c2_dev *c2dev, struct c2_vq_req *r)

{

	if (atomic_dec_and_test(&r->refcnt)) {

		if (r->reply_msg != (u64) NULL)

		if (r->reply_msg != 0)

			vq_repbuf_free(c2dev,

				       (void *) (unsigned long) r->reply_msg);

		kfree(r);

drivers/infiniband/hw/cxgb4/cm.c

+1 −1
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ static void send_flowc(struct c4iw_ep *ep, struct sk_buff *skb) 
					  16)) | FW_WR_FLOWID(ep->hwtid));



	flowc->mnemval[0].mnemonic = FW_FLOWC_MNEM_PFNVFN;

	flowc->mnemval[0].val = cpu_to_be32(0);

	flowc->mnemval[0].val = cpu_to_be32(PCI_FUNC(ep->com.dev->rdev.lldi.pdev->devfn) << 8);

	flowc->mnemval[1].mnemonic = FW_FLOWC_MNEM_CH;

	flowc->mnemval[1].val = cpu_to_be32(ep->tx_chan);

	flowc->mnemval[2].mnemonic = FW_FLOWC_MNEM_PORT;

drivers/infiniband/hw/cxgb4/qp.c

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

		V_FW_RI_RES_WR_DCACPU(0) |

		V_FW_RI_RES_WR_FBMIN(2) |

		V_FW_RI_RES_WR_FBMAX(3) |

		V_FW_RI_RES_WR_FBMAX(2) |

		V_FW_RI_RES_WR_CIDXFTHRESHO(0) |

		V_FW_RI_RES_WR_CIDXFTHRESH(0) |

		V_FW_RI_RES_WR_EQSIZE(eqsize));
@@ -243,7 +243,7 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq, 
		V_FW_RI_RES_WR_DCAEN(0) |

		V_FW_RI_RES_WR_DCACPU(0) |

		V_FW_RI_RES_WR_FBMIN(2) |

		V_FW_RI_RES_WR_FBMAX(3) |

		V_FW_RI_RES_WR_FBMAX(2) |

		V_FW_RI_RES_WR_CIDXFTHRESHO(0) |

		V_FW_RI_RES_WR_CIDXFTHRESH(0) |

		V_FW_RI_RES_WR_EQSIZE(eqsize));