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

Commit dba92d3b 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:
  IPoIB: Allocate priv->tx_ring with vmalloc()
  IPoIB/cm: Set tx_wr.num_sge in connected mode post_send()
  IPoIB: Don't drop multicast sends when they can be queued
  IB/ipath: Reset the retry counter for RDMA_READ_RESPONSE_MIDDLE packets
  IB/ipath: Fix error completion put on send CQ instead of recv CQ
  IB/ipath: Fix RC QP initialization
  IB/ipath: Fix potentially wrong RNR retry counter returned in ipath_query_qp()
  IB/ipath: Fix IB compliance problems with link state vs physical state
parents b1881fb1 10313cbb

drivers/infiniband/hw/ipath/ipath_common.h

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ 
#define IPATH_IB_LINKDOWN		0

#define IPATH_IB_LINKARM		1

#define IPATH_IB_LINKACTIVE		2

#define IPATH_IB_LINKINIT		3

#define IPATH_IB_LINKDOWN_ONLY		3

#define IPATH_IB_LINKDOWN_SLEEP		4

#define IPATH_IB_LINKDOWN_DISABLE	5

#define IPATH_IB_LINK_LOOPBACK	6 /* enable local loopback */

drivers/infiniband/hw/ipath/ipath_driver.c

+12 −16
Original line number Diff line number Diff line
@@ -851,8 +851,7 @@ void ipath_disarm_piobufs(struct ipath_devdata *dd, unsigned first, 
 * -ETIMEDOUT state can have multiple states set, for any of several

 * transitions.

 */

static int ipath_wait_linkstate(struct ipath_devdata *dd, u32 state,

				int msecs)

int ipath_wait_linkstate(struct ipath_devdata *dd, u32 state, int msecs)

{

	dd->ipath_state_wanted = state;

	wait_event_interruptible_timeout(ipath_state_wait,
@@ -1656,8 +1655,8 @@ void ipath_cancel_sends(struct ipath_devdata *dd, int restore_sendctrl) 
static void ipath_set_ib_lstate(struct ipath_devdata *dd, int which)

{

	static const char *what[4] = {

		[0] = "DOWN",

		[INFINIPATH_IBCC_LINKCMD_INIT] = "INIT",

		[0] = "NOP",

		[INFINIPATH_IBCC_LINKCMD_DOWN] = "DOWN",

		[INFINIPATH_IBCC_LINKCMD_ARMED] = "ARMED",

		[INFINIPATH_IBCC_LINKCMD_ACTIVE] = "ACTIVE"

	};
@@ -1672,9 +1671,9 @@ static void ipath_set_ib_lstate(struct ipath_devdata *dd, int which) 
			    (dd, dd->ipath_kregs->kr_ibcstatus) >>

			    INFINIPATH_IBCS_LINKTRAININGSTATE_SHIFT) &

			   INFINIPATH_IBCS_LINKTRAININGSTATE_MASK]);

	/* flush all queued sends when going to DOWN or INIT, to be sure that

	/* flush all queued sends when going to DOWN to be sure that

	 * they don't block MAD packets */

	if (!linkcmd || linkcmd == INFINIPATH_IBCC_LINKCMD_INIT)

	if (linkcmd == INFINIPATH_IBCC_LINKCMD_DOWN)

		ipath_cancel_sends(dd, 1);



	ipath_write_kreg(dd, dd->ipath_kregs->kr_ibcctrl,
@@ -1687,6 +1686,13 @@ int ipath_set_linkstate(struct ipath_devdata *dd, u8 newstate) 
	int ret;



	switch (newstate) {

	case IPATH_IB_LINKDOWN_ONLY:

		ipath_set_ib_lstate(dd, INFINIPATH_IBCC_LINKCMD_DOWN <<

				    INFINIPATH_IBCC_LINKCMD_SHIFT);

		/* don't wait */

		ret = 0;

		goto bail;



	case IPATH_IB_LINKDOWN:

		ipath_set_ib_lstate(dd, INFINIPATH_IBCC_LINKINITCMD_POLL <<

				    INFINIPATH_IBCC_LINKINITCMD_SHIFT);
@@ -1709,16 +1715,6 @@ int ipath_set_linkstate(struct ipath_devdata *dd, u8 newstate) 
		ret = 0;

		goto bail;



	case IPATH_IB_LINKINIT:

		if (dd->ipath_flags & IPATH_LINKINIT) {

			ret = 0;

			goto bail;

		}

		ipath_set_ib_lstate(dd, INFINIPATH_IBCC_LINKCMD_INIT <<

				    INFINIPATH_IBCC_LINKCMD_SHIFT);

		lstate = IPATH_LINKINIT;

		break;



	case IPATH_IB_LINKARM:

		if (dd->ipath_flags & IPATH_LINKARMED) {

			ret = 0;

drivers/infiniband/hw/ipath/ipath_kernel.h

+1 −0
Original line number Diff line number Diff line
@@ -767,6 +767,7 @@ void ipath_kreceive(struct ipath_portdata *); 
int ipath_setrcvhdrsize(struct ipath_devdata *, unsigned);

int ipath_reset_device(int);

void ipath_get_faststats(unsigned long);

int ipath_wait_linkstate(struct ipath_devdata *, u32, int);

int ipath_set_linkstate(struct ipath_devdata *, u8);

int ipath_set_mtu(struct ipath_devdata *, u16);

int ipath_set_lid(struct ipath_devdata *, u32, u8);

drivers/infiniband/hw/ipath/ipath_mad.c

+3 −4
Original line number Diff line number Diff line
@@ -555,10 +555,7 @@ static int recv_subn_set_portinfo(struct ib_smp *smp, 
		/* FALLTHROUGH */

	case IB_PORT_DOWN:

		if (lstate == 0)

			if (get_linkdowndefaultstate(dd))

				lstate = IPATH_IB_LINKDOWN_SLEEP;

			else

				lstate = IPATH_IB_LINKDOWN;

			lstate = IPATH_IB_LINKDOWN_ONLY;

		else if (lstate == 1)

			lstate = IPATH_IB_LINKDOWN_SLEEP;

		else if (lstate == 2)
@@ -568,6 +565,8 @@ static int recv_subn_set_portinfo(struct ib_smp *smp, 
		else

			goto err;

		ipath_set_linkstate(dd, lstate);

		ipath_wait_linkstate(dd, IPATH_LINKINIT | IPATH_LINKARMED |

				IPATH_LINKACTIVE, 1000);

		break;

	case IB_PORT_ARMED:

		ipath_set_linkstate(dd, IPATH_IB_LINKARM);

drivers/infiniband/hw/ipath/ipath_qp.c

+7 −6
Original line number Diff line number Diff line
@@ -329,8 +329,9 @@ struct ipath_qp *ipath_lookup_qpn(struct ipath_qp_table *qpt, u32 qpn) 
/**

 * ipath_reset_qp - initialize the QP state to the reset state

 * @qp: the QP to reset

 * @type: the QP type

 */

static void ipath_reset_qp(struct ipath_qp *qp)

static void ipath_reset_qp(struct ipath_qp *qp, enum ib_qp_type type)

{

	qp->remote_qpn = 0;

	qp->qkey = 0;
@@ -342,7 +343,7 @@ static void ipath_reset_qp(struct ipath_qp *qp) 
	qp->s_psn = 0;

	qp->r_psn = 0;

	qp->r_msn = 0;

	if (qp->ibqp.qp_type == IB_QPT_RC) {

	if (type == IB_QPT_RC) {

		qp->s_state = IB_OPCODE_RC_SEND_LAST;

		qp->r_state = IB_OPCODE_RC_SEND_LAST;

	} else {
@@ -414,7 +415,7 @@ int ipath_error_qp(struct ipath_qp *qp, enum ib_wc_status err) 
		wc.wr_id = qp->r_wr_id;

		wc.opcode = IB_WC_RECV;

		wc.status = err;

		ipath_cq_enter(to_icq(qp->ibqp.send_cq), &wc, 1);

		ipath_cq_enter(to_icq(qp->ibqp.recv_cq), &wc, 1);

	}

	wc.status = IB_WC_WR_FLUSH_ERR;
@@ -534,7 +535,7 @@ int ipath_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, 


	switch (new_state) {

	case IB_QPS_RESET:

		ipath_reset_qp(qp);

		ipath_reset_qp(qp, ibqp->qp_type);

		break;



	case IB_QPS_ERR:
@@ -647,7 +648,7 @@ int ipath_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, 
	attr->port_num = 1;

	attr->timeout = qp->timeout;

	attr->retry_cnt = qp->s_retry_cnt;

	attr->rnr_retry = qp->s_rnr_retry;

	attr->rnr_retry = qp->s_rnr_retry_cnt;

	attr->alt_port_num = 0;

	attr->alt_timeout = 0;
@@ -839,7 +840,7 @@ struct ib_qp *ipath_create_qp(struct ib_pd *ibpd, 
			goto bail_qp;

		}

		qp->ip = NULL;

		ipath_reset_qp(qp);

		ipath_reset_qp(qp, init_attr->qp_type);

		break;



	default: