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

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

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

Pull infiniband changes from Roland Dreier:
  "Second batch of changes for the 3.7 merge window:
   - Late-breaking fix for IPoIB on mlx4 SR-IOV VFs.
   - Fix for IPoIB build breakage with CONFIG_INFINIBAND_IPOIB_CM=n (new
     netlink config changes are to blame).
   - Make sure retry count values are in range in RDMA CM.
   - A few nes hardware driver fixes and cleanups.
   - Have iSER initiator use >1 interrupt vectors if available."

* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  RDMA/cma: Check that retry count values are in range
  IB/iser: Add more RX CQs to scale out processing of SCSI responses
  RDMA/nes: Bump the version number of nes driver
  RDMA/nes: Remove unused module parameter "send_first"
  RDMA/nes: Remove unnecessary if-else statement
  RDMA/nes: Add missing break to switch.
  mlx4_core: Adjust flow steering attach wrapper so that IB works on SR-IOV VFs
  IPoIB: Fix build with CONFIG_INFINIBAND_IPOIB_CM=n
parents ed5062dd 56040f07

drivers/infiniband/core/cma.c

+3 −3
Original line number Diff line number Diff line
@@ -2648,8 +2648,8 @@ static int cma_connect_ib(struct rdma_id_private *id_priv, 
	req.responder_resources = conn_param->responder_resources;

	req.initiator_depth = conn_param->initiator_depth;

	req.flow_control = conn_param->flow_control;

	req.retry_count = conn_param->retry_count;

	req.rnr_retry_count = conn_param->rnr_retry_count;

	req.retry_count = min_t(u8, 7, conn_param->retry_count);

	req.rnr_retry_count = min_t(u8, 7, conn_param->rnr_retry_count);

	req.remote_cm_response_timeout = CMA_CM_RESPONSE_TIMEOUT;

	req.local_cm_response_timeout = CMA_CM_RESPONSE_TIMEOUT;

	req.max_cm_retries = CMA_MAX_CM_RETRIES;
@@ -2770,7 +2770,7 @@ static int cma_accept_ib(struct rdma_id_private *id_priv, 
	rep.initiator_depth = conn_param->initiator_depth;

	rep.failover_accepted = 0;

	rep.flow_control = conn_param->flow_control;

	rep.rnr_retry_count = conn_param->rnr_retry_count;

	rep.rnr_retry_count = min_t(u8, 7, conn_param->rnr_retry_count);

	rep.srq = id_priv->srq ? 1 : 0;



	ret = ib_send_cm_rep(id_priv->cm_id.ib, &rep);

drivers/infiniband/hw/nes/nes.c

+0 −5
Original line number Diff line number Diff line
@@ -79,11 +79,6 @@ int disable_mpa_crc = 0; 
module_param(disable_mpa_crc, int, 0644);

MODULE_PARM_DESC(disable_mpa_crc, "Disable checking of MPA CRC");



unsigned int send_first = 0;

module_param(send_first, int, 0644);

MODULE_PARM_DESC(send_first, "Send RDMA Message First on Active Connection");





unsigned int nes_drv_opt = NES_DRV_OPT_DISABLE_INT_MOD | NES_DRV_OPT_ENABLE_PAU;

module_param(nes_drv_opt, int, 0644);

MODULE_PARM_DESC(nes_drv_opt, "Driver option parameters");

drivers/infiniband/hw/nes/nes.h

+1 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
#define QUEUE_DISCONNECTS



#define DRV_NAME    "iw_nes"

#define DRV_VERSION "1.5.0.0"

#define DRV_VERSION "1.5.0.1"

#define PFX         DRV_NAME ": "



/*
@@ -172,7 +172,6 @@ extern int interrupt_mod_interval; 
extern int nes_if_count;

extern int mpa_version;

extern int disable_mpa_crc;

extern unsigned int send_first;

extern unsigned int nes_drv_opt;

extern unsigned int nes_debug_level;

extern unsigned int wqm_quanta;

drivers/infiniband/hw/nes/nes_verbs.c

+4 −12
Original line number Diff line number Diff line
@@ -3006,6 +3006,7 @@ int nes_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, 
					switch (nesqp->hw_iwarp_state) {

						case NES_AEQE_IWARP_STATE_CLOSING:

							next_iwarp_state = NES_CQP_QP_IWARP_STATE_CLOSING;

							break;

						case NES_AEQE_IWARP_STATE_TERMINATE:

							next_iwarp_state = NES_CQP_QP_IWARP_STATE_TERMINATE;

							break;
@@ -3068,19 +3069,10 @@ int nes_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, 
		}



		nesqp->ibqp_state = attr->qp_state;

		if (((nesqp->iwarp_state & NES_CQP_QP_IWARP_STATE_MASK) ==

				(u32)NES_CQP_QP_IWARP_STATE_RTS) &&

				((next_iwarp_state & NES_CQP_QP_IWARP_STATE_MASK) >

				(u32)NES_CQP_QP_IWARP_STATE_RTS)) {

			nesqp->iwarp_state = next_iwarp_state & NES_CQP_QP_IWARP_STATE_MASK;

			nes_debug(NES_DBG_MOD_QP, "Change nesqp->iwarp_state=%08x\n",

					nesqp->iwarp_state);

		} else {

		nesqp->iwarp_state = next_iwarp_state & NES_CQP_QP_IWARP_STATE_MASK;

		nes_debug(NES_DBG_MOD_QP, "Change nesqp->iwarp_state=%08x\n",

				nesqp->iwarp_state);

	}

	}



	if (attr_mask & IB_QP_ACCESS_FLAGS) {

		if (attr->qp_access_flags & IB_ACCESS_LOCAL_WRITE) {

drivers/infiniband/ulp/ipoib/ipoib.h

+2 −2
Original line number Diff line number Diff line
@@ -535,14 +535,14 @@ void ipoib_drain_cq(struct net_device *dev); 
void ipoib_set_ethtool_ops(struct net_device *dev);

int ipoib_set_dev_features(struct ipoib_dev_priv *priv, struct ib_device *hca);



#ifdef CONFIG_INFINIBAND_IPOIB_CM



#define IPOIB_FLAGS_RC		0x80

#define IPOIB_FLAGS_UC		0x40



/* We don't support UC connections at the moment */

#define IPOIB_CM_SUPPORTED(ha)   (ha[0] & (IPOIB_FLAGS_RC))



#ifdef CONFIG_INFINIBAND_IPOIB_CM



extern int ipoib_max_conn_qp;



static inline int ipoib_cm_admin_enabled(struct net_device *dev)