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 ADC05C433F5 for ; Fri, 1 Apr 2022 15:37:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350338AbiDAPdx (ORCPT ); Fri, 1 Apr 2022 11:33:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350634AbiDAPAX (ORCPT ); Fri, 1 Apr 2022 11:00:23 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD975185456; Fri, 1 Apr 2022 07:48:09 -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 8C515B824D5; Fri, 1 Apr 2022 14:48:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 269A6C340EE; Fri, 1 Apr 2022 14:48:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648824487; bh=ulJv5RK4iSxFKOHXkuC9VI3irqWLij/V3egYQRn3vT0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aETqlPf3vqmitGqJswZEOh5rbv9liI5d/SkvGM1HQ+56tG8FFGVdOsxRJyP30MxZP bLmlm9sJJPNujS0xmYIXOE9H9VwNSBIJNgccRwHTZhIE8Rqot2cEog66/B+Zapgp1W BVkdZh7qyRfP0VXYrkeeWQhxXh+gSnUkQSsbXt1+olODqXFJ2V9pX1i1kzRqNUhfQ1 oudlQzsm+4So0TvfKlHB4fhMA6zJ7DN66V7q0xshcMGRZt2oniE5SB46v9xzDl2xMt rP6QcJpjXcQ3QwUEs0wYPmyl0g9v31bzbcup20F2jUUSnaw4oBqokaKM5ya9n1PrAr YVsItPaqqjFKA== 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.14 15/22] bnxt_en: Eliminate unintended link toggle during FW reset Date: Fri, 1 Apr 2022 10:47:22 -0400 Message-Id: <20220401144729.1955554-15-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220401144729.1955554-1-sashal@kernel.org> References: <20220401144729.1955554-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 e3123cb0fb70..82e16b2d1f7a 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c @@ -1272,9 +1272,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