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

Commit 93dda1e0 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'qed-RDMA-and-infrastructure-for-iWARP' 



Yuval Mintz says:

====================
qed*: RDMA and infrastructure for iWARP

This series focuses on RDMA in general with emphasis on required changes
toward adding iWARP support. The vast majority of the changes introduced
are in qed/qede, with a couple of small changes to qedr
[mentioned below].

The infrastructure changes:
 - Patch #1 adds the ability to pass PBL memory externally for a newly
created chain.
 - Patches #4, #5 rename qede_roce.[ch] into qede_rdma.[ch] + change
prefixes from _roce_ to _rdma_, as the API between qede and qedr is
agnostic to the variant of the RDMA protocol used. These patches also
touch qedr [basically to align it with the renaming, nothing more].
 - Patch #7 replaces the current SPQ async mechanism into serving
registered callbacks [before adding iWARP which would add another client
in need of this sort of functionallity].

The non-infrastrucutre changes:
 - Patches #2, #3 contain DCB-related changes to better align RDMA with
configured DCB.
 - Patch #6 contains a minor [mostly theoretical fix] to release flow.

Changes from previous versions
------------------------------
 - V4: This is actually a repost of V3 due to some confusion regarding
   the sent cover-letter
 - V3: Add commit log message in #4 indicating change in header inclusion
 - V2: Add several inclusion into qede_rdma.h to have proper declarations
   of all variable types used in it
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8917a777 6c9e80ea

drivers/infiniband/hw/qedr/main.c

+5 −5
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#include <linux/iommu.h>

#include <linux/pci.h>

#include <net/addrconf.h>

#include <linux/qed/qede_roce.h>



#include <linux/qed/qed_chain.h>

#include <linux/qed/qed_if.h>

#include "qedr.h"
@@ -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;
@@ -902,7 +902,7 @@ static void qedr_mac_address_change(struct qedr_dev *dev) 
 * initialization done before RoCE driver notifies

 * event to stack.

 */

static void qedr_notify(struct qedr_dev *dev, enum qede_roce_event event)

static void qedr_notify(struct qedr_dev *dev, enum qede_rdma_event event)

{

	switch (event) {

	case QEDE_UP:
@@ -931,12 +931,12 @@ static struct qedr_driver qedr_drv = { 


static int __init qedr_init_module(void)

{

	return qede_roce_register_driver(&qedr_drv);

	return qede_rdma_register_driver(&qedr_drv);

}



static void __exit qedr_exit_module(void)

{

	qede_roce_unregister_driver(&qedr_drv);

	qede_rdma_unregister_driver(&qedr_drv);

}



module_init(qedr_init_module);

drivers/infiniband/hw/qedr/qedr.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#include <linux/qed/qed_if.h>

#include <linux/qed/qed_chain.h>

#include <linux/qed/qed_roce_if.h>

#include <linux/qed/qede_roce.h>

#include <linux/qed/qede_rdma.h>

#include <linux/qed/roce_common.h>

#include "qedr_hsi_rdma.h"

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_dcbx.c

+24 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include "qed_hsi.h"

#include "qed_sp.h"

#include "qed_sriov.h"

#include "qed_roce.h"

#ifdef CONFIG_DCB

#include <linux/qed/qed_eth_if.h>

#endif
@@ -892,10 +893,33 @@ qed_dcbx_mib_update_event(struct qed_hwfn *p_hwfn, 


			/* update storm FW with negotiation results */

			qed_sp_pf_update(p_hwfn);



			/* for roce PFs, we may want to enable/disable DPM

			 * when DCBx change occurs

			 */

			if (p_hwfn->hw_info.personality ==

			    QED_PCI_ETH_ROCE)

				qed_roce_dpm_dcbx(p_hwfn, p_ptt);

		}

	}



	qed_dcbx_get_params(p_hwfn, &p_hwfn->p_dcbx_info->get, type);



	if (type == QED_DCBX_OPERATIONAL_MIB) {

		struct qed_dcbx_results *p_data;

		u16 val;



		/* Configure in NIG which protocols support EDPM and should

		 * honor PFC.

		 */

		p_data = &p_hwfn->p_dcbx_info->results;

		val = (0x1 << p_data->arr[DCBX_PROTOCOL_ROCE].tc) |

		      (0x1 << p_data->arr[DCBX_PROTOCOL_ROCE_V2].tc);

		val <<= NIG_REG_TX_EDPM_CTRL_TX_EDPM_TC_EN_SHIFT;

		val |= NIG_REG_TX_EDPM_CTRL_TX_EDPM_EN;

		qed_wr(p_hwfn, p_ptt, NIG_REG_TX_EDPM_CTRL, val);

	}



	qed_dcbx_aen(p_hwfn, type);



	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)