From patchwork Wed Jan 9 19:34:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1022598 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="kkmL2Rh/"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43ZfV71bQvz9sN4 for ; Thu, 10 Jan 2019 06:35:11 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728351AbfAITfJ (ORCPT ); Wed, 9 Jan 2019 14:35:09 -0500 Received: from mail-wr1-f48.google.com ([209.85.221.48]:41107 "EHLO mail-wr1-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727123AbfAITfJ (ORCPT ); Wed, 9 Jan 2019 14:35:09 -0500 Received: by mail-wr1-f48.google.com with SMTP id x10so8850616wrs.8 for ; Wed, 09 Jan 2019 11:35:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=TmAL2/8hMvtSR2I+X5Hywqj38ZTq3cNpilhbO/sEi4A=; b=kkmL2Rh/OKLA6slu40oAhKAHZ37Zq4oGRJlXeMlPNoX09LsJlqeRHssT+C1svPRIYS Ihu9eeCQF9mSFymfOMhHGHzbUca5mxcBX6ra673mJGHDWWvW7ZEKx22M5QCWhNNsWhVc I1jgkTQBGSFI5CYV95tm1hz+dIyaLba3Rpn5k++TZ5s/ejJJn7uJXrzPD0lo93B9sxOY +n8IcG4RolAjHJaFD+B0OWYNQSuabEXvC4p56Ivkj1XcnXv5wAh25hX8259Or7m8FqMH lvOfGSBBRHUxfbsJDIR+MmiZyAUipHUrXjFx1z2FVBHUA7eue5lGF+MC/gAKwUH1pFVK JGag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=TmAL2/8hMvtSR2I+X5Hywqj38ZTq3cNpilhbO/sEi4A=; b=fMzdk1nsU4xa7Z05ukFXnQ0kA3GdyqzVdbqEO0xzTIPRXg3/Xny5BqN0rZxki1a1r1 sR9ZdIlQXbRAfQOP4RL5uoPkCZrTlziq2QdBRMtsTsLtxkVCN2zfM1GMvaXhMJi4EL7f +S8iVsi0OS4VGGTttNYGLQVeKH7RafpCCjGx2WvbCWDYOoaarb3l4PLR5DSK0RaqGZqS hWE4ENbH5ABkHvj/0rUkOBa+/IEAbvyjDrZH9tyLVO7UzKU6pexy/oG0ripP9nHIhE7X EjPfJpzBl6pQ6F6ZP3mMWQw8iHqKxQWocRVScAkD6JJlWEfSZAPgxYaV+iQFTh3Kl5ce +wEw== X-Gm-Message-State: AJcUukd4kuujqkt2cu4ZlpctItEHbhlu+LPTH3KSb49j6Y8+OVtc6oNx QI2l2wipajuolm/Q38NXC9o= X-Google-Smtp-Source: ALg8bN5XnanGQrKu+X5wQdoKRSpGPxNaBF5s2Sn++jolnldqMcCYoYJvxgmBaoI3UK94Nk6pLfzUiA== X-Received: by 2002:a5d:45d0:: with SMTP id b16mr5958765wrs.86.1547062506287; Wed, 09 Jan 2019 11:35:06 -0800 (PST) Received: from ?IPv6:2003:ea:8be2:e400:30af:bb11:dc41:cedc? (p200300EA8BE2E40030AFBB11DC41CEDC.dip0.t-ipconnect.de. [2003:ea:8be2:e400:30af:bb11:dc41:cedc]) by smtp.googlemail.com with ESMTPSA id n6sm13675617wmk.9.2019.01.09.11.35.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Jan 2019 11:35:05 -0800 (PST) To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" , Chris Wilson From: Heiner Kallweit Subject: [PATCH net] net: phy: fix too strict check in phy_start_aneg Message-ID: <0a5701fa-0c5b-2375-08d6-a65145f83d96@gmail.com> Date: Wed, 9 Jan 2019 20:34:56 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When adding checks to detect wrong usage of the phylib API we added a check to phy_start_aneg() which is too strict. If the phylib state machine is in state PHY_HALTED we should allow reconfiguring and restarting aneg, and just don't touch the state. Fixes: 2b3e88ea6528 ("net: phy: improve phy state checking") Reported-by: Chris Wilson Signed-off-by: Heiner Kallweit Tested-by: Chris Wilson Reviewed-by: Florian Fainelli --- drivers/net/phy/phy.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index d33e7b3ca..189cd2048 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -543,13 +543,6 @@ int phy_start_aneg(struct phy_device *phydev) mutex_lock(&phydev->lock); - if (!__phy_is_started(phydev)) { - WARN(1, "called from state %s\n", - phy_state_to_str(phydev->state)); - err = -EBUSY; - goto out_unlock; - } - if (AUTONEG_DISABLE == phydev->autoneg) phy_sanitize_settings(phydev); @@ -560,11 +553,13 @@ int phy_start_aneg(struct phy_device *phydev) if (err < 0) goto out_unlock; - if (phydev->autoneg == AUTONEG_ENABLE) { - err = phy_check_link_status(phydev); - } else { - phydev->state = PHY_FORCING; - phydev->link_timeout = PHY_FORCE_TIMEOUT; + if (__phy_is_started(phydev)) { + if (phydev->autoneg == AUTONEG_ENABLE) { + err = phy_check_link_status(phydev); + } else { + phydev->state = PHY_FORCING; + phydev->link_timeout = PHY_FORCE_TIMEOUT; + } } out_unlock: