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 X-Spam-Level: X-Spam-Status: No, score=-7.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 06ABEC61CE4 for ; Sat, 19 Jan 2019 11:30:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BF53520821 for ; Sat, 19 Jan 2019 11:30:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ocS0e6bt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727924AbfASLad (ORCPT ); Sat, 19 Jan 2019 06:30:33 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:44962 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727758AbfASLad (ORCPT ); Sat, 19 Jan 2019 06:30:33 -0500 Received: by mail-wr1-f65.google.com with SMTP id z5so18027930wrt.11 for ; Sat, 19 Jan 2019 03:30:32 -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=ocS0e6btvENiF5c1klk9R13Zg93te07Gtwl5/LGBjIJdosWSWQcxUVa2tcQRo2FY/Z /JChitp0mG3bgtj5Pol/kwFD9tBw7UfCuqpVzT4EUbWkJ8nM4oUnkc7ucrX9SZf+G8yu AbzHzGqTIEqJv+fIUIPxK00Yrf9JzgpX8MaGZWzPsCLMymkXT6rtCsCiosD7sspNExM9 CsTeFjRyO3M+U2eEmuQbw94lzHEUTUgZRSbROqKSAjwDgmyHjuxvASz0FG08pkb8TQan zFZUwpl2zLiQfbhBoDETfdwPuj+vQ2YqWxKzyGGWsvKlv4Csf0tirzgxDts05BI7TsNe 1Ssw== 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=lXnRTYX+4iqK4uE581g9wofk8/xZdkV01xNU03np5JNsIBk3cBOFQkgGx3melKDT29 soMuNP2ALliLaIHNudKkttK2ns6R6astjxX065xd814T4iiJZFExevUWQbts2rpQ2QWK 2ODCd80WYQTyowIdUIWzUPm2yM1OaAAyIOaPsr0PEb+JveZDrIdXfo+tNgWL4x4ksFp4 OgYhvZW9PQVuIztCnYB9n+fPL3XwbjLfuPuVpwCNN/0q3J75IENfr6lQaOOZ5BoJbN6/ sEoKJb97B+YfY6kDiyTlWsn310ItKfLmrOFpEA/wEM73qXt2QAUvnAymi+LPWZrd1qXx 2Y3A== X-Gm-Message-State: AJcUukeBUI54ZTNpdQ6XgJAc/UQ/MNDedd4dVM3ZZ7XC7hJZHaHJoISV jXQbmgmoQ1+GEok1yiBNnY9doRj5 X-Google-Smtp-Source: ALg8bN5bTFUCMLO0+49vogAjTgrGGsSh390w5m0TuXwDfrHtTt1RQj2+uK3jgI3RewFqmloa/s5Efg== X-Received: by 2002:adf:ce02:: with SMTP id p2mr21888774wrn.185.1547897431434; Sat, 19 Jan 2019 03:30:31 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:5cdd:5de5:6c17:efb0? (p200300EA8BF1E2005CDD5DE56C17EFB0.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:5cdd:5de5:6c17:efb0]) by smtp.googlemail.com with ESMTPSA id p10sm30111320wrt.25.2019.01.19.03.30.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Jan 2019 03:30:30 -0800 (PST) Subject: [PATCH net-next 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" References: <2d4ceacd-3b1d-84d5-02ab-32e508badc6a@gmail.com> Message-ID: Date: Sat, 19 Jan 2019 12:28:09 +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: <2d4ceacd-3b1d-84d5-02ab-32e508badc6a@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit 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); -- 2.20.1