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

Commit 043332cf authored by Roland Dreier's avatar Roland Dreier
Browse files

Merge branches 'cma', 'cxgb4', 'ipath' and 'qib' into for-next

parents a396d43a db5d040d 2a543904 36b87b41

drivers/infiniband/hw/cxgb4/cm.c

+4 −2
Original line number Diff line number Diff line
@@ -61,9 +61,9 @@ static char *states[] = { 
	NULL,

};



static int dack_mode;

static int dack_mode = 1;

module_param(dack_mode, int, 0644);

MODULE_PARM_DESC(dack_mode, "Delayed ack mode (default=0)");

MODULE_PARM_DESC(dack_mode, "Delayed ack mode (default=1)");



int c4iw_max_read_depth = 8;

module_param(c4iw_max_read_depth, int, 0644);
@@ -482,6 +482,7 @@ static int send_connect(struct c4iw_ep *ep) 
	       TX_CHAN(ep->tx_chan) |

	       SMAC_SEL(ep->smac_idx) |

	       DSCP(ep->tos) |

	       ULP_MODE(ULP_MODE_TCPDDP) |

	       RCV_BUFSIZ(rcv_win>>10);

	opt2 = RX_CHANNEL(0) |

	       RSS_QUEUE_VALID | RSS_QUEUE(ep->rss_qid);
@@ -1274,6 +1275,7 @@ static void accept_cr(struct c4iw_ep *ep, __be32 peer_ip, struct sk_buff *skb, 
	       TX_CHAN(ep->tx_chan) |

	       SMAC_SEL(ep->smac_idx) |

	       DSCP(ep->tos) |

	       ULP_MODE(ULP_MODE_TCPDDP) |

	       RCV_BUFSIZ(rcv_win>>10);

	opt2 = RX_CHANNEL(0) |

	       RSS_QUEUE_VALID | RSS_QUEUE(ep->rss_qid);

drivers/infiniband/hw/cxgb4/device.c

+18 −6
Original line number Diff line number Diff line
@@ -87,17 +87,22 @@ static int dump_qp(int id, void *p, void *data) 
		return 1;



	if (qp->ep)

		cc = snprintf(qpd->buf + qpd->pos, space, "qp id %u state %u "

		cc = snprintf(qpd->buf + qpd->pos, space,

			     "qp sq id %u rq id %u state %u onchip %u "

			     "ep tid %u state %u %pI4:%u->%pI4:%u\n",

			     qp->wq.sq.qid, (int)qp->attr.state,

			     qp->wq.sq.qid, qp->wq.rq.qid, (int)qp->attr.state,

			     qp->wq.sq.flags & T4_SQ_ONCHIP,

			     qp->ep->hwtid, (int)qp->ep->com.state,

			     &qp->ep->com.local_addr.sin_addr.s_addr,

			     ntohs(qp->ep->com.local_addr.sin_port),

			     &qp->ep->com.remote_addr.sin_addr.s_addr,

			     ntohs(qp->ep->com.remote_addr.sin_port));

	else

		cc = snprintf(qpd->buf + qpd->pos, space, "qp id %u state %u\n",

			      qp->wq.sq.qid, (int)qp->attr.state);

		cc = snprintf(qpd->buf + qpd->pos, space,

			     "qp sq id %u rq id %u state %u onchip %u\n",

			      qp->wq.sq.qid, qp->wq.rq.qid,

			      (int)qp->attr.state,

			      qp->wq.sq.flags & T4_SQ_ONCHIP);

	if (cc < space)

		qpd->pos += cc;

	return 0;
@@ -368,7 +373,6 @@ static void c4iw_rdev_close(struct c4iw_rdev *rdev) 
static void c4iw_remove(struct c4iw_dev *dev)

{

	PDBG("%s c4iw_dev %p\n", __func__,  dev);

	cancel_delayed_work_sync(&dev->db_drop_task);

	list_del(&dev->entry);

	if (dev->registered)

		c4iw_unregister_device(dev);
@@ -523,8 +527,16 @@ static int c4iw_uld_state_change(void *handle, enum cxgb4_state new_state) 
	case CXGB4_STATE_START_RECOVERY:

		printk(KERN_INFO MOD "%s: Fatal Error\n",

		       pci_name(dev->rdev.lldi.pdev));

		if (dev->registered)

		dev->rdev.flags |= T4_FATAL_ERROR;

		if (dev->registered) {

			struct ib_event event;



			memset(&event, 0, sizeof event);

			event.event  = IB_EVENT_DEVICE_FATAL;

			event.device = &dev->ibdev;

			ib_dispatch_event(&event);

			c4iw_unregister_device(dev);

		}

		break;

	case CXGB4_STATE_DETACH:

		printk(KERN_INFO MOD "%s: Detach\n",

drivers/infiniband/hw/cxgb4/iw_cxgb4.h

+0 −1
Original line number Diff line number Diff line
@@ -176,7 +176,6 @@ struct c4iw_dev { 
	struct idr mmidr;

	spinlock_t lock;

	struct list_head entry;

	struct delayed_work db_drop_task;

	struct dentry *debugfs_root;

	u8 registered;

};

drivers/infiniband/hw/cxgb4/qp.c

+2 −2
Original line number Diff line number Diff line
@@ -31,9 +31,9 @@ 
 */

#include "iw_cxgb4.h"



static int ocqp_support;

static int ocqp_support = 1;

module_param(ocqp_support, int, 0644);

MODULE_PARM_DESC(ocqp_support, "Support on-chip SQs (default=0)");

MODULE_PARM_DESC(ocqp_support, "Support on-chip SQs (default=1)");



static void set_state(struct c4iw_qp *qhp, enum c4iw_qp_state state)

{

drivers/infiniband/hw/cxgb4/t4.h

+7 −1
Original line number Diff line number Diff line
@@ -507,8 +507,14 @@ static inline void t4_swcq_consume(struct t4_cq *cq) 
static inline void t4_hwcq_consume(struct t4_cq *cq)

{

	cq->bits_type_ts = cq->queue[cq->cidx].bits_type_ts;

	if (++cq->cidx_inc == cq->size)

	if (++cq->cidx_inc == (cq->size >> 4)) {

		u32 val;



		val = SEINTARM(0) | CIDXINC(cq->cidx_inc) | TIMERREG(7) |

		      INGRESSQID(cq->cqid);

		writel(val, cq->gts);

		cq->cidx_inc = 0;

	}

	if (++cq->cidx == cq->size) {

		cq->cidx = 0;

		cq->gen ^= 1;