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

Commit e467e104 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: Fix world-writable child interface control sysfs attributes
  IB/qib: Clean up properly if qib_init() fails
  IB/qib: Completion queue callback needs to be single threaded
  IB/qib: Update 7322 serdes tables
  IB/qib: Clear 6120 hardware error register
  IB/qib: Clear eager buffer memory for each new process
  IB/qib: Mask hardware error during link reset
  IB/qib: Don't mark VL15 bufs as WC to avoid a rare 7322 chip problem
  RDMA/cxgb4: Derive smac_idx from port viid
  RDMA/cxgb4: Avoid false GTS CIDX_INC overflows
  RDMA/cxgb4: Don't call abort_connection() for active connect failures
  RDMA/cxgb4: Use the DMA state API instead of the pci equivalents
parents b9f39959 9e770044

drivers/infiniband/hw/cxgb4/cm.c

+7 −5
Original line number Diff line number Diff line
@@ -969,7 +969,8 @@ static void process_mpa_reply(struct c4iw_ep *ep, struct sk_buff *skb) 
		goto err;

	goto out;

err:

	abort_connection(ep, skb, GFP_KERNEL);

	state_set(&ep->com, ABORTING);

	send_abort(ep, skb, GFP_KERNEL);

out:

	connect_reply_upcall(ep, err);

	return;
@@ -1372,7 +1373,7 @@ static int pass_accept_req(struct c4iw_dev *dev, struct sk_buff *skb) 
				    pdev, 0);

		mtu = pdev->mtu;

		tx_chan = cxgb4_port_chan(pdev);

		smac_idx = tx_chan << 1;

		smac_idx = (cxgb4_port_viid(pdev) & 0x7F) << 1;

		step = dev->rdev.lldi.ntxq / dev->rdev.lldi.nchan;

		txq_idx = cxgb4_port_idx(pdev) * step;

		step = dev->rdev.lldi.nrxq / dev->rdev.lldi.nchan;
@@ -1383,7 +1384,7 @@ static int pass_accept_req(struct c4iw_dev *dev, struct sk_buff *skb) 
					dst->neighbour->dev, 0);

		mtu = dst_mtu(dst);

		tx_chan = cxgb4_port_chan(dst->neighbour->dev);

		smac_idx = tx_chan << 1;

		smac_idx = (cxgb4_port_viid(dst->neighbour->dev) & 0x7F) << 1;

		step = dev->rdev.lldi.ntxq / dev->rdev.lldi.nchan;

		txq_idx = cxgb4_port_idx(dst->neighbour->dev) * step;

		step = dev->rdev.lldi.nrxq / dev->rdev.lldi.nchan;
@@ -1950,7 +1951,7 @@ int c4iw_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) 
					pdev, 0);

		ep->mtu = pdev->mtu;

		ep->tx_chan = cxgb4_port_chan(pdev);

		ep->smac_idx = ep->tx_chan << 1;

		ep->smac_idx = (cxgb4_port_viid(pdev) & 0x7F) << 1;

		step = ep->com.dev->rdev.lldi.ntxq /

		       ep->com.dev->rdev.lldi.nchan;

		ep->txq_idx = cxgb4_port_idx(pdev) * step;
@@ -1965,7 +1966,8 @@ int c4iw_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) 
					ep->dst->neighbour->dev, 0);

		ep->mtu = dst_mtu(ep->dst);

		ep->tx_chan = cxgb4_port_chan(ep->dst->neighbour->dev);

		ep->smac_idx = ep->tx_chan << 1;

		ep->smac_idx = (cxgb4_port_viid(ep->dst->neighbour->dev) &

				0x7F) << 1;

		step = ep->com.dev->rdev.lldi.ntxq /

		       ep->com.dev->rdev.lldi.nchan;

		ep->txq_idx = cxgb4_port_idx(ep->dst->neighbour->dev) * step;

drivers/infiniband/hw/cxgb4/cq.c

+23 −8
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static int destroy_cq(struct c4iw_rdev *rdev, struct t4_cq *cq, 
	kfree(cq->sw_queue);

	dma_free_coherent(&(rdev->lldi.pdev->dev),

			  cq->memsize, cq->queue,

			  pci_unmap_addr(cq, mapping));

			  dma_unmap_addr(cq, mapping));

	c4iw_put_cqid(rdev, cq->cqid, uctx);

	return ret;

}
@@ -112,7 +112,7 @@ static int create_cq(struct c4iw_rdev *rdev, struct t4_cq *cq, 
		ret = -ENOMEM;

		goto err3;

	}

	pci_unmap_addr_set(cq, mapping, cq->dma_addr);

	dma_unmap_addr_set(cq, mapping, cq->dma_addr);

	memset(cq->queue, 0, cq->memsize);



	/* build fw_ri_res_wr */
@@ -179,7 +179,7 @@ static int create_cq(struct c4iw_rdev *rdev, struct t4_cq *cq, 
	return 0;

err4:

	dma_free_coherent(&rdev->lldi.pdev->dev, cq->memsize, cq->queue,

			  pci_unmap_addr(cq, mapping));

			  dma_unmap_addr(cq, mapping));

err3:

	kfree(cq->sw_queue);

err2:
@@ -764,7 +764,7 @@ struct ib_cq *c4iw_create_cq(struct ib_device *ibdev, int entries, 
	struct c4iw_create_cq_resp uresp;

	struct c4iw_ucontext *ucontext = NULL;

	int ret;

	size_t memsize;

	size_t memsize, hwentries;

	struct c4iw_mm_entry *mm, *mm2;



	PDBG("%s ib_dev %p entries %d\n", __func__, ibdev, entries);
@@ -788,14 +788,29 @@ struct ib_cq *c4iw_create_cq(struct ib_device *ibdev, int entries, 
	 * entries must be multiple of 16 for HW.

	 */

	entries = roundup(entries, 16);

	memsize = entries * sizeof *chp->cq.queue;



	/*

	 * Make actual HW queue 2x to avoid cdix_inc overflows.

	 */

	hwentries = entries * 2;



	/*

	 * Make HW queue at least 64 entries so GTS updates aren't too

	 * frequent.

	 */

	if (hwentries < 64)

		hwentries = 64;



	memsize = hwentries * sizeof *chp->cq.queue;



	/*

	 * memsize must be a multiple of the page size if its a user cq.

	 */

	if (ucontext)

	if (ucontext) {

		memsize = roundup(memsize, PAGE_SIZE);

	chp->cq.size = entries;

		hwentries = memsize / sizeof *chp->cq.queue;

	}

	chp->cq.size = hwentries;

	chp->cq.memsize = memsize;



	ret = create_cq(&rhp->rdev, &chp->cq,
@@ -805,7 +820,7 @@ struct ib_cq *c4iw_create_cq(struct ib_device *ibdev, int entries, 


	chp->rhp = rhp;

	chp->cq.size--;				/* status page */

	chp->ibcq.cqe = chp->cq.size - 1;

	chp->ibcq.cqe = entries - 2;

	spin_lock_init(&chp->lock);

	atomic_set(&chp->refcnt, 1);

	init_waitqueue_head(&chp->wait);

drivers/infiniband/hw/cxgb4/iw_cxgb4.h

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static inline struct c4iw_mw *to_c4iw_mw(struct ib_mw *ibmw) 


struct c4iw_fr_page_list {

	struct ib_fast_reg_page_list ibpl;

	DECLARE_PCI_UNMAP_ADDR(mapping);

	DEFINE_DMA_UNMAP_ADDR(mapping);

	dma_addr_t dma_addr;

	struct c4iw_dev *dev;

	int size;

drivers/infiniband/hw/cxgb4/mem.c

+2 −2
Original line number Diff line number Diff line
@@ -764,7 +764,7 @@ struct ib_fast_reg_page_list *c4iw_alloc_fastreg_pbl(struct ib_device *device, 
	if (!c4pl)

		return ERR_PTR(-ENOMEM);



	pci_unmap_addr_set(c4pl, mapping, dma_addr);

	dma_unmap_addr_set(c4pl, mapping, dma_addr);

	c4pl->dma_addr = dma_addr;

	c4pl->dev = dev;

	c4pl->size = size;
@@ -779,7 +779,7 @@ void c4iw_free_fastreg_pbl(struct ib_fast_reg_page_list *ibpl) 
	struct c4iw_fr_page_list *c4pl = to_c4iw_fr_page_list(ibpl);



	dma_free_coherent(&c4pl->dev->rdev.lldi.pdev->dev, c4pl->size,

			  c4pl, pci_unmap_addr(c4pl, mapping));

			  c4pl, dma_unmap_addr(c4pl, mapping));

}



int c4iw_dereg_mr(struct ib_mr *ib_mr)

drivers/infiniband/hw/cxgb4/qp.c

+6 −6
Original line number Diff line number Diff line
@@ -40,10 +40,10 @@ static int destroy_qp(struct c4iw_rdev *rdev, struct t4_wq *wq, 
	 */

	dma_free_coherent(&(rdev->lldi.pdev->dev),

			  wq->rq.memsize, wq->rq.queue,

			  pci_unmap_addr(&wq->rq, mapping));

			  dma_unmap_addr(&wq->rq, mapping));

	dma_free_coherent(&(rdev->lldi.pdev->dev),

			  wq->sq.memsize, wq->sq.queue,

			  pci_unmap_addr(&wq->sq, mapping));

			  dma_unmap_addr(&wq->sq, mapping));

	c4iw_rqtpool_free(rdev, wq->rq.rqt_hwaddr, wq->rq.rqt_size);

	kfree(wq->rq.sw_rq);

	kfree(wq->sq.sw_sq);
@@ -99,7 +99,7 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq, 
	if (!wq->sq.queue)

		goto err5;

	memset(wq->sq.queue, 0, wq->sq.memsize);

	pci_unmap_addr_set(&wq->sq, mapping, wq->sq.dma_addr);

	dma_unmap_addr_set(&wq->sq, mapping, wq->sq.dma_addr);



	wq->rq.queue = dma_alloc_coherent(&(rdev->lldi.pdev->dev),

					  wq->rq.memsize, &(wq->rq.dma_addr),
@@ -112,7 +112,7 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq, 
		wq->rq.queue,

		(unsigned long long)virt_to_phys(wq->rq.queue));

	memset(wq->rq.queue, 0, wq->rq.memsize);

	pci_unmap_addr_set(&wq->rq, mapping, wq->rq.dma_addr);

	dma_unmap_addr_set(&wq->rq, mapping, wq->rq.dma_addr);



	wq->db = rdev->lldi.db_reg;

	wq->gts = rdev->lldi.gts_reg;
@@ -217,11 +217,11 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq, 
err7:

	dma_free_coherent(&(rdev->lldi.pdev->dev),

			  wq->rq.memsize, wq->rq.queue,

			  pci_unmap_addr(&wq->rq, mapping));

			  dma_unmap_addr(&wq->rq, mapping));

err6:

	dma_free_coherent(&(rdev->lldi.pdev->dev),

			  wq->sq.memsize, wq->sq.queue,

			  pci_unmap_addr(&wq->sq, mapping));

			  dma_unmap_addr(&wq->sq, mapping));

err5:

	c4iw_rqtpool_free(rdev, wq->rq.rqt_hwaddr, wq->rq.rqt_size);

err4: