Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Antoine Tenart <antoine.tenart@free-electrons.com>
To:     rmk@armlinux.org.uk, andrew@lunn.ch, f.fainelli@gmail.com,
        davem@davemloft.net
Cc:     Yan Markman <ymarkman@marvell.com>,
        gregory.clement@free-electrons.com,
        thomas.petazzoni@free-electrons.com,
        miquel.raynal@free-electrons.com, nadavh@marvell.com,
        mw@semihalf.com, stefanc@marvell.com, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org,
        Antoine Tenart <antoine.tenart@free-electrons.com>
Subject: [PATCH net] net: phylink: fix link state on phy-connect
Date:   Tue, 28 Nov 2017 14:29:32 +0100
Message-Id: <20171128132932.27196-1-antoine.tenart@free-electrons.com>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

From: Yan Markman <ymarkman@marvell.com>

When calling successively _connect, _disconnect and _connect again, if
the link configuration changed whilst being down from the phylink
perspective, the last _connect would stay in an incorrect old speed.
Fixes this by setting the link configuration parameters to an unknown
value when calling phylink_bringup_phy.

Fixes: 9525ae83959b ("phylink: add phylink infrastructure")
Signed-off-by: Yan Markman <ymarkman@marvell.com>
[Antoine: commit message]
Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
---
 drivers/net/phy/phylink.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index e3bbc70372d3..c2cec3eef67d 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -621,6 +621,16 @@ static int phylink_bringup_phy(struct phylink *pl, struct phy_device *phy)
 	if (ret)
 		return ret;
 
+	/* On _disconnect, the phy state machine and phylink resolve
+	 * are stopped before executing full gracefull down/reset state.
+	 * The further _connect starts with incorrect init state. Let's set
+	 * init values here.
+	 */
+	pl->phy_state.link = false;
+	pl->link_config.pause = MLO_PAUSE_AN;
+	pl->link_config.speed = SPEED_UNKNOWN;
+	pl->link_config.duplex = DUPLEX_UNKNOWN;
+
 	phy->phylink = pl;
 	phy->phy_link_change = phylink_phy_change;
 
-- 
2.14.3


From 1585690013178767043@xxx Sat Dec 02 16:23:59 +0000 2017
X-GM-THRID: 1585688578633083008
X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread