From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752803AbdBFX5F (ORCPT ); Mon, 6 Feb 2017 18:57:05 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:36675 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752504AbdBFX4H (ORCPT ); Mon, 6 Feb 2017 18:56:07 -0500 From: Florian Fainelli To: netdev@vger.kernel.org Cc: zefir.kurtisi@neratec.com, Florian Fainelli , Sebastian Hesselbarth , Wingman Kwok , Murali Karicheri , Andrew Lunn , Vivien Didelot , "David S. Miller" , Philippe Reynes , Sergei Shtylyov , Jisheng Zhang , Jarod Wilson , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net-next 1/4] net: mv643xx_eth: Do not clobber PHY link outside of state machine Date: Mon, 6 Feb 2017 15:55:20 -0800 Message-Id: <20170206235523.23216-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170206235523.23216-1-f.fainelli@gmail.com> References: <20170206235523.23216-1-f.fainelli@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Calling phy_read_status() means that we may call into genphy_read_status() which in turn will use genphy_update_link() which can make changes to phydev->link outside of the state machine's state transitions. This is an invalid behavior that is now caught as of 811a919135b9 ("phy state machine: failsafe leave invalid RUNNING state") Signed-off-by: Florian Fainelli --- drivers/net/ethernet/marvell/mv643xx_eth.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c index 20cb7f0de601..25642dee49d3 100644 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c @@ -1504,9 +1504,7 @@ mv643xx_eth_get_link_ksettings_phy(struct mv643xx_eth_private *mp, int err; u32 supported, advertising; - err = phy_read_status(dev->phydev); - if (err == 0) - err = phy_ethtool_ksettings_get(dev->phydev, cmd); + err = phy_ethtool_ksettings_get(dev->phydev, cmd); /* * The MAC does not support 1000baseT_Half. -- 2.9.3