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

Commit 5c5f2609 authored by Ram Amrani's avatar Ram Amrani Committed by David S. Miller
Browse files

qed: Correct rdma params configuration 



Previous fix has broken RoCE support as the rdma_pf_params are now
being set into the parameters only after the params are alrady assigned
into the hw-function.

Fixes: 0189efb8 ("qed*: Fix Kconfig dependencies with INFINIBAND_QEDR")
Signed-off-by: default avatarRam Amrani <Ram.Amrani@cavium.com>
Signed-off-by: default avatarYuval Mintz <Yuval.Mintz@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8d1d8fcb

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

+8 −9
Original line number Diff line number Diff line
@@ -839,15 +839,7 @@ static void qed_update_pf_params(struct qed_dev *cdev, 
{

	int i;



	for (i = 0; i < cdev->num_hwfns; i++) {

		struct qed_hwfn *p_hwfn = &cdev->hwfns[i];



		p_hwfn->pf_params = *params;

	}



	if (!IS_ENABLED(CONFIG_QED_RDMA))

		return;



	if (IS_ENABLED(CONFIG_QED_RDMA)) {

		params->rdma_pf_params.num_qps = QED_ROCE_QPS;

		params->rdma_pf_params.min_dpis = QED_ROCE_DPIS;

		/* divide by 3 the MRs to avoid MF ILT overflow */
@@ -855,6 +847,13 @@ static void qed_update_pf_params(struct qed_dev *cdev, 
		params->rdma_pf_params.gl_pi = QED_ROCE_PROTOCOL_INDEX;

	}



	for (i = 0; i < cdev->num_hwfns; i++) {

		struct qed_hwfn *p_hwfn = &cdev->hwfns[i];



		p_hwfn->pf_params = *params;

	}

}



static int qed_slowpath_start(struct qed_dev *cdev,

			      struct qed_slowpath_params *params)

{