Merge branches 'cma', 'cxgb4', 'ipoib', 'mlx4', 'mlx4-sriov', 'nes', 'qib' and 'srp' into for-linus (d172f5a4) · Commits · e / devices / android_kernel_teracube_2e

drivers/infiniband/core/cache.c

+42 −1

Original line number	Diff line number	Diff line
		@@ -167,6 +167,7 @@ int ib_find_cached_pkey(struct ib_device *device,
		unsigned long flags;
		int i;
		int ret = -ENOENT;
		int partial_ix = -1;

		if (port_num < start_port(device) \|\| port_num > end_port(device))
		return -EINVAL;
		@@ -179,9 +180,17 @@ int ib_find_cached_pkey(struct ib_device *device,

		for (i = 0; i < cache->table_len; ++i)
		if ((cache->table[i] & 0x7fff) == (pkey & 0x7fff)) {
		if (cache->table[i] & 0x8000) {
		*index = i;
		ret = 0;
		break;
		} else
		partial_ix = i;
		}

		if (ret && partial_ix >= 0) {
		*index = partial_ix;
		ret = 0;
		}

		read_unlock_irqrestore(&device->cache.lock, flags);
		@@ -190,6 +199,38 @@ int ib_find_cached_pkey(struct ib_device *device,
		}
		EXPORT_SYMBOL(ib_find_cached_pkey);

		int ib_find_exact_cached_pkey(struct ib_device *device,
		u8 port_num,
		u16 pkey,
		u16 *index)
		{
		struct ib_pkey_cache *cache;
		unsigned long flags;
		int i;
		int ret = -ENOENT;

		if (port_num < start_port(device) \|\| port_num > end_port(device))
		return -EINVAL;

		read_lock_irqsave(&device->cache.lock, flags);

		cache = device->cache.pkey_cache[port_num - start_port(device)];

		*index = -1;

		for (i = 0; i < cache->table_len; ++i)
		if (cache->table[i] == pkey) {
		*index = i;
		ret = 0;
		break;
		}

		read_unlock_irqrestore(&device->cache.lock, flags);

		return ret;
		}
		EXPORT_SYMBOL(ib_find_exact_cached_pkey);

		int ib_get_cached_lmc(struct ib_device *device,
		u8 port_num,
		u8 *lmc)

drivers/infiniband/core/device.c

+13 −3

Original line number	Diff line number	Diff line
		@@ -707,18 +707,28 @@ int ib_find_pkey(struct ib_device *device,
		{
		int ret, i;
		u16 tmp_pkey;
		int partial_ix = -1;

		for (i = 0; i < device->pkey_tbl_len[port_num - start_port(device)]; ++i) {
		ret = ib_query_pkey(device, port_num, i, &tmp_pkey);
		if (ret)
		return ret;

		if ((pkey & 0x7fff) == (tmp_pkey & 0x7fff)) {
		/* if there is full-member pkey take it.*/
		if (tmp_pkey & 0x8000) {
		*index = i;
		return 0;
		}
		if (partial_ix < 0)
		partial_ix = i;
		}
		}

		/no full-member, if exists take the limited/
		if (partial_ix >= 0) {
		*index = partial_ix;
		return 0;
		}
		return -ENOENT;
		}
		EXPORT_SYMBOL(ib_find_pkey);

drivers/infiniband/hw/cxgb4/qp.c

+38 −24

Original line number	Diff line number	Diff line
		@@ -137,19 +137,25 @@ static int create_qp(struct c4iw_rdev rdev, struct t4_wq wq,
		return -ENOMEM;

		wq->rq.qid = c4iw_get_qpid(rdev, uctx);
		if (!wq->rq.qid)
		goto err1;
		if (!wq->rq.qid) {
		ret = -ENOMEM;
		goto free_sq_qid;
		}

		if (!user) {
		wq->sq.sw_sq = kzalloc(wq->sq.size * sizeof *wq->sq.sw_sq,
		GFP_KERNEL);
		if (!wq->sq.sw_sq)
		goto err2;
		if (!wq->sq.sw_sq) {
		ret = -ENOMEM;
		goto free_rq_qid;
		}

		wq->rq.sw_rq = kzalloc(wq->rq.size * sizeof *wq->rq.sw_rq,
		GFP_KERNEL);
		if (!wq->rq.sw_rq)
		goto err3;
		if (!wq->rq.sw_rq) {
		ret = -ENOMEM;
		goto free_sw_sq;
		}
		}

		/*
		@@ -157,15 +163,23 @@ static int create_qp(struct c4iw_rdev rdev, struct t4_wq wq,
		*/
		wq->rq.rqt_size = roundup_pow_of_two(wq->rq.size);
		wq->rq.rqt_hwaddr = c4iw_rqtpool_alloc(rdev, wq->rq.rqt_size);
		if (!wq->rq.rqt_hwaddr)
		goto err4;
		if (!wq->rq.rqt_hwaddr) {
		ret = -ENOMEM;
		goto free_sw_rq;
		}

		if (user) {
		if (alloc_oc_sq(rdev, &wq->sq) && alloc_host_sq(rdev, &wq->sq))
		goto err5;
		ret = alloc_oc_sq(rdev, &wq->sq);
		if (ret)
		goto free_hwaddr;

		ret = alloc_host_sq(rdev, &wq->sq);
		if (ret)
		goto free_sq;
		} else
		if (alloc_host_sq(rdev, &wq->sq))
		goto err5;
		ret = alloc_host_sq(rdev, &wq->sq);
		if (ret)
		goto free_hwaddr;
		memset(wq->sq.queue, 0, wq->sq.memsize);
		dma_unmap_addr_set(&wq->sq, mapping, wq->sq.dma_addr);

		@@ -173,7 +187,7 @@ static int create_qp(struct c4iw_rdev rdev, struct t4_wq wq,
		wq->rq.memsize, &(wq->rq.dma_addr),
		GFP_KERNEL);
		if (!wq->rq.queue)
		goto err6;
		goto free_sq;
		PDBG("%s sq base va 0x%p pa 0x%llx rq base va 0x%p pa 0x%llx\n",
		__func__, wq->sq.queue,
		(unsigned long long)virt_to_phys(wq->sq.queue),
		@@ -201,7 +215,7 @@ static int create_qp(struct c4iw_rdev rdev, struct t4_wq wq,
		skb = alloc_skb(wr_len, GFP_KERNEL);
		if (!skb) {
		ret = -ENOMEM;
		goto err7;
		goto free_dma;
		}
		set_wr_txq(skb, CPL_PRIORITY_CONTROL, 0);

		@@ -266,33 +280,33 @@ static int create_qp(struct c4iw_rdev rdev, struct t4_wq wq,

		ret = c4iw_ofld_send(rdev, skb);
		if (ret)
		goto err7;
		goto free_dma;
		ret = c4iw_wait_for_reply(rdev, &wr_wait, 0, wq->sq.qid, __func__);
		if (ret)
		goto err7;
		goto free_dma;

		PDBG("%s sqid 0x%x rqid 0x%x kdb 0x%p squdb 0x%llx rqudb 0x%llx\n",
		__func__, wq->sq.qid, wq->rq.qid, wq->db,
		(unsigned long long)wq->sq.udb, (unsigned long long)wq->rq.udb);

		return 0;
		err7:
		free_dma:
		dma_free_coherent(&(rdev->lldi.pdev->dev),
		wq->rq.memsize, wq->rq.queue,
		dma_unmap_addr(&wq->rq, mapping));
		err6:
		free_sq:
		dealloc_sq(rdev, &wq->sq);
		err5:
		free_hwaddr:
		c4iw_rqtpool_free(rdev, wq->rq.rqt_hwaddr, wq->rq.rqt_size);
		err4:
		free_sw_rq:
		kfree(wq->rq.sw_rq);
		err3:
		free_sw_sq:
		kfree(wq->sq.sw_sq);
		err2:
		free_rq_qid:
		c4iw_put_qpid(rdev, wq->rq.qid, uctx);
		err1:
		free_sq_qid:
		c4iw_put_qpid(rdev, wq->sq.qid, uctx);
		return -ENOMEM;
		return ret;
		}

		static int build_immd(struct t4_sq sq, struct fw_ri_immd immdp,

drivers/infiniband/hw/mlx4/Makefile

+1 −1

Original line number	Diff line number	Diff line
		obj-$(CONFIG_MLX4_INFINIBAND) += mlx4_ib.o

		mlx4_ib-y := ah.o cq.o doorbell.o mad.o main.o mr.o qp.o srq.o
		mlx4_ib-y := ah.o cq.o doorbell.o mad.o main.o mr.o qp.o srq.o mcg.o cm.o alias_GUID.o sysfs.o