From patchwork Wed Jan 23 06:27:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1029687 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="jhNRpQpN"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43kwTC4CL6z9s4s for ; Wed, 23 Jan 2019 17:33:03 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726238AbfAWGdB (ORCPT ); Wed, 23 Jan 2019 01:33:01 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:52899 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725945AbfAWGdB (ORCPT ); Wed, 23 Jan 2019 01:33:01 -0500 Received: by mail-wm1-f66.google.com with SMTP id m1so814525wml.2 for ; Tue, 22 Jan 2019 22:32:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=n0jXgakLLs0Hww0stRuyZasnIPaIt2llUAZ2RuUri1g=; b=jhNRpQpNMZwthuTToAPk7EZwrurbbMRJ7DnyEIYhrX2t4o2N/EMzzqKg/ffuIxuJ3G sBuRiI8zQaSWTqMVcz7PcFPqcQjqm0cY9LK5rWNnI00cMUTIxnguRhBNng+10QMyPAKv ZWf+jJNeIFaCrc8FTIjriA0qEI0nyBO9pTtQYMXXiKehLfuanmdl9lBT5EvkXAAmhx8/ 3qlrqYRXDy9gsyTGXugWV+S9eOG7tFxMcuAZHZL12ZMk70Yp0qs403eS/L4V6d6vlwcb HQ/sTtVT5zSAQTBv1fdJ18kbdSBH0nLF0RudJtOewckQy5raG26HqdseSQS6tx6HvHqk zvcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=n0jXgakLLs0Hww0stRuyZasnIPaIt2llUAZ2RuUri1g=; b=SSX7sjzADqSIRs78pjFX4toy7EnNs7VDDfDcP9nzQtIFV+149szBdjaC5wX0l/ucZg 8kOOqBNR7Z0Cjf5F1V3Xzj21u0jAa+V/iu4yV8Q9BSCdAp8VF9Q3wFn1XudmzqDgS+lZ 2dRxkMY4VFDB8Qgw3xePlk5Pl9PJqLTC8JISAUvmRti+uJrTpYfRy27gie1LtGLQuxib llYyXr9Ne4QHBsNBVbicoDjFsSOQjr/B8Brobc5ffqdSgC3qiMZdL7b89urMLnSsILo2 b4xAj33jiLiZQgagOAGENtsDrQfWUTL1sSdXEzFNG6XsUv2gyPzvK/g1mx2JFZuiZuvW Qxvg== X-Gm-Message-State: AJcUukfDmzN3yqKvBVyVxe/bMidbtGYrrippDZwRenorytzlBXdiUjeI IAuyfYsflpcnnyBjbP1Yxl4= X-Google-Smtp-Source: ALg8bN4aBNduXhubB9L0JbUKq03tmnAESXBYb8bI8OCkwd6cWTihKl6Z0lRnr4qohVe//3fYlhskyw== X-Received: by 2002:a1c:2457:: with SMTP id k84mr1336291wmk.139.1548225178979; Tue, 22 Jan 2019 22:32:58 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:341c:e0b9:6ec:c590? (p200300EA8BF1E200341CE0B906ECC590.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:341c:e0b9:6ec:c590]) by smtp.googlemail.com with ESMTPSA id q3sm107649518wrn.84.2019.01.22.22.32.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Jan 2019 22:32:58 -0800 (PST) Subject: [PATCH net-next v3 1/4] net: phy: start state machine in phy_start only From: Heiner Kallweit To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" , "S-k, Shyam-sundar" References: Message-ID: <69890887-673f-21b6-1652-db6a68ad2976@gmail.com> Date: Wed, 23 Jan 2019 07:27:21 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The state machine is a no-op before phy_start() has been called. Therefore let's enable it in phy_start() only. In phy_start() let's call phy_start_machine() instead of phy_trigger_machine(). phy_start_machine is an alias for phy_trigger_machine but it makes clearer that we start the state machine here instead of just triggering a run. Signed-off-by: Heiner Kallweit --- drivers/net/phy/phy.c | 2 +- drivers/net/phy/phy_device.c | 1 - drivers/net/phy/phylink.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 745a705a5..3df6aadc5 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -883,7 +883,7 @@ void phy_start(struct phy_device *phydev) } mutex_unlock(&phydev->lock); - phy_trigger_machine(phydev); + phy_start_machine(phydev); } EXPORT_SYMBOL(phy_start); diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index e0ceecbed..3e284d596 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -944,7 +944,6 @@ int phy_connect_direct(struct net_device *dev, struct phy_device *phydev, return rc; phy_prepare_link(phydev, handler); - phy_start_machine(phydev); if (phydev->irq > 0) phy_start_interrupts(phydev); diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index e7becc737..e9b8f1037 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -679,7 +679,6 @@ static int phylink_bringup_phy(struct phylink *pl, struct phy_device *phy) __ETHTOOL_LINK_MODE_MASK_NBITS, pl->supported, __ETHTOOL_LINK_MODE_MASK_NBITS, phy->advertising); - phy_start_machine(phy); if (phy->irq > 0) phy_start_interrupts(phy);