Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 17 Feb 2015 10:00:16 +0000 (UTC)
From:      Hans Petter Selasky <hselasky@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r278894 - in head/sys: conf ofed/drivers/infiniband/hw/mlx4 ofed/drivers/infiniband/ulp/sdp
Message-ID:  <201502171000.t1HA0GpS014384@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: hselasky
Date: Tue Feb 17 10:00:15 2015
New Revision: 278894
URL: https://svnweb.freebsd.org/changeset/base/278894

Log:
  Fix compilation of the SDP driver and a compile warning after r278886.
  Also fix the kernel build rule for mlx4_exp.c.
  This fixes the LINT kernel target for amd64.
  
  Sponsored by:	Mellanox Technologies
  MFC after:	1 month

Modified:
  head/sys/conf/files
  head/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c
  head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c
  head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c
  head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Tue Feb 17 09:40:36 2015	(r278893)
+++ head/sys/conf/files	Tue Feb 17 10:00:15 2015	(r278894)
@@ -3739,7 +3739,7 @@ ofed/drivers/infiniband/hw/mlx4/main.c		
 	no-depend obj-prefix "mlx4ib_"					\
 	compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/infiniband/hw/mlx4/"
 ofed/drivers/infiniband/hw/mlx4/mlx4_exp.c	optional mlx4ib		\
-	no-depend \
+	no-depend obj-prefix "mlx4ib_"					\
 	compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/infiniband/hw/mlx4/"
 ofed/drivers/infiniband/hw/mlx4/mr.c		optional mlx4ib		\
 	no-depend obj-prefix "mlx4ib_"					\

Modified: head/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c
==============================================================================
--- head/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c	Tue Feb 17 09:40:36 2015	(r278893)
+++ head/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c	Tue Feb 17 10:00:15 2015	(r278894)
@@ -668,7 +668,7 @@ static void mlx4_ib_mcg_work_handler(str
 			if (!list_empty(&group->pending_list))
 				req = list_first_entry(&group->pending_list,
 						struct mcast_req, group_list);
-			if ((method == IB_MGMT_METHOD_GET_RESP)) {
+			if (method == IB_MGMT_METHOD_GET_RESP) {
 					if (req) {
 						send_reply_to_slave(req->func, group, &req->sa_mad, status);
 						--group->func[req->func].num_pend_reqs;

Modified: head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c
==============================================================================
--- head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c	Tue Feb 17 09:40:36 2015	(r278893)
+++ head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c	Tue Feb 17 10:00:15 2015	(r278894)
@@ -129,7 +129,7 @@ sdp_pcbbind(struct sdp_sock *ssk, struct
 	/* rdma_bind_addr handles bind races.  */
 	SDP_WUNLOCK(ssk);
 	if (ssk->id == NULL)
-		ssk->id = rdma_create_id(sdp_cma_handler, ssk, RDMA_PS_SDP);
+		ssk->id = rdma_create_id(sdp_cma_handler, ssk, RDMA_PS_SDP, IB_QPT_RC);
 	if (ssk->id == NULL) {
 		SDP_WLOCK(ssk);
 		return (ENOMEM);
@@ -1702,11 +1702,15 @@ int sdp_mod_usec = 0;
 void
 sdp_set_default_moderation(struct sdp_sock *ssk)
 {
+	struct ib_cq_attr attr;
 	if (sdp_mod_count <= 0 || sdp_mod_usec <= 0)
 		return;
-	ib_modify_cq(ssk->rx_ring.cq, sdp_mod_count, sdp_mod_usec);
-}
+	memset(&attr, 0, sizeof(attr));
+	attr.moderation.cq_count = sdp_mod_count;
+	attr.moderation.cq_period = sdp_mod_usec;
 
+	ib_modify_cq(ssk->rx_ring.cq, &attr, IB_CQ_MODERATION);
+}
 
 static void
 sdp_dev_add(struct ib_device *device)

Modified: head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c
==============================================================================
--- head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c	Tue Feb 17 09:40:36 2015	(r278893)
+++ head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c	Tue Feb 17 10:00:15 2015	(r278894)
@@ -736,7 +736,7 @@ sdp_rx_ring_create(struct sdp_sock *ssk,
 	}
 
 	rx_cq = ib_create_cq(device, sdp_rx_irq, sdp_rx_cq_event_handler,
-			  ssk->socket, SDP_RX_SIZE, IB_CQ_VECTOR_LEAST_ATTACHED);
+			  ssk->socket, SDP_RX_SIZE, 0);
 
 	if (IS_ERR(rx_cq)) {
 		rc = PTR_ERR(rx_cq);

Modified: head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c
==============================================================================
--- head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c	Tue Feb 17 09:40:36 2015	(r278893)
+++ head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c	Tue Feb 17 10:00:15 2015	(r278894)
@@ -438,7 +438,7 @@ sdp_tx_ring_create(struct sdp_sock *ssk,
 	}
 
 	tx_cq = ib_create_cq(device, sdp_tx_irq, sdp_tx_cq_event_handler,
-			  ssk, SDP_TX_SIZE, IB_CQ_VECTOR_LEAST_ATTACHED);
+			  ssk, SDP_TX_SIZE, 0);
 
 	if (IS_ERR(tx_cq)) {
 		rc = PTR_ERR(tx_cq);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502171000.t1HA0GpS014384>