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 B33B3C4167D for ; Fri, 1 Apr 2022 15:37:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349896AbiDAPdJ (ORCPT ); Fri, 1 Apr 2022 11:33:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54614 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350681AbiDAPAZ (ORCPT ); Fri, 1 Apr 2022 11:00:25 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 009E939BBC; Fri, 1 Apr 2022 07:48:52 -0700 (PDT) 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 ams.source.kernel.org (Postfix) with ESMTPS id AA23CB82511; Fri, 1 Apr 2022 14:48:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 46825C340EE; Fri, 1 Apr 2022 14:48:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648824530; bh=av19gS1Vwqycqn6qy89wsM+ZCrzuOqFyNuULHf6cmsU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ArqEK8Dvdcv7H4ekQOLl49rGztswkeKeqmhIndoELjNfJLjUGFhcX356fM9ANWr+P x86r1eAUaXzL0JnWaNxbC08q8ppnarDrofnJNraSR6+cPvq47Nl/fanLsyLF4Ui5vE XFi2SdlbD58izuPdnnJFgTegLSVHgeJfqn9Qj8a+5tsLXv58w7Iq/FRccDXGSKYRre dTY4wS7Zf+VxNrEXECCbTrSclgES53K12eTrAKKgj2SDVQ3Sw7MViL5J2UXLGdpy3p zngIzbtk6y6148n/rHlUgYGbyHYRzOhOInM9IrbKN9EBSA4RhnWpVW7hpgrxnqzEqw xGIb9g5ef5y+A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Michael Chan , Colin Winegarden , Pavan Chebbi , "David S . Miller" , Sasha Levin , kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 10/16] bnxt_en: Eliminate unintended link toggle during FW reset Date: Fri, 1 Apr 2022 10:48:21 -0400 Message-Id: <20220401144827.1955845-10-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220401144827.1955845-1-sashal@kernel.org> References: <20220401144827.1955845-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Michael Chan [ Upstream commit 7c492a2530c1f05441da541307c2534230dfd59b ] If the flow control settings have been changed, a subsequent FW reset may cause the ethernet link to toggle unnecessarily. This link toggle will increase the down time by a few seconds. The problem is caused by bnxt_update_phy_setting() detecting a false mismatch in the flow control settings between the stored software settings and the current FW settings after the FW reset. This mismatch is caused by the AUTONEG bit added to link_info->req_flow_ctrl in an inconsistent way in bnxt_set_pauseparam() in autoneg mode. The AUTONEG bit should not be added to link_info->req_flow_ctrl. Reviewed-by: Colin Winegarden Reviewed-by: Pavan Chebbi Signed-off-by: Michael Chan Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c index 9e5251c427a3..401d9718841f 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c @@ -1008,9 +1008,7 @@ static int bnxt_set_pauseparam(struct net_device *dev, } link_info->autoneg |= BNXT_AUTONEG_FLOW_CTRL; - if (bp->hwrm_spec_code >= 0x10201) - link_info->req_flow_ctrl = - PORT_PHY_CFG_REQ_AUTO_PAUSE_AUTONEG_PAUSE; + link_info->req_flow_ctrl = 0; } else { /* when transition from auto pause to force pause, * force a link change -- 2.34.1