git: 0c8b126da579 - stable/13 - mlx5en: Set CQN in RQ parameters for drop RQ.

From: Hans Petter Selasky <hselasky_at_FreeBSD.org>
Date: Tue, 08 Feb 2022 15:13:50 UTC
The branch stable/13 has been updated by hselasky:

URL: https://cgit.FreeBSD.org/src/commit/?id=0c8b126da579b484c0b3c5a3926128c4a1b075e0

commit 0c8b126da579b484c0b3c5a3926128c4a1b075e0
Author:     Hans Petter Selasky <hselasky@FreeBSD.org>
AuthorDate: 2022-02-08 15:08:51 +0000
Commit:     Hans Petter Selasky <hselasky@FreeBSD.org>
CommitDate: 2022-02-08 15:08:51 +0000

    mlx5en: Set CQN in RQ parameters for drop RQ.
    
    Else creating the drop RQ fails.
    
    Sponsored by:   NVIDIA Networking
    
    (cherry picked from commit 7800af352ae377579b4fe49630aab8052c342e4c)
---
 sys/dev/mlx5/mlx5_en/mlx5_en_main.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
index bd1e344e65cd..7ac1367198d0 100644
--- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
+++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
@@ -1342,7 +1342,6 @@ mlx5e_enable_rq(struct mlx5e_rq *rq, struct mlx5e_rq_param *param)
 
 	memcpy(rqc, param->rqc, sizeof(param->rqc));
 
-	MLX5_SET(rqc, rqc, cqn, c->rq.cq.mcq.cqn);
 	MLX5_SET(rqc, rqc, state, MLX5_RQC_STATE_RST);
 	MLX5_SET(rqc, rqc, ts_format, ts_format);
 	MLX5_SET(rqc, rqc, flush_in_error_en, 1);
@@ -1430,6 +1429,9 @@ mlx5e_open_rq(struct mlx5e_channel *c,
 	if (err)
 		return (err);
 
+	/* set CQN in RQ parameters */
+	MLX5_SET(rqc, param->rqc, cqn, c->rq.cq.mcq.cqn);
+
 	err = mlx5e_enable_rq(rq, param);
 	if (err)
 		goto err_destroy_rq;
@@ -1527,6 +1529,9 @@ mlx5e_open_drop_rq(struct mlx5e_priv *priv,
 	if (err)
 		goto err_close_cq;
 
+	/* set CQN in RQ parameters */
+	MLX5_SET(rqc, param_rq.rqc, cqn, drop_rq->cq.mcq.cqn);
+
 	err = mlx5e_enable_rq(drop_rq, &param_rq);
 	if (err)
 		goto err_wq_destroy;