From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D29BF26A0D1; Tue, 8 Apr 2025 10:57:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744109842; cv=none; b=ZFuivFM+em+1VxICPvstANTvowocghgSThRLrMg4k5TPGI7YL4XHA8nfHShudXV8Jhr/AzjSLLmwAlIgYolgoTHUgyQzSuP0IZWDK50KfOEG5kG4Wf2tS/I7MnJetwXBSaIyNxEWK0CgA+svoZloKZg5aPE1v2/TEb8vV8Fflqc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744109842; c=relaxed/simple; bh=XGWuD9ap45mJQj37NzZnDi46duHUn1etuL3nPxS+Q4g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jpyi5kVn6KAV7xhDZQlSFtIFB/XjDXKBo2Xa5ugnxu3gDrKHy7PkrJ+KexYLKj++GM8A2w5aiIk5cbkrjgbyd/IpWvLtFYBU6Ba2qQ0C1Y76h0CaVmyzR5wYWXXWZHl3TrwqPSvVIGhM6cSO2ZJX88rqkijlAV+/ej43edYGaSE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=hExb22Eh; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="hExb22Eh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 60EC9C4CEE5; Tue, 8 Apr 2025 10:57:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744109842; bh=XGWuD9ap45mJQj37NzZnDi46duHUn1etuL3nPxS+Q4g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hExb22EhfxypapkPqaAIDgsOFDtLt8fh4g5p7y5GPwy3zVIXoilGutkE+Aga7Ok6w YrBgy6OLHzudF6J5u1tEF4XyJRUuGeTMJEMViwodw4u8Q5xDAEeYLG3uSuHt5HOchj DoRRIlMYswETebJpkHGO7emv4yoawTaRyyG7vK6I= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Saravanan Vajravel , Selvin Xavier , Leon Romanovsky , Sasha Levin Subject: [PATCH 5.10 072/227] RDMA/bnxt_re: Avoid clearing VLAN_ID mask in modify qp path Date: Tue, 8 Apr 2025 12:47:30 +0200 Message-ID: <20250408104822.557675962@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104820.353768086@linuxfoundation.org> References: <20250408104820.353768086@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Saravanan Vajravel [ 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 Signed-off-by: Selvin Xavier Link: https://patch.msgid.link/1741670196-2919-1-git-send-email-selvin.xavier@broadcom.com Signed-off-by: Leon Romanovsky Signed-off-by: Sasha Levin --- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/infiniband/hw/bnxt_re/qplib_fp.c b/drivers/infiniband/hw/bnxt_re/qplib_fp.c index 4ed78d25b6e9a..d5bb8017a468e 100644 --- a/drivers/infiniband/hw/bnxt_re/qplib_fp.c +++ b/drivers/infiniband/hw/bnxt_re/qplib_fp.c @@ -1163,8 +1163,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; -- 2.39.5