From patchwork Mon Mar 20 09:20:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 13180837 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 654F6C761A6 for ; Mon, 20 Mar 2023 09:21:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231298AbjCTJVd (ORCPT ); Mon, 20 Mar 2023 05:21:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231297AbjCTJVK (ORCPT ); Mon, 20 Mar 2023 05:21:10 -0400 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F74D2386D for ; Mon, 20 Mar 2023 02:20:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=k1; bh=7Zwba6nDD3ZJS5 L+6Li+wbx6Tde6WzY3HBI8Ie4GLpQ=; b=NQWTAoiZkjUiVwvsNm1tXH25VdagxA OYQl1zEN2tIn7jrsIqua5NKHO7dK7G3Wl2RyR04k36cfFqZlWJnjqeVuLQMGKMZE itt7uhI8wYTMMatFwMA1YZnYwDHzKFoTJrH1IVRn0x55eLu5oxJO3xUle1y5Bf1m zwXMzabmsuRac= Received: (qmail 860449 invoked from network); 20 Mar 2023 10:20:47 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 20 Mar 2023 10:20:47 +0100 X-UD-Smtp-Session: l3s3148p1@w0M5cVH3Ztwujnuq From: Wolfram Sang To: netdev@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org, Geert Uytterhoeven , Wolfram Sang , Steve Glendinning , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-kernel@vger.kernel.org Subject: [PATCH net v2 1/2] smsc911x: only update stats when interface is up Date: Mon, 20 Mar 2023 10:20:40 +0100 Message-Id: <20230320092041.1656-2-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230320092041.1656-1-wsa+renesas@sang-engineering.com> References: <20230320092041.1656-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Otherwise the clocks are not enabled and reading registers will BUG. Fixes: 1e30b8d755b8 ("net: smsc911x: Make Runtime PM handling more fine-grained") Suggested-by: Geert Uytterhoeven Signed-off-by: Wolfram Sang Reviewed-by: Simon Horman Reviewed-by: Florian Fainelli --- Changes since v1: * patch is not a revert but a proper fix this time drivers/net/ethernet/smsc/smsc911x.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c index a2e511912e6a..67cb5eb9c716 100644 --- a/drivers/net/ethernet/smsc/smsc911x.c +++ b/drivers/net/ethernet/smsc/smsc911x.c @@ -1838,8 +1838,12 @@ smsc911x_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) static struct net_device_stats *smsc911x_get_stats(struct net_device *dev) { struct smsc911x_data *pdata = netdev_priv(dev); - smsc911x_tx_update_txcounters(dev); - dev->stats.rx_dropped += smsc911x_reg_read(pdata, RX_DROP); + + if (netif_running(dev)) { + smsc911x_tx_update_txcounters(dev); + dev->stats.rx_dropped += smsc911x_reg_read(pdata, RX_DROP); + } + return &dev->stats; } From patchwork Mon Mar 20 09:20:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 13180838 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 40E01C7618D for ; Mon, 20 Mar 2023 09:22:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231326AbjCTJWB (ORCPT ); Mon, 20 Mar 2023 05:22:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231276AbjCTJVT (ORCPT ); Mon, 20 Mar 2023 05:21:19 -0400 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD0D2234D8 for ; Mon, 20 Mar 2023 02:20:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=k1; bh=DfsC6bnYi3tDvb jmiiFrhH8pT9NOHPzKI8k3QOYtKg4=; b=PO6n0iREOsfnz106nHUPWkLnOvShlT TfOKOYGGy8CDH2eTvqBzALWKu4PxkuGshlsdbU1iEVpFQ8RqTaGfh4ZF7yI6Te+n j+LuEKyP1LoAKhWmiInnVl6Sm1bLUdyflLP6kyg5Zh73udbWGr3bZEpNzG39b/6c GgMm24oe5+fR8= Received: (qmail 860502 invoked from network); 20 Mar 2023 10:20:48 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 20 Mar 2023 10:20:48 +0100 X-UD-Smtp-Session: l3s3148p1@lVZDcVH3btwujnuq From: Wolfram Sang To: netdev@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org, Geert Uytterhoeven , Wolfram Sang , Heiner Kallweit , Steve Glendinning , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Florian Fainelli , linux-kernel@vger.kernel.org Subject: [PATCH net v2 2/2] smsc911x: avoid PHY being resumed when interface is not up Date: Mon, 20 Mar 2023 10:20:41 +0100 Message-Id: <20230320092041.1656-3-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230320092041.1656-1-wsa+renesas@sang-engineering.com> References: <20230320092041.1656-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org SMSC911x doesn't need mdiobus suspend/resume, that's why it sets 'mac_managed_pm'. However, setting it needs to be moved from init to probe, so mdiobus PM functions will really never be called (e.g. when the interface is not up yet during suspend/resume). The errno is changed because ENODEV has a special meaning when returned in probe(). Fixes: 3ce9f2bef755 ("net: smsc911x: Stop and start PHY during suspend and resume") Suggested-by: Heiner Kallweit Signed-off-by: Wolfram Sang Reviewed-by: Simon Horman --- Changes since v1: * no change In smsc911x_mii_probe(), I remove the sanity check for 'phydev' because it was already done in smsc911x_mii_init(). Let me know if this is acceptable or if a more defensive approach is favoured. drivers/net/ethernet/smsc/smsc911x.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c index 67cb5eb9c716..8b875bbbc05e 100644 --- a/drivers/net/ethernet/smsc/smsc911x.c +++ b/drivers/net/ethernet/smsc/smsc911x.c @@ -1019,12 +1019,7 @@ static int smsc911x_mii_probe(struct net_device *dev) struct phy_device *phydev = NULL; int ret; - /* find the first phy */ phydev = phy_find_first(pdata->mii_bus); - if (!phydev) { - netdev_err(dev, "no PHY found\n"); - return -ENODEV; - } SMSC_TRACE(pdata, probe, "PHY: addr %d, phy_id 0x%08X", phydev->mdio.addr, phydev->phy_id); @@ -1037,8 +1032,6 @@ static int smsc911x_mii_probe(struct net_device *dev) return ret; } - /* Indicate that the MAC is responsible for managing PHY PM */ - phydev->mac_managed_pm = true; phy_attached_info(phydev); phy_set_max_speed(phydev, SPEED_100); @@ -1066,6 +1059,7 @@ static int smsc911x_mii_init(struct platform_device *pdev, struct net_device *dev) { struct smsc911x_data *pdata = netdev_priv(dev); + struct phy_device *phydev; int err = -ENXIO; pdata->mii_bus = mdiobus_alloc(); @@ -1108,6 +1102,15 @@ static int smsc911x_mii_init(struct platform_device *pdev, goto err_out_free_bus_2; } + phydev = phy_find_first(pdata->mii_bus); + if (!phydev) { + netdev_err(dev, "no PHY found\n"); + err = -ENOENT; + goto err_out_free_bus_2; + } + + phydev->mac_managed_pm = true; + return 0; err_out_free_bus_2: