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 6379026B2CC; Tue, 25 Mar 2025 12:37:42 +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=1742906262; cv=none; b=sE6W/50mkonvyb8P40E7lRn4uoUaFTWcn+p4sHjd3FgK6TNYF5d2NAa+9enx7JOGDjLh3CLLUxOHgSwVKZZYF5C7wppx5kmbeiK1pRqNxLLJvf3LptrD6dk+3r+IltWHtpLzodwdDtBruuKeVFZFu1qRHsQHVy+Q4RFe22g8n7U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742906262; c=relaxed/simple; bh=ZAF5z880Us0cWvze1dsVcuhZCW4FfjbntzmOBQ1cEZs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=W5zHxMHjtqoLSyU3ZXHN/oNDYYmf7h7hYZ8Ztumh+om3rDOZ/u4Dpt77FaOzre+ZVI0YKcdQFjhP7JN9db1lmmCeGNCaIeRQaCv2/tA5r6tRlMIA3gxTzmkYrvr/aiRnE00mhKCuCwE7AU9FkCVHWfchJG5UHwdxRl85YQGZvMU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ZWu+ALY3; 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="ZWu+ALY3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A65C9C4CEE4; Tue, 25 Mar 2025 12:37:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1742906261; bh=ZAF5z880Us0cWvze1dsVcuhZCW4FfjbntzmOBQ1cEZs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZWu+ALY36gnLSf3oiMgbROQZ9u2AukYA2tqD8OWpRz+bGXpjFKOCqhAy6FK/QAXLA x+E7GNpJKzkNwp26w6H/0eqaYoMbfctBbLZxA87y9mQt+RMkW5eMD0gVsMU244434i 2YZBFlzl9g3aTZBcT4vVYjckMLkLS6jTNcS3xhP8= 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 6.12 023/116] RDMA/bnxt_re: Avoid clearing VLAN_ID mask in modify qp path Date: Tue, 25 Mar 2025 08:21:50 -0400 Message-ID: <20250325122149.809306042@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250325122149.207086105@linuxfoundation.org> References: <20250325122149.207086105@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 6.12-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 613b5fc70e13e..7436ce5515797 100644 --- a/drivers/infiniband/hw/bnxt_re/qplib_fp.c +++ b/drivers/infiniband/hw/bnxt_re/qplib_fp.c @@ -1216,8 +1216,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