bnxt_en: Eliminate unintended link toggle during FW reset

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 <colin.winegarden@broadcom.com>
Reviewed-by: Pavan Chebbi <pavan.chebbi@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index 7cc69957e529eff594370d9023c82b19f337b85b..eadaca42ed96cd699c9dfeb372614630e568e5de 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -2109,9 +2109,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