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 2E79227FD64; Tue, 27 May 2025 17:54:29 +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=1748368469; cv=none; b=rBe9JSlpkW4SGvPxVpgIo/GERZ0WHZ/7vn6yxWhAtQvn2s7WSCL4IDZL2rk/ImtcZB7/W2SdH56lNjMSFSq30tfwbisCgCkSoQeDFn11hceh66U8HmN3sVC9DoOJJ8HxsIupGrp5ANbj6i0LjWF8PnZ8QunIzZ1HIOEvM5C1P54= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748368469; c=relaxed/simple; bh=mOwCdJjLSUu0DXmyP98nugLGDu4bexTMUu9+grIpyUc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e2ScIlw+0lDEDr1UmQvzsgL4JGXiufyAHXWivmj5kGbdJZNeqxla3YY8+NsHirVaN4vGe00eEglB/LnDLgEl4MiI8ownA9eh7MmKLeotj4wZy//XXhya8PFNJO9VK4Gh4QuYuhLik8Pehr97djaHgV1PCvux8HGJ+N7ihJzGH5c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gJIxe005; 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="gJIxe005" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AF5A1C4CEE9; Tue, 27 May 2025 17:54:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748368469; bh=mOwCdJjLSUu0DXmyP98nugLGDu4bexTMUu9+grIpyUc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gJIxe005SHLcxM+C5C9Qteq9lJ4TPR+lYbrmbcJ5U5ZEpK3dNRxrX6pVg/gsGPoVx hKu4+O6n9VybEaDZiwbp+waZ+GYGhqCqdt+oF/TtNo1g4qRUCH/RNXSTytwbmYwndN 4PhxRznIKbH0cWQevxlYRrv0yjFbn/rqlIdLfpiA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Suman Ghosh , Simon Horman , Paolo Abeni , Sasha Levin Subject: [PATCH 6.14 717/783] octeontx2-pf: Avoid adding dcbnl_ops for LBK and SDP vf Date: Tue, 27 May 2025 18:28:34 +0200 Message-ID: <20250527162542.312125255@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250527162513.035720581@linuxfoundation.org> References: <20250527162513.035720581@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.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Suman Ghosh [ Upstream commit 184fb40f731bd3353b0887731f7caba66609e9cd ] Priority flow control is not supported for LBK and SDP vf. This patch adds support to not add dcbnl_ops for LBK and SDP vf. Fixes: 8e67558177f8 ("octeontx2-pf: PFC config support with DCBx") Signed-off-by: Suman Ghosh Reviewed-by: Simon Horman Link: https://patch.msgid.link/20250519072658.2960851-1-sumang@marvell.com Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c index 63ddd262d1229..1f53bd5e45604 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c @@ -729,9 +729,12 @@ static int otx2vf_probe(struct pci_dev *pdev, const struct pci_device_id *id) } #ifdef CONFIG_DCB - err = otx2_dcbnl_set_ops(netdev); - if (err) - goto err_free_zc_bmap; + /* Priority flow control is not supported for LBK and SDP vf(s) */ + if (!(is_otx2_lbkvf(vf->pdev) || is_otx2_sdp_rep(vf->pdev))) { + err = otx2_dcbnl_set_ops(netdev); + if (err) + goto err_free_zc_bmap; + } #endif otx2_qos_init(vf, qos_txqs); -- 2.39.5