From patchwork Fri Apr 19 09:03:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Serge Semin X-Patchwork-Id: 13635981 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BAD9FC4345F for ; Fri, 19 Apr 2024 09:04:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=hqi+KHmSeQmsnMCshyY1bTBD/Jkn4kQ3RSIEuZVaMJk=; b=Z4qh4XBnWIH9e0 8Fp9bFyRtT0M9m88G38rLjnAoj/D0BLOYbd4Mv4jz8CGZJJLnb2dTw3bwpp/HhN8dVQEcrI35+HMg eM4+gE4qJQrVqRStlWpJBfCVogxjWWWvQ9d824z9Z7ybXF/QAJr7aH2kYwApac5u69eQT/EAozNy2 QkTX6zuXT1rZ8T4m9jvzrWuItBI0tBdgyxtW6BcDSAQRDJCEdnWecsGWaV8oYkvyA/faz3PkwUVeb El6vJgMFn7dn3sv0dgB8LAsMCIPCaTWC/B9ryZigqemBGnMpDAhcU7/cN3tmqjtjJyO9YajFkxzPh HVANEliNv7Gf5ze9plPg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxkAN-000000051xN-205a; Fri, 19 Apr 2024 09:04:19 +0000 Received: from mail-lj1-x22f.google.com ([2a00:1450:4864:20::22f]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxkAE-000000051v0-2cX8 for linux-arm-kernel@lists.infradead.org; Fri, 19 Apr 2024 09:04:12 +0000 Received: by mail-lj1-x22f.google.com with SMTP id 38308e7fff4ca-2db2f6cb312so33058551fa.2 for ; Fri, 19 Apr 2024 02:04:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713517448; x=1714122248; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rgMQYr4oV4JNndEuD2biU5vQV/pnebRAnRkbrVejXaA=; b=RBGJshBCPhcb2gR9gzV3r3ya7u6KwjamOIKRS5qpF0CYhQXs4F6oLeGzg+xdx4ScIC tAspwDxty7b1fhY9MilQ0h5fgQhVUXqtxeoev5S8ThRLAMozzXsKvsrb3TJnt4i/+d9y 7s9ivXTgJQSSDfWzBGDc+vMV23gQ49XSmtqCKzC6Ya0gz1jamR1Jp0IXcJ7dnP9+FwuI /Kkb4k0bRoPN4TB8YmNLHKF3ahXKMtMQlb7ZiFp0nrQacmYulgLqeoejaU4KDOAaaAk1 SBgUoKkIfodUI+zDBWmUehC986GzZmoJK+e/ypNun3rMCS3AamwkOJ/eVE3A339NTkSD j0ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713517448; x=1714122248; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rgMQYr4oV4JNndEuD2biU5vQV/pnebRAnRkbrVejXaA=; b=NR2GQupcxVoLcQ1ei/aacJ+4rzhORIiGFd0RmrEREW9LsCUhDjvHpTAAKrw7r9aLWY qVs1TZx0z4wHe9YK019A9C+FDR+3sAw+0qpi2M/UKZOkEKOAyx9kAYBiUAoDPPZF7Kwa p1+y8LszqDe7DSLuWau7uk7NJiLjPukGpnBVUQ2AwRbt3hvBVycJzVd6Qn3ZAs6bUj13 odGFhqsyjdAzjGAw9NzRG4AlKHZkx2JwO0IXmkajjTSsI1u1kwbFFoMR09uV2/SNkkHc 88JHWxPJ+r6Uadk9jRqWGFwURX1+XhlMcD2hnrt60dClDwIxEE3dPnOOJhjZZIpaOc3U 4pPQ== X-Forwarded-Encrypted: i=1; AJvYcCVVXJnBHPfqAoikodVjXLIvrRUNteQhaRmO69bSgZbuTIBJsYTwPy9sZabweWYw6ZD+hsLS6EvnyRfq4bXWQYA+PGIbVr2wEb8EHewcr/Dy8UcSiBQ= X-Gm-Message-State: AOJu0YwnYYS/3nryeVTp3JERLhMLy8cZra3I5aPdQ22JvUOjRoZq0nKU 1XE+AT+bQJRxsENtLiC62YCeGwThAmygC8LGrpbX4a+8j4CIZoMZ X-Google-Smtp-Source: AGHT+IHQi06xeUbRVNwJPi1rGkVQYXntNtrD89Vy0P8/uMlqN9zH9EDGdcfcGdRrkx/08kp0eZERLQ== X-Received: by 2002:a2e:2a46:0:b0:2d4:7455:89f6 with SMTP id q67-20020a2e2a46000000b002d4745589f6mr1137769ljq.40.1713517448297; Fri, 19 Apr 2024 02:04:08 -0700 (PDT) Received: from localhost (srv1.baikalchip.ru. [87.245.175.227]) by smtp.gmail.com with ESMTPSA id h25-20020a2e3a19000000b002da968f03f9sm520526lja.89.2024.04.19.02.04.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Apr 2024 02:04:07 -0700 (PDT) From: Serge Semin To: Alexandre Torgue , Jose Abreu , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Yanteng Si , Romain Gantois , Maxime Coquelin Cc: Serge Semin , Simon Horman , Huacai Chen , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH RESEND net-next v3 2/2] net: stmmac: Move MAC caps init to phylink MAC caps getter Date: Fri, 19 Apr 2024 12:03:06 +0300 Message-ID: <20240419090357.5547-3-fancer.lancer@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240419090357.5547-1-fancer.lancer@gmail.com> References: <20240419090357.5547-1-fancer.lancer@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240419_020410_687171_530CEF84 X-CRM114-Status: GOOD ( 16.72 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org After a set of recent fixes the stmmac_phy_setup() and stmmac_reinit_queues() methods have turned to having some duplicated code. Let's get rid from the duplication by moving the MAC-capabilities initialization to the PHYLINK MAC-capabilities getter. The getter is called during each network device interface open/close cycle. So the MAC-capabilities will be initialized in generic device open procedure and in case of the Tx/Rx queues re-initialization as the original code semantics implies. Signed-off-by: Serge Semin Reviewed-by: Romain Gantois --- Link: https://lore.kernel.org/netdev/20240412180340.7965-5-fancer.lancer@gmail.com/ Changelog v2: - Resubmit the patch to net-next separately from the main patchset (Paolo) --- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 36 +++++++++---------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index b810f6b69bf5..0d6cd1704e6a 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -936,6 +936,22 @@ static void stmmac_mac_flow_ctrl(struct stmmac_priv *priv, u32 duplex) priv->pause, tx_cnt); } +static unsigned long stmmac_mac_get_caps(struct phylink_config *config, + phy_interface_t interface) +{ + struct stmmac_priv *priv = netdev_priv(to_net_dev(config->dev)); + + /* Refresh the MAC-specific capabilities */ + stmmac_mac_update_caps(priv); + + config->mac_capabilities = priv->hw->link.caps; + + if (priv->plat->max_speed) + phylink_limit_mac_speed(config, priv->plat->max_speed); + + return config->mac_capabilities; +} + static struct phylink_pcs *stmmac_mac_select_pcs(struct phylink_config *config, phy_interface_t interface) { @@ -1105,6 +1121,7 @@ static void stmmac_mac_link_up(struct phylink_config *config, } static const struct phylink_mac_ops stmmac_phylink_mac_ops = { + .mac_get_caps = stmmac_mac_get_caps, .mac_select_pcs = stmmac_mac_select_pcs, .mac_config = stmmac_mac_config, .mac_link_down = stmmac_mac_link_down, @@ -1204,7 +1221,6 @@ static int stmmac_phy_setup(struct stmmac_priv *priv) int mode = priv->plat->phy_interface; struct fwnode_handle *fwnode; struct phylink *phylink; - int max_speed; priv->phylink_config.dev = &priv->dev->dev; priv->phylink_config.type = PHYLINK_NETDEV; @@ -1225,15 +1241,6 @@ static int stmmac_phy_setup(struct stmmac_priv *priv) xpcs_get_interfaces(priv->hw->xpcs, priv->phylink_config.supported_interfaces); - /* Refresh the MAC-specific capabilities */ - stmmac_mac_update_caps(priv); - - priv->phylink_config.mac_capabilities = priv->hw->link.caps; - - max_speed = priv->plat->max_speed; - if (max_speed) - phylink_limit_mac_speed(&priv->phylink_config, max_speed); - fwnode = priv->plat->port_node; if (!fwnode) fwnode = dev_fwnode(priv->device); @@ -7327,7 +7334,6 @@ int stmmac_reinit_queues(struct net_device *dev, u32 rx_cnt, u32 tx_cnt) { struct stmmac_priv *priv = netdev_priv(dev); int ret = 0, i; - int max_speed; if (netif_running(dev)) stmmac_release(dev); @@ -7341,14 +7347,6 @@ int stmmac_reinit_queues(struct net_device *dev, u32 rx_cnt, u32 tx_cnt) priv->rss.table[i] = ethtool_rxfh_indir_default(i, rx_cnt); - stmmac_mac_update_caps(priv); - - priv->phylink_config.mac_capabilities = priv->hw->link.caps; - - max_speed = priv->plat->max_speed; - if (max_speed) - phylink_limit_mac_speed(&priv->phylink_config, max_speed); - stmmac_napi_add(dev); if (netif_running(dev))