RDMA/bnxt_re: Avoid clearing VLAN_ID mask in modify qp path

[ Upstream commit 81c0db302a674f8004ed805393d17fd76f552e83 ]

Driver is always clearing the mask that sets the VLAN ID/Service Level
in the adapter. Recent change for supporting multiple traffic class
exposed this issue.

Allow setting SL and VLAN_ID while QP is moved from INIT to RTR state.

Fixes: 1ac5a4047975 ("RDMA/bnxt_re: Add bnxt_re RoCE driver")
Fixes: c64b16a37b6d ("RDMA/bnxt_re: Support different traffic class")
Signed-off-by: Saravanan Vajravel <saravanan.vajravel@broadcom.com>
Signed-off-by: Selvin Xavier <selvin.xavier@broadcom.com>
Link: https://patch.msgid.link/1741670196-2919-1-git-send-email-selvin.xavier@broadcom.com
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/infiniband/hw/bnxt_re/qplib_fp.c b/drivers/infiniband/hw/bnxt_re/qplib_fp.c
index c4f10498c79d879b5b28c0e19dca98046a445516..68ea4ed0b171b8c594b1401a46ff80cf43f471e4 100644 (file)
--- a/drivers/infiniband/hw/bnxt_re/qplib_fp.c
+++ b/drivers/infiniband/hw/bnxt_re/qplib_fp.c
@@ -1197,8 +1197,6 @@ static void __modify_flags_from_init_state(struct bnxt_qplib_qp *qp)
                        qp->path_mtu =
                                CMDQ_MODIFY_QP_PATH_MTU_MTU_2048;
                }
-               qp->modify_flags &=
-                       ~CMDQ_MODIFY_QP_MODIFY_MASK_VLAN_ID;
                /* Bono FW require the max_dest_rd_atomic to be >= 1 */
                if (qp->max_dest_rd_atomic < 1)
                        qp->max_dest_rd_atomic = 1;