From patchwork Thu Feb 7 19:22:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1038318 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="jSWuaYCK"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43wSr65JvZz9sDr for ; Fri, 8 Feb 2019 06:22:30 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726949AbfBGTW3 (ORCPT ); Thu, 7 Feb 2019 14:22:29 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:53849 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726657AbfBGTW3 (ORCPT ); Thu, 7 Feb 2019 14:22:29 -0500 Received: by mail-wm1-f66.google.com with SMTP id d15so1071035wmb.3 for ; Thu, 07 Feb 2019 11:22:27 -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=3u+bSqlZBuPs4hjY25knzQHWhD43XfuwMlRaoZLp9hs=; b=jSWuaYCKwKMlooYmtTzjZex8dR3Hyub62NlzZLHv8/N0vVMajFI/3hXmBOSEzlmjmB smMwleptgfbE4x/aO6YaynwnjMpLgXupd0vTzdyMXYAfOUaHqP11mYd7/ogl2YJiF7Qu 4r9hJjuLr81CncY0rD/e9X59EeAWBGoaMSihDuLKLw4KCxRvxH4nOcNIPQ+iIBH051p5 MtK+8vQWQbH6mswZOLqcjo+2FivAxS+xc/T5z5SChIrWsyEAJnP2haLL83p1gAHiq6Mp wq3lhlpdgHgaMroA1r9G9Tkdka2NNdLF5Z+6eiw+kJzXG8soIH/+WmuJlgGrfS3k9gp8 WktA== 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=3u+bSqlZBuPs4hjY25knzQHWhD43XfuwMlRaoZLp9hs=; b=DtaRRmtsRfbVKJtvn5hxMjp21Wmc1jd2hCG2wl0g/AGK31jEX+QWH2OpPIr6I9P9Iz NrxsIeUXckaIh/doWKQ5yUBfnyTg8zg3lEngs86LgxV0yp63gNlqYKcCmHGRA2QVygNa vZQZS0NCxPsKglTJgzHXrLXBN3Slrf/v+Nr53TEIfMubMMV8nDaUIGahKj5en6NhvOjU v38HirB/nlGzWFhyJW2Ta9JFecaM5BLjHEcbbTIpv/7StRA6LcJuWRcgZtP1roP6Jhd2 2FK6ohU5OJXlN6Uj0eSQb/TE5tbE9bJfMPezb5kxZLdTEFL/4tek9Tg9EW9EN9tMrnIS Ks/w== X-Gm-Message-State: AHQUAuaTbNtr1DGfh3JVw9ZNQWe1cpWmkqtzOc8K24xOJ5UnfxIx/EjB +kZ3wrM0/GMWYxZWxE6KjDrUZtFP X-Google-Smtp-Source: AHgI3IZmcGldOImFtjLy9OQh7cnYn/jLjT9mRl8V+QoNwJp6L4/v1wTjLkGFSpSYwcWFjff+T8/9TQ== X-Received: by 2002:a1c:8484:: with SMTP id g126mr8974703wmd.117.1549567346866; Thu, 07 Feb 2019 11:22:26 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:a906:e81:1a0f:97bd? (p200300EA8BF1E200A9060E811A0F97BD.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:a906:e81:1a0f:97bd]) by smtp.googlemail.com with ESMTPSA id w23sm195767wmc.38.2019.02.07.11.22.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 11:22:26 -0800 (PST) To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" From: Heiner Kallweit Subject: [PATCH net-next] net: phy: don't double-read link status register if link is up Message-ID: Date: Thu, 7 Feb 2019 20:22:20 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.5.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 The link status register latches link-down events. Therefore, if link is reported as being up, there's no need for a second read. Signed-off-by: Heiner Kallweit --- drivers/net/phy/phy-c45.c | 2 ++ drivers/net/phy/phy_device.c | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/phy/phy-c45.c b/drivers/net/phy/phy-c45.c index d429c6a3e..19334fe5f 100644 --- a/drivers/net/phy/phy-c45.c +++ b/drivers/net/phy/phy-c45.c @@ -147,6 +147,8 @@ int genphy_c45_read_link(struct phy_device *phydev) val = phy_read_mmd(phydev, devad, MDIO_STAT1); if (val < 0) return val; + else if (val & MDIO_STAT1_LSTATUS) + continue; } val = phy_read_mmd(phydev, devad, MDIO_STAT1); diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index d490cd2a8..9369e1323 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -1735,8 +1735,12 @@ int genphy_update_link(struct phy_device *phydev) */ if (!phy_polling_mode(phydev)) { status = phy_read(phydev, MII_BMSR); - if (status < 0) + if (status < 0) { return status; + } else if (status & BMSR_LSTATUS) { + phydev->link = 1; + return 0; + } } /* Read link and autonegotiation status */