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

Commit 1a4a6975 authored by Mintz, Yuval's avatar Mintz, Yuval Committed by David S. Miller
Browse files

qed: Chain support for external PBL 



iWARP would require the chains to allocate/free their PBL memory
independently, so add the infrastructure to provide it externally.

Signed-off-by: default avatarYuval Mintz <Yuval.Mintz@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8917a777

drivers/infiniband/hw/qedr/main.c

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static int qedr_alloc_resources(struct qedr_dev *dev) 
						   QED_CHAIN_CNT_TYPE_U16,

						   n_entries,

						   sizeof(struct regpair *),

						   &cnq->pbl);

						   &cnq->pbl, NULL);

		if (rc)

			goto err4;

drivers/infiniband/hw/qedr/verbs.c

+3 −3
Original line number Diff line number Diff line
@@ -925,7 +925,7 @@ struct ib_cq *qedr_create_cq(struct ib_device *ibdev, 
						   QED_CHAIN_CNT_TYPE_U32,

						   chain_entries,

						   sizeof(union rdma_cqe),

						   &cq->pbl);

						   &cq->pbl, NULL);

		if (rc)

			goto err1;
@@ -1413,7 +1413,7 @@ qedr_roce_create_kernel_qp(struct qedr_dev *dev, 
					   QED_CHAIN_CNT_TYPE_U32,

					   n_sq_elems,

					   QEDR_SQE_ELEMENT_SIZE,

					   &qp->sq.pbl);

					   &qp->sq.pbl, NULL);



	if (rc)

		return rc;
@@ -1427,7 +1427,7 @@ qedr_roce_create_kernel_qp(struct qedr_dev *dev, 
					   QED_CHAIN_CNT_TYPE_U32,

					   n_rq_elems,

					   QEDR_RQE_ELEMENT_SIZE,

					   &qp->rq.pbl);

					   &qp->rq.pbl, NULL);

	if (rc)

		return rc;

drivers/net/ethernet/qlogic/qed/qed_dev.c

+26 −9
Original line number Diff line number Diff line
@@ -3075,12 +3075,15 @@ static void qed_chain_free_pbl(struct qed_dev *cdev, struct qed_chain *p_chain) 
	}



	pbl_size = page_cnt * QED_CHAIN_PBL_ENTRY_SIZE;



	if (!p_chain->b_external_pbl)

		dma_free_coherent(&cdev->pdev->dev,

				  pbl_size,

				  p_chain->pbl_sp.p_virt_table,

				  p_chain->pbl_sp.p_phys_table);

out:

	vfree(p_chain->pbl.pp_virt_addr_tbl);

	p_chain->pbl.pp_virt_addr_tbl = NULL;

}



void qed_chain_free(struct qed_dev *cdev, struct qed_chain *p_chain)
@@ -3174,7 +3177,10 @@ qed_chain_alloc_single(struct qed_dev *cdev, struct qed_chain *p_chain) 
	return 0;

}



static int qed_chain_alloc_pbl(struct qed_dev *cdev, struct qed_chain *p_chain)

static int

qed_chain_alloc_pbl(struct qed_dev *cdev,

		    struct qed_chain *p_chain,

		    struct qed_chain_ext_pbl *ext_pbl)

{

	u32 page_cnt = p_chain->page_cnt, size, i;

	dma_addr_t p_phys = 0, p_pbl_phys = 0;
@@ -3194,8 +3200,16 @@ static int qed_chain_alloc_pbl(struct qed_dev *cdev, struct qed_chain *p_chain) 
	 * should be saved to allow its freeing during the error flow.

	 */

	size = page_cnt * QED_CHAIN_PBL_ENTRY_SIZE;



	if (!ext_pbl) {

		p_pbl_virt = dma_alloc_coherent(&cdev->pdev->dev,

						size, &p_pbl_phys, GFP_KERNEL);

	} else {

		p_pbl_virt = ext_pbl->p_pbl_virt;

		p_pbl_phys = ext_pbl->p_pbl_phys;

		p_chain->b_external_pbl = true;

	}



	qed_chain_init_pbl_mem(p_chain, p_pbl_virt, p_pbl_phys,

			       pp_virt_addr_tbl);

	if (!p_pbl_virt)
@@ -3228,7 +3242,10 @@ int qed_chain_alloc(struct qed_dev *cdev, 
		    enum qed_chain_use_mode intended_use,

		    enum qed_chain_mode mode,

		    enum qed_chain_cnt_type cnt_type,

		    u32 num_elems, size_t elem_size, struct qed_chain *p_chain)

		    u32 num_elems,

		    size_t elem_size,

		    struct qed_chain *p_chain,

		    struct qed_chain_ext_pbl *ext_pbl)

{

	u32 page_cnt;

	int rc = 0;
@@ -3259,7 +3276,7 @@ int qed_chain_alloc(struct qed_dev *cdev, 
		rc = qed_chain_alloc_single(cdev, p_chain);

		break;

	case QED_CHAIN_MODE_PBL:

		rc = qed_chain_alloc_pbl(cdev, p_chain);

		rc = qed_chain_alloc_pbl(cdev, p_chain, ext_pbl);

		break;

	}

	if (rc)

drivers/net/ethernet/qlogic/qed/qed_dev_api.h

+4 −1
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ int qed_dmae_host2host(struct qed_hwfn *p_hwfn, 
 * @param num_elems

 * @param elem_size

 * @param p_chain

 * @param ext_pbl - a possible external PBL

 *

 * @return int

 */
@@ -315,7 +316,9 @@ qed_chain_alloc(struct qed_dev *cdev, 
		enum qed_chain_use_mode intended_use,

		enum qed_chain_mode mode,

		enum qed_chain_cnt_type cnt_type,

		u32 num_elems, size_t elem_size, struct qed_chain *p_chain);

		u32 num_elems,

		size_t elem_size,

		struct qed_chain *p_chain, struct qed_chain_ext_pbl *ext_pbl);



/**

 * @brief qed_chain_free - Free chain DMA memory

drivers/net/ethernet/qlogic/qed/qed_iscsi.c

+3 −3
Original line number Diff line number Diff line
@@ -752,7 +752,7 @@ static int qed_iscsi_allocate_connection(struct qed_hwfn *p_hwfn, 
			     QED_CHAIN_USE_TO_CONSUME_PRODUCE,

			     QED_CHAIN_MODE_PBL,

			     QED_CHAIN_CNT_TYPE_U16,

			     r2tq_num_elements, 0x80, &p_conn->r2tq);

			     r2tq_num_elements, 0x80, &p_conn->r2tq, NULL);

	if (rc)

		goto nomem_r2tq;
@@ -763,7 +763,7 @@ static int qed_iscsi_allocate_connection(struct qed_hwfn *p_hwfn, 
			     QED_CHAIN_MODE_PBL,

			     QED_CHAIN_CNT_TYPE_U16,

			     uhq_num_elements,

			     sizeof(struct iscsi_uhqe), &p_conn->uhq);

			     sizeof(struct iscsi_uhqe), &p_conn->uhq, NULL);

	if (rc)

		goto nomem_uhq;
@@ -773,7 +773,7 @@ static int qed_iscsi_allocate_connection(struct qed_hwfn *p_hwfn, 
			     QED_CHAIN_MODE_PBL,

			     QED_CHAIN_CNT_TYPE_U16,

			     xhq_num_elements,

			     sizeof(struct iscsi_xhqe), &p_conn->xhq);

			     sizeof(struct iscsi_xhqe), &p_conn->xhq, NULL);

	if (rc)

		goto nomem;