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 X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 01034C5518A for ; Wed, 22 Apr 2020 10:36:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CA8CE2075A for ; Wed, 22 Apr 2020 10:36:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587551817; bh=qHq0PJZfeNozs32Q9ElxlrKBv7up3y1Nr6J7yUVMng8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CzofAv/8uEUGztnZsP4RZS8ZB73zs9oKHTm6OoTKeejPOHNcCBiY8KdeMs9+mQP5c tKjJxAuxQTYIMd/IyQPk2dg57rjNZAYfbZHcPyyvY3W2AprwqEC6hLHhXOS8Tbth6y lZOXcRZCRahcuUkGH/5yNMDiQJXjiSRKgaU/H25k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731351AbgDVKg4 (ORCPT ); Wed, 22 Apr 2020 06:36:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:58972 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730178AbgDVKWn (ORCPT ); Wed, 22 Apr 2020 06:22:43 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 96E3F2075A; Wed, 22 Apr 2020 10:22:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587550963; bh=qHq0PJZfeNozs32Q9ElxlrKBv7up3y1Nr6J7yUVMng8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L2vyFqVjSaqN3CBo0W5r3UT1yycCquFKtgckeC2RPVOK9xuk8cnFbBLvMdWWbqKVL gvmm9jCpOWSqEErEs0pQRbRwu9CxH9bNm7Gu7APJ6Kel4bqbWJ9serPrmUNYAcwlXg 4QhuVSR1wj0sjAsRRUXUlM/0kIb1gL+/voSV7Bfs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Aya Levin , Saeed Mahameed , Sasha Levin Subject: [PATCH 5.6 045/166] net/mlx5e: Enforce setting of a single FEC mode Date: Wed, 22 Apr 2020 11:56:12 +0200 Message-Id: <20200422095053.936347542@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200422095047.669225321@linuxfoundation.org> References: <20200422095047.669225321@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Aya Levin [ Upstream commit 4bd9d5070b92da012f2715cf8e4859acb78b8f35 ] Ethtool command allow setting of several FEC modes in a single set command. The driver can only set a single FEC mode at a time. With this patch driver will reply not-supported on setting several FEC modes. Signed-off-by: Aya Levin Signed-off-by: Saeed Mahameed Signed-off-by: Sasha Levin --- drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c index d2cfa247abc86..9710cdecb63af 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c @@ -1535,6 +1535,10 @@ static int mlx5e_set_fecparam(struct net_device *netdev, int mode; int err; + if (bitmap_weight((unsigned long *)&fecparam->fec, + ETHTOOL_FEC_BASER_BIT + 1) > 1) + return -EOPNOTSUPP; + for (mode = 0; mode < ARRAY_SIZE(pplm_fec_2_ethtool); mode++) { if (!(pplm_fec_2_ethtool[mode] & fecparam->fec)) continue; -- 2.20.1