From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 84BF2C4332F for ; Wed, 23 Feb 2022 17:04:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243138AbiBWRFY (ORCPT ); Wed, 23 Feb 2022 12:05:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54370 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243132AbiBWRFJ (ORCPT ); Wed, 23 Feb 2022 12:05:09 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 469CF5044E for ; Wed, 23 Feb 2022 09:04:42 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D8A4D60FDF for ; Wed, 23 Feb 2022 17:04:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E5154C340EB; Wed, 23 Feb 2022 17:04:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645635881; bh=sMNnaBhHrJxhLhgkhKxTNmWwYE/paHhEfrkjZeIpTC4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SlFCcA9v6DFq3JrTSa/7fLa3Xkbin2GAjm7+va1f5WPS8moFlcqh7j5bgsXokjwse Su+LXNxMdhU1RYLYtkpHA+azt/THka1IbzsYzUcEiZ3z9Gp1/yh878NrI26StIyrjy kgFnaaYwPOKbZFdv4kNMn59Cp7/SqfzZVm/7rswhBs4HuHbqd255TL+VDN9Zqqiusr pRbtyGYCfao1gwGE4eScpYaI5wuZnZjoH7hfJc6pqDE4jzB6Z01CC18eRRqRjE9glj t3lzouFUSLHG9utgOp3s8th449e+6mIPDB285rSXrmwMoaBFC1zNnVHuG8PUiYs4Eu n4k02DUDZnUFw== From: Saeed Mahameed To: "David S. Miller" , Jakub Kicinski Cc: netdev@vger.kernel.org, Chris Mi , Roi Dayan , Saeed Mahameed Subject: [net 08/19] net/mlx5: Fix tc max supported prio for nic mode Date: Wed, 23 Feb 2022 09:04:19 -0800 Message-Id: <20220223170430.295595-9-saeed@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220223170430.295595-1-saeed@kernel.org> References: <20220223170430.295595-1-saeed@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Chris Mi Only prio 1 is supported if firmware doesn't support ignore flow level for nic mode. The offending commit removed the check wrongly. Add it back. Fixes: 9a99c8f1253a ("net/mlx5e: E-Switch, Offload all chain 0 priorities when modify header and forward action is not supported") Signed-off-by: Chris Mi Reviewed-by: Roi Dayan Signed-off-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c index df58cba37930..1e8ec4f236b2 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c @@ -121,6 +121,9 @@ u32 mlx5_chains_get_nf_ft_chain(struct mlx5_fs_chains *chains) u32 mlx5_chains_get_prio_range(struct mlx5_fs_chains *chains) { + if (!mlx5_chains_prios_supported(chains)) + return 1; + if (mlx5_chains_ignore_flow_level_supported(chains)) return UINT_MAX; -- 2.35.1