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

Commit 3576e99e authored by Michal Kalderon's avatar Michal Kalderon Committed by David S. Miller
Browse files

qed*: Add iWARP 100g support 



Add iWARP engine affinity setting for supporting iWARP over 100g.
iWARP cannot be distinguished by the LLH from L2, hence the
engine division will affect L2 as well. For this reason we add
a parameter to devlink to determine the engine division.

Signed-off-by: default avatarAriel Elior <ariel.elior@marvell.com>
Signed-off-by: default avatarMichal Kalderon <michal.kalderon@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 24e04879

drivers/infiniband/hw/qedr/main.c

+13 −0
Original line number Diff line number Diff line
@@ -871,7 +871,16 @@ static struct qedr_dev *qedr_add(struct qed_dev *cdev, struct pci_dev *pdev, 
	dev->user_dpm_enabled = dev_info.user_dpm_enabled;

	dev->rdma_type = dev_info.rdma_type;

	dev->num_hwfns = dev_info.common.num_hwfns;



	if (IS_IWARP(dev) && QEDR_IS_CMT(dev)) {

		rc = dev->ops->iwarp_set_engine_affin(cdev, false);

		if (rc) {

			DP_ERR(dev, "iWARP is disabled over a 100g device Enabling it may impact L2 performance. To enable it run devlink dev param set <dev> name iwarp_cmt value true cmode runtime\n");

			goto init_err;

		}

	}

	dev->affin_hwfn_idx = dev->ops->common->get_affin_hwfn_idx(cdev);



	dev->rdma_ctx = dev->ops->rdma_get_rdma_ctx(cdev);



	dev->num_cnq = dev->ops->rdma_get_min_cnq_msix(cdev);
@@ -932,6 +941,10 @@ static void qedr_remove(struct qedr_dev *dev) 
	qedr_stop_hw(dev);

	qedr_sync_free_irqs(dev);

	qedr_free_resources(dev);



	if (IS_IWARP(dev) && QEDR_IS_CMT(dev))

		dev->ops->iwarp_set_engine_affin(dev->cdev, true);



	ib_dealloc_device(&dev->ibdev);

}

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

+31 −0
Original line number Diff line number Diff line
@@ -1916,6 +1916,36 @@ static int qed_roce_ll2_set_mac_filter(struct qed_dev *cdev, 
	return rc;

}



static int qed_iwarp_set_engine_affin(struct qed_dev *cdev, bool b_reset)

{

	enum qed_eng eng;

	u8 ppfid = 0;

	int rc;



	/* Make sure iwarp cmt mode is enabled before setting affinity */

	if (!cdev->iwarp_cmt)

		return -EINVAL;



	if (b_reset)

		eng = QED_BOTH_ENG;

	else

		eng = cdev->l2_affin_hint ? QED_ENG1 : QED_ENG0;



	rc = qed_llh_set_ppfid_affinity(cdev, ppfid, eng);

	if (rc) {

		DP_NOTICE(cdev,

			  "Failed to set the engine affinity of ppfid %d\n",

			  ppfid);

		return rc;

	}



	DP_VERBOSE(cdev, (QED_MSG_RDMA | QED_MSG_SP),

		   "LLH: Set the engine affinity of non-RoCE packets as %d\n",

		   eng);



	return 0;

}



static const struct qed_rdma_ops qed_rdma_ops_pass = {

	.common = &qed_common_ops_pass,

	.fill_dev_info = &qed_fill_rdma_dev_info,
@@ -1955,6 +1985,7 @@ static const struct qed_rdma_ops qed_rdma_ops_pass = { 
	.ll2_set_fragment_of_tx_packet = &qed_ll2_set_fragment_of_tx_packet,

	.ll2_set_mac_filter = &qed_roce_ll2_set_mac_filter,

	.ll2_get_stats = &qed_ll2_get_stats,

	.iwarp_set_engine_affin = &qed_iwarp_set_engine_affin,

	.iwarp_connect = &qed_iwarp_connect,

	.iwarp_create_listen = &qed_iwarp_create_listen,

	.iwarp_destroy_listen = &qed_iwarp_destroy_listen,

include/linux/qed/qed_rdma_if.h

+2 −0
Original line number Diff line number Diff line
@@ -670,6 +670,8 @@ struct qed_rdma_ops { 
	int (*ll2_set_mac_filter)(struct qed_dev *cdev,

				  u8 *old_mac_address, u8 *new_mac_address);



	int (*iwarp_set_engine_affin)(struct qed_dev *cdev, bool b_reset);



	int (*iwarp_connect)(void *rdma_cxt,

			     struct qed_iwarp_connect_in *iparams,

			     struct qed_iwarp_connect_out *oparams);