Skip to contentSkip to conversation

InfiniBand fixes for 2.6.17-rc2

GIT PULL Roland Dreier 1 participant 1 message Apr 19, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Linus, please pull from

master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git for-linus

This tree is also available from kernel.org mirrors at:

git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git for-linus

This is mostly (by total lines of patch) cleanups for the ipath driver, with a few other fixes thrown in.

The exact changes and patch are:

Adrian Bunk:
IB/mthca: make a function static

Hal Rosenstock:
IB/mad: Fix RMPP version check during agent registration

Roland Dreier:
IB/srp: Remove request from list when SCSI abort succeeds IB/ipath: Make more names static
IB/ipath: Fix whitespace

 drivers/infiniband/core/mad.c              |    5 -
 drivers/infiniband/hw/ipath/ipath_diag.c   |   12 ---
 drivers/infiniband/hw/ipath/ipath_driver.c |    2 
 drivers/infiniband/hw/ipath/ipath_intr.c   |    4 -
 drivers/infiniband/hw/ipath/ipath_kernel.h |    1 
 drivers/infiniband/hw/ipath/ipath_layer.c  |    2 
 drivers/infiniband/hw/ipath/ipath_pe800.c  |   10 +-
 drivers/infiniband/hw/ipath/ipath_qp.c     |  124 ++++++++++++++--------------
 drivers/infiniband/hw/ipath/ipath_ud.c     |    4 -
 drivers/infiniband/hw/ipath/ipath_verbs.c  |  122 ++++++++++++++--------------
 drivers/infiniband/hw/ipath/ipath_verbs.h  |    5 -
 drivers/infiniband/hw/mthca/mthca_mad.c    |    2 
 drivers/infiniband/ulp/srp/ib_srp.c        |   18 ++--
 13 files changed, 147 insertions(+), 164 deletions(-)
drivers/infiniband/core/mad.c +1 -4
index 3a702da..469b692 100644
@@ -228,10 +228,7 @@ struct ib_mad_agent *ib_register_mad_age
 				goto error1;
 		}
 		/* Make sure class supplied is consistent with RMPP */
-		if (ib_is_mad_class_rmpp(mad_reg_req->mgmt_class)) {
-			if (!rmpp_version)
-				goto error1;
-		} else {
+		if (!ib_is_mad_class_rmpp(mad_reg_req->mgmt_class)) {
 			if (rmpp_version)
 				goto error1;
 		}
drivers/infiniband/hw/ipath/ipath_diag.c +0 -12
index cd533cf..7d3fb69 100644
@@ -365,15 +365,3 @@ static ssize_t ipath_diag_write(struct f
 bail:
 	return ret;
 }
-
-void ipath_diag_bringup_link(struct ipath_devdata *dd)
-{
-	if (diag_set_link || (dd->ipath_flags & IPATH_LINKACTIVE))
-		return;
-
-	diag_set_link = 1;
-	ipath_cdbg(VERBOSE, "Trying to set to set link active for "
-		   "diag pkt\n");
-	ipath_layer_set_linkstate(dd, IPATH_IB_LINKARM);
-	ipath_layer_set_linkstate(dd, IPATH_IB_LINKACTIVE);
-}
drivers/infiniband/hw/ipath/ipath_driver.c +1 -1
index 58a94ef..e7617c3 100644
@@ -1729,7 +1729,7 @@ void ipath_free_pddata(struct ipath_devd
 	}
 }
 
-int __init infinipath_init(void)
+static int __init infinipath_init(void)
 {
 	int ret;
 
drivers/infiniband/hw/ipath/ipath_intr.c +2 -2
index 60f5f41..0bcb428 100644
@@ -172,8 +172,8 @@ static void handle_e_ibstatuschanged(str
 				   "was %s\n", dd->ipath_unit,
 				   ib_linkstate(lstate),
 				   ib_linkstate((unsigned)
-				   		dd->ipath_lastibcstat
-				   		& IPATH_IBSTATE_MASK));
+						dd->ipath_lastibcstat
+						& IPATH_IBSTATE_MASK));
 	}
 	else {
 		lstate = dd->ipath_lastibcstat & IPATH_IBSTATE_MASK;
drivers/infiniband/hw/ipath/ipath_kernel.h +0 -1
index 159d0ae..0ce5f19 100644
@@ -528,7 +528,6 @@ extern spinlock_t ipath_devs_lock;
 extern struct ipath_devdata *ipath_lookup(int unit);
 
 extern u16 ipath_layer_rcv_opcode;
-extern int ipath_verbs_registered;
 extern int __ipath_layer_intr(struct ipath_devdata *, u32);
 extern int ipath_layer_intr(struct ipath_devdata *, u32);
 extern int __ipath_layer_rcv(struct ipath_devdata *, void *,
drivers/infiniband/hw/ipath/ipath_layer.c +1 -1
index 2cabf63..69ed110 100644
@@ -52,7 +52,7 @@ static int (*layer_rcv)(void *, void *, 
 static int (*layer_rcv_lid)(void *, void *);
 static int (*verbs_piobufavail)(void *);
 static void (*verbs_rcv)(void *, void *, void *, u32);
-int ipath_verbs_registered;
+static int ipath_verbs_registered;
 
 static void *(*layer_add_one)(int, struct ipath_devdata *);
 static void (*layer_remove_one)(void *);
drivers/infiniband/hw/ipath/ipath_pe800.c +5 -5
index e693a7a..e1dc4f7 100644
@@ -305,8 +305,8 @@ static const struct ipath_cregs ipath_pe
  * we'll print them and continue.  We reuse the same message buffer as
  * ipath_handle_errors() to avoid excessive stack usage.
  */
-void ipath_pe_handle_hwerrors(struct ipath_devdata *dd, char *msg,
-	size_t msgl)
+static void ipath_pe_handle_hwerrors(struct ipath_devdata *dd, char *msg,
+				     size_t msgl)
 {
 	ipath_err_t hwerrs;
 	u32 bits, ctrl;
@@ -552,7 +552,7 @@ static int ipath_pe_boardname(struct ipa
  * freeze mode), and enable hardware errors as errors (along with
  * everything else) in errormask
  */
-void ipath_pe_init_hwerrors(struct ipath_devdata *dd)
+static void ipath_pe_init_hwerrors(struct ipath_devdata *dd)
 {
 	ipath_err_t val;
 	u64 extsval;
@@ -577,7 +577,7 @@ void ipath_pe_init_hwerrors(struct ipath
  * ipath_pe_bringup_serdes - bring up the serdes
  * @dd: the infinipath device
  */
-int ipath_pe_bringup_serdes(struct ipath_devdata *dd)
+static int ipath_pe_bringup_serdes(struct ipath_devdata *dd)
 {
 	u64 val, tmp, config1;
 	int ret = 0, change = 0;
@@ -694,7 +694,7 @@ int ipath_pe_bringup_serdes(struct ipath
  * @dd: the infinipath device
  * Called when driver is being unloaded
  */
-void ipath_pe_quiet_serdes(struct ipath_devdata *dd)
+static void ipath_pe_quiet_serdes(struct ipath_devdata *dd)
 {
 	u64 val = ipath_read_kreg64(dd, dd->ipath_kregs->kr_serdesconfig0);
 
drivers/infiniband/hw/ipath/ipath_qp.c +62 -62

148 lines not on this page · raw message

drivers/infiniband/hw/ipath/ipath_ud.c +2 -2
index 5ff3de6..01cfb30 100644
@@ -46,8 +46,8 @@
  * This is called from ipath_post_ud_send() to forward a WQE addressed
  * to the same HCA.
  */
-void ipath_ud_loopback(struct ipath_qp *sqp, struct ipath_sge_state *ss,
-		       u32 length, struct ib_send_wr *wr, struct ib_wc *wc)
+static void ipath_ud_loopback(struct ipath_qp *sqp, struct ipath_sge_state *ss,
+			      u32 length, struct ib_send_wr *wr, struct ib_wc *wc)
 {
 	struct ipath_ibdev *dev = to_idev(sqp->ibqp.device);
 	struct ipath_qp *qp;
drivers/infiniband/hw/ipath/ipath_verbs.c +61 -61

180 lines not on this page · raw message

drivers/infiniband/hw/ipath/ipath_verbs.h +0 -5
index b824632..fcafbc7 100644
@@ -577,8 +577,6 @@ int ipath_init_qp_table(struct ipath_ibd
 
 void ipath_sqerror_qp(struct ipath_qp *qp, struct ib_wc *wc);
 
-void ipath_error_qp(struct ipath_qp *qp);
-
 void ipath_get_credit(struct ipath_qp *qp, u32 aeth);
 
 void ipath_do_rc_send(unsigned long data);
@@ -607,9 +605,6 @@ void ipath_rc_rcv(struct ipath_ibdev *de
 
 void ipath_restart_rc(struct ipath_qp *qp, u32 psn, struct ib_wc *wc);
 
-void ipath_ud_loopback(struct ipath_qp *sqp, struct ipath_sge_state *ss,
-		       u32 length, struct ib_send_wr *wr, struct ib_wc *wc);
-
 int ipath_post_ud_send(struct ipath_qp *qp, struct ib_send_wr *wr);
 
 void ipath_ud_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
drivers/infiniband/hw/mthca/mthca_mad.c +1 -1
index f235c7e..4730863 100644
@@ -49,7 +49,7 @@ enum {
 	MTHCA_VENDOR_CLASS2 = 0xa
 };
 
-int mthca_update_rate(struct mthca_dev *dev, u8 port_num)
+static int mthca_update_rate(struct mthca_dev *dev, u8 port_num)
 {
 	struct ib_port_attr *tprops = NULL;
 	int                  ret;
drivers/infiniband/ulp/srp/ib_srp.c +11 -7
index 5f2b3f6..5bb5574 100644
@@ -617,6 +617,14 @@ static void srp_unmap_data(struct scsi_c
 		     scmnd->sc_data_direction);
 }
 
+static void srp_remove_req(struct srp_target_port *target, struct srp_request *req,
+			   int index)
+{
+	list_del(&req->list);
+	req->next = target->req_head;
+	target->req_head = index;
+}
+
 static void srp_process_rsp(struct srp_target_port *target, struct srp_rsp *rsp)
 {
 	struct srp_request *req;
@@ -664,9 +672,7 @@ static void srp_process_rsp(struct srp_t
 			scmnd->host_scribble = (void *) -1L;
 			scmnd->scsi_done(scmnd);
 
-			list_del(&req->list);
-			req->next = target->req_head;
-			target->req_head = rsp->tag & ~SRP_TAG_TSK_MGMT;
+			srp_remove_req(target, req, rsp->tag & ~SRP_TAG_TSK_MGMT);
 		} else
 			req->cmd_done = 1;
 	}
@@ -1188,12 +1194,10 @@ static int srp_send_tsk_mgmt(struct scsi
 	spin_lock_irq(target->scsi_host->host_lock);
 
 	if (req->cmd_done) {
-		list_del(&req->list);
-		req->next = target->req_head;
-		target->req_head = req_index;
-
+		srp_remove_req(target, req, req_index);
 		scmnd->scsi_done(scmnd);
 	} else if (!req->tsk_status) {
+		srp_remove_req(target, req, req_index);
 		scmnd->result = DID_ABORT << 16;
 		ret = SUCCESS;
 	}