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 22ADCC43381 for ; Sun, 3 Mar 2019 18:59:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CFF2F20815 for ; Sun, 3 Mar 2019 18:59:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="U6zCjU0v" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726599AbfCCS7F (ORCPT ); Sun, 3 Mar 2019 13:59:05 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:34890 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726440AbfCCS7F (ORCPT ); Sun, 3 Mar 2019 13:59:05 -0500 Received: by mail-wr1-f67.google.com with SMTP id t18so3171788wrx.2 for ; Sun, 03 Mar 2019 10:59:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=TxZXRiKiMJ1B8lgyfF99G9ulqoODTYIAHoqbhaXi5Dk=; b=U6zCjU0vuwalJZ3RsTwGhGIEArkqnpv4BI7Gr6ycEUeEC95gDinLYc8VJbfdDL5Qoh +BumSsoNI3HFQWAzUIMw7RY/oo+Yjzinfkv8Z3Ps1JPZEUa9dsh7wkJcx9kTlCDw6KoP RhGG2o3e6HqbIkltS6TkubgD9McqCswtfe5OJHOjiphrjXf3rJLTyPY1ZkUfPG8w+Qch J2ZvCVb9Ye+EIvZw7NpQnV7LNQWHG8RXj0rQkmsWKp8g9tukhKrmhMvmQP/JiQ1dlUL1 JstJu8M4l69uztTQtT6N7HOLiARt/8rBEJWnJ8ewNtfbpuvGD7sNwAqrGVxgz5WMCgsQ 37zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=TxZXRiKiMJ1B8lgyfF99G9ulqoODTYIAHoqbhaXi5Dk=; b=m2SSDnQjlxdONxwkU5/RPBMUfXjm6qYMTpRBDFF7Y+lo0kuFmhZMhGxEgupS+K4dku PRCb7zfX7e0AQCNmvuD0X0VW0MYl9VBTXXWOYIpyilH6MCcxm0OsqKNaVY1m/rWtWGws UpPlPACOE9NpSi4jRMhA7dPqrxqbrnH9AyswA5aYuAhvB2gxU7+e2huAwaG+PUYun922 2CcSawzAzjV8Yz94x6w9xFfIBRvj4pZ1b+HFDT1xHDw9if+OYkA9gb6r+wakb3JRkuu2 N4ZyrJKdrxl7vVUloiaJX6koPP8QJJkIFF1yVAdUyopx80nJK3uIVDWyjQaBICc7Q/WE HMxw== X-Gm-Message-State: APjAAAWMcgCLWVYLqqCBRU61Bnidnjj403JdSlHyE4zl7pSZiDEbJM/Q LS42DcisYk4oD3yDecK9Taw= X-Google-Smtp-Source: APXvYqxr+Dc0IquwqCYMuCAe3pTmnQIPtoQHlVhplYpdtMdSAoRMGVMElgMNI7kchd46CHQOIQ+qzg== X-Received: by 2002:a5d:4412:: with SMTP id z18mr10201579wrq.111.1551639543407; Sun, 03 Mar 2019 10:59:03 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:35a8:f48d:4b19:96c9? (p200300EA8BF1E20035A8F48D4B1996C9.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:35a8:f48d:4b19:96c9]) by smtp.googlemail.com with ESMTPSA id d206sm11430840wmc.11.2019.03.03.10.59.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Mar 2019 10:59:02 -0800 (PST) From: Heiner Kallweit To: Andrew Lunn , Florian Fainelli , David Miller , Heiko Stuebner Cc: "netdev@vger.kernel.org" , linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Subject: [PATCH net-next] net: phy: improve handling link_change_notify callback Message-ID: <411b1c33-a245-0706-8afd-c4bea1b90f68@gmail.com> Date: Sun, 3 Mar 2019 19:58:57 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.5.1 MIME-Version: 1.0 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 Currently the Phy driver's link_change_notify callback is called whenever the state machine is run (every second if polling), no matter whether the state changed or not. This isn't needed and may confuse users considering the name of the callback. Therefore let's change the behavior and call this callback only in case of an actual state change. This requires changes to the at803x and rockchip drivers. at803x can be simplified so that it reacts on a state change to PHY_NOLINK only. The rockchip driver can also be much simplified. We simply re-init the AFE/DSP registers whenever we change to PHY_RUNNING and speed is 100Mbps. This causes very small overhead because we do this even if the speed was 100Mbps already. But this is neglectable and I think justified by the much simpler code. Changes are compile-tested only. Signed-off-by: Heiner Kallweit --- drivers/net/phy/at803x.c | 26 +++++++++----------------- drivers/net/phy/phy.c | 8 ++++---- drivers/net/phy/rockchip.c | 31 ++----------------------------- 3 files changed, 15 insertions(+), 50 deletions(-) diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c index f3e96191e..f315ab468 100644 --- a/drivers/net/phy/at803x.c +++ b/drivers/net/phy/at803x.c @@ -324,8 +324,6 @@ static int at803x_config_intr(struct phy_device *phydev) static void at803x_link_change_notify(struct phy_device *phydev) { - struct at803x_priv *priv = phydev->priv; - /* * Conduct a hardware reset for AT8030 every time a link loss is * signalled. This is necessary to circumvent a hardware bug that @@ -333,25 +331,19 @@ static void at803x_link_change_notify(struct phy_device *phydev) * in the FIFO. In such cases, the FIFO enters an error mode it * cannot recover from by software. */ - if (phydev->state == PHY_NOLINK) { - if (phydev->mdio.reset && !priv->phy_reset) { - struct at803x_context context; + if (phydev->state == PHY_NOLINK && phydev->mdio.reset) { + struct at803x_context context; - at803x_context_save(phydev, &context); + at803x_context_save(phydev, &context); - phy_device_reset(phydev, 1); - msleep(1); - phy_device_reset(phydev, 0); - msleep(1); + phy_device_reset(phydev, 1); + msleep(1); + phy_device_reset(phydev, 0); + msleep(1); - at803x_context_restore(phydev, &context); + at803x_context_restore(phydev, &context); - phydev_dbg(phydev, "%s(): phy was reset\n", - __func__); - priv->phy_reset = true; - } - } else { - priv->phy_reset = false; + phydev_dbg(phydev, "%s(): phy was reset\n", __func__); } } diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 3745220c5..5938c5acf 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -891,9 +891,6 @@ void phy_state_machine(struct work_struct *work) old_state = phydev->state; - if (phydev->drv && phydev->drv->link_change_notify) - phydev->drv->link_change_notify(phydev); - switch (phydev->state) { case PHY_DOWN: case PHY_READY: @@ -940,10 +937,13 @@ void phy_state_machine(struct work_struct *work) if (err < 0) phy_error(phydev); - if (old_state != phydev->state) + if (old_state != phydev->state) { phydev_dbg(phydev, "PHY state change %s -> %s\n", phy_state_to_str(old_state), phy_state_to_str(phydev->state)); + if (phydev->drv && phydev->drv->link_change_notify) + phydev->drv->link_change_notify(phydev); + } /* Only re-schedule a PHY state machine change if we are polling the * PHY, if PHY_IGNORE_INTERRUPT is set, then we will be moving diff --git a/drivers/net/phy/rockchip.c b/drivers/net/phy/rockchip.c index 95abf7072..9053b1d01 100644 --- a/drivers/net/phy/rockchip.c +++ b/drivers/net/phy/rockchip.c @@ -104,41 +104,14 @@ static int rockchip_integrated_phy_config_init(struct phy_device *phydev) static void rockchip_link_change_notify(struct phy_device *phydev) { - int speed = SPEED_10; - - if (phydev->autoneg == AUTONEG_ENABLE) { - int reg = phy_read(phydev, MII_SPECIAL_CONTROL_STATUS); - - if (reg < 0) { - phydev_err(phydev, "phy_read err: %d.\n", reg); - return; - } - - if (reg & MII_SPEED_100) - speed = SPEED_100; - else if (reg & MII_SPEED_10) - speed = SPEED_10; - } else { - int bmcr = phy_read(phydev, MII_BMCR); - - if (bmcr < 0) { - phydev_err(phydev, "phy_read err: %d.\n", bmcr); - return; - } - - if (bmcr & BMCR_SPEED100) - speed = SPEED_100; - else - speed = SPEED_10; - } - /* * If mode switch happens from 10BT to 100BT, all DSP/AFE * registers are set to default values. So any AFE/DSP * registers have to be re-initialized in this case. */ - if ((phydev->speed == SPEED_10) && (speed == SPEED_100)) { + if (phydev->state == PHY_RUNNING && phydev->speed == SPEED_100) { int ret = rockchip_integrated_phy_analog_init(phydev); + if (ret) phydev_err(phydev, "rockchip_integrated_phy_analog_init err: %d.\n", ret); -- 2.21.0