Skip to content

Commit 5c5f260

Browse files
Ram Amranidavem330
authored andcommitted
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: 0189efb ("qed*: Fix Kconfig dependencies with INFINIBAND_QEDR") Signed-off-by: Ram Amrani <[email protected]> Signed-off-by: Yuval Mintz <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 8d1d8fc commit 5c5f260

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -839,20 +839,19 @@ static void qed_update_pf_params(struct qed_dev *cdev,
839839
{
840840
int i;
841841

842+
if (IS_ENABLED(CONFIG_QED_RDMA)) {
843+
params->rdma_pf_params.num_qps = QED_ROCE_QPS;
844+
params->rdma_pf_params.min_dpis = QED_ROCE_DPIS;
845+
/* divide by 3 the MRs to avoid MF ILT overflow */
846+
params->rdma_pf_params.num_mrs = RDMA_MAX_TIDS;
847+
params->rdma_pf_params.gl_pi = QED_ROCE_PROTOCOL_INDEX;
848+
}
849+
842850
for (i = 0; i < cdev->num_hwfns; i++) {
843851
struct qed_hwfn *p_hwfn = &cdev->hwfns[i];
844852

845853
p_hwfn->pf_params = *params;
846854
}
847-
848-
if (!IS_ENABLED(CONFIG_QED_RDMA))
849-
return;
850-
851-
params->rdma_pf_params.num_qps = QED_ROCE_QPS;
852-
params->rdma_pf_params.min_dpis = QED_ROCE_DPIS;
853-
/* divide by 3 the MRs to avoid MF ILT overflow */
854-
params->rdma_pf_params.num_mrs = RDMA_MAX_TIDS;
855-
params->rdma_pf_params.gl_pi = QED_ROCE_PROTOCOL_INDEX;
856855
}
857856

858857
static int qed_slowpath_start(struct qed_dev *cdev,

0 commit comments

Comments
 (0)