From patchwork Mon Jun 10 14:40:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Russell King (Oracle)" X-Patchwork-Id: 13692143 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 1ADEDC27C55 for ; Mon, 10 Jun 2024 14:41:03 +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:Date:Message-Id:MIME-Version:Subject:Cc :To:From:References:In-Reply-To:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=icP97k+F5RvD2hTroKnRigJZEay7O0tcjO0rgW3W0+I=; b=H01uMx1kXfQ+2B +fjJ7JcMeZtMRtR05ZHCPdpIxPz7udUsiw72MEoMTNFdytGLGwCb7sUSCzLmNkfLguu90aZ8ODgim rTW+T/fFBjv6oXxkP0gEEugt0guN6MTGQegGFr8dKPcB5YGDBaW4gsNi7aC6CuRz3oRcJx1VwmsF+ in25a7AUeieaszj5aQ/o3EwNOyzVj+ykVTt1Xl8xOLh0lg2pMf3ZW2ZwXvSaI0MQjsEOlDUQwMcML 1/9vbDIoIxc86Np+PA3m2zzZ+AjibFYLJsUEOITIL+mJR3xDw9DAfaxRDOCwZBrnVqHP4pidEyJnI HG/2MrcVI9hO/1kH4WRQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sGgCV-00000005SLQ-1gq9; Mon, 10 Jun 2024 14:40:47 +0000 Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:32c8:5054:ff:fe00:142]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sGgCS-00000005SJt-1dOh for linux-arm-kernel@lists.infradead.org; Mon, 10 Jun 2024 14:40:45 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Date:Sender:Message-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:References: In-Reply-To:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Z2ysErSY7/KD9NFUvu+f/pl6Tbexshy7z97dxZsQWrs=; b=kfWY4TsCcc1grEGTbn+Brd+Lrn m5o0JB6UbNBZhCHcgxPXyICBmOv1uKggVfJOplpzdr971WSYcvl+5mNLlHrUbG2eePp89y3jv2uYK pdtXsgyGInPMZIOpZR06j9Fz3RKcchR9hMadm0Np5igW8Lft5oPCgGog2Mxy2vJgcsH2AKGFsHFId 3T5vf9RQfy9eOpiNGvUV4iZ8Dd5TPj8C/P8bsCUOCbuLobabkH3Bmg98wugOdciQgoZZwPkgjYMF0 /wK7Yd1iWTCLRMZNqEzzzLFP2JS03ADPRynhc2q9DA9623vdBUC5YRXEZaC5uXQFw2Z/rIdWuch/8 BzRn9qAg==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:46476 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sGgCE-0001eh-2K; Mon, 10 Jun 2024 15:40:31 +0100 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.94.2) (envelope-from ) id 1sGgCH-00Facn-T6; Mon, 10 Jun 2024 15:40:33 +0100 In-Reply-To: References: From: "Russell King (Oracle)" To: Serge Semin Cc: Alexandre Torgue , Andrew Halaney , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Jose Abreu , linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, Maxime Coquelin , netdev@vger.kernel.org, Paolo Abeni , Romain Gantois Subject: [PATCH net-next 1/5] net: stmmac: add select_pcs() platform method MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Mon, 10 Jun 2024 15:40:33 +0100 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240610_074044_475313_8C114D9F X-CRM114-Status: GOOD ( 12.18 ) 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 Allow platform drivers to provide their logic to select an appropriate PCS. Signed-off-by: Russell King (Oracle) Tested-by: Romain Gantois Reviewed-by: Romain Gantois --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 +++++++ include/linux/stmmac.h | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index bbedf2a8c60f..302aa4080de3 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -949,6 +949,13 @@ static struct phylink_pcs *stmmac_mac_select_pcs(struct phylink_config *config, phy_interface_t interface) { struct stmmac_priv *priv = netdev_priv(to_net_dev(config->dev)); + struct phylink_pcs *pcs; + + if (priv->plat->select_pcs) { + pcs = priv->plat->select_pcs(priv, interface); + if (!IS_ERR(pcs)) + return pcs; + } if (priv->hw->xpcs) return &priv->hw->xpcs->pcs; diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h index 8f0f156d50d3..9c54f82901a1 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h @@ -13,7 +13,7 @@ #define __STMMAC_PLATFORM_DATA #include -#include +#include #define MTL_MAX_RX_QUEUES 8 #define MTL_MAX_TX_QUEUES 8 @@ -271,6 +271,8 @@ struct plat_stmmacenet_data { void (*dump_debug_regs)(void *priv); int (*pcs_init)(struct stmmac_priv *priv); void (*pcs_exit)(struct stmmac_priv *priv); + struct phylink_pcs *(*select_pcs)(struct stmmac_priv *priv, + phy_interface_t interface); void *bsp_priv; struct clk *stmmac_clk; struct clk *pclk; From patchwork Mon Jun 10 14:40:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Russell King (Oracle)" X-Patchwork-Id: 13692144 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 2804EC27C5E for ; Mon, 10 Jun 2024 14:41:07 +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:Date:Message-Id:MIME-Version:Subject:Cc :To:From:References:In-Reply-To:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=izsjyqjdTwgPcdYDqwicdOhkgyycNRcs7TLvUPTYdRg=; b=qBPSS6xaOk8W9x 2icsEj4eszg64YpLiS+YlNNq8tovUw2Q+EPY0onWLGTFPwux/wqPxxqvfy2vW3koTbeGAPD3suIZG 2CNIjfzmo7oe5oghnvICKfy9DhHQsFjg2OslET3WnO1qHOaNMkZEjEIwnNcDPdla9O2C2Qixjg0/Z 10L8TS84LDhNHka53djVMgSfH9on8qlvbyBFcCUW2hR/rE53b2oC54RWVcLTWWbbsuJ7yJqdEsEAN BjlkFxubHU4q91qD5gDTqt06hreFLDDtXX03QXg1UJZWxFrXm62m3s3Fru9WSmCtT8kEWJLTHG8fP Xm+k5+S1aTtGyGroFm4g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sGgCZ-00000005SNF-0iPv; Mon, 10 Jun 2024 14:40:51 +0000 Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:32c8:5054:ff:fe00:142]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sGgCW-00000005SLL-1Zo4 for linux-arm-kernel@lists.infradead.org; Mon, 10 Jun 2024 14:40:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Date:Sender:Message-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:References: In-Reply-To:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=xeRq82mHAjHz+TfgCyzTrq/v7wA6gPE37LHDzOTm04M=; b=hQj8F7QpXlIC2hk2SZwWlzMQHb 1trLiljt8U+ZDeqjV0PGQAXE6c1s71qGHhYmWDBlipgeUCXpdxJWlg1Lsi8lUEhHjPR4pMqxAwQOE Bi4ALOGFP2P3X3Ef3plVKkyuXLQzD1hVRSL6TgUBIMOm/PNZ5PtJplGKJI/6T8+oMtiVzHnvA7W92 GX+5J5WvN5/QNwRhzRmKs0c2qyXy3vGWKnangp6G8Tx4e+lEi4q7SBIT/j//5hJ6tN6y0FGcZF0Mx ehHLrhzS2M90VaimU1nSxqMlzdMczJz/slXC8DhdOW9h9VkPgkS8GDp8f6GJtRw+WMvb+AixfnTaK XZ8Hvomw==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:46484 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sGgCJ-0001ev-36; Mon, 10 Jun 2024 15:40:36 +0100 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.94.2) (envelope-from ) id 1sGgCN-00Fact-0x; Mon, 10 Jun 2024 15:40:39 +0100 In-Reply-To: References: From: "Russell King (Oracle)" To: Serge Semin Cc: Alexandre Torgue , Andrew Halaney , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Jose Abreu , linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, Maxime Coquelin , netdev@vger.kernel.org, Paolo Abeni , Romain Gantois Subject: [PATCH net-next 2/5] net: stmmac: dwmac-intel: provide a select_pcs() implementation MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Mon, 10 Jun 2024 15:40:39 +0100 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240610_074048_442508_9653D0C1 X-CRM114-Status: GOOD ( 13.76 ) 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 Move the code returning the XPCS into dwmac-intel, which is the only user of XPCS. Fill in the select_pcs() implementation only when we are going to setup the XPCS, thus when it should be present. Signed-off-by: Russell King (Oracle) Reviewed-by: Romain Gantois --- drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 11 +++++++++++ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 3 --- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c index 56649edb18cd..227e1f6490f8 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c @@ -443,6 +443,16 @@ static void common_default_data(struct plat_stmmacenet_data *plat) plat->rx_queues_cfg[0].pkt_route = 0x0; } +static struct phylink_pcs *intel_mgbe_select_pcs(struct stmmac_priv *priv, + phy_interface_t interface) +{ + /* plat->mdio_bus_data->has_xpcs has been set true, so there + * should always be an XPCS. The original code would always + * return this if present. + */ + return &priv->hw->xpcs->pcs; +} + static int intel_mgbe_common_data(struct pci_dev *pdev, struct plat_stmmacenet_data *plat) { @@ -587,6 +597,7 @@ static int intel_mgbe_common_data(struct pci_dev *pdev, plat->phy_interface == PHY_INTERFACE_MODE_1000BASEX) { plat->mdio_bus_data->has_xpcs = true; plat->mdio_bus_data->default_an_inband = true; + plat->select_pcs = intel_mgbe_select_pcs, } /* Ensure mdio bus scan skips intel serdes and pcs-xpcs */ diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 302aa4080de3..e9e2a95c91a3 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -957,9 +957,6 @@ static struct phylink_pcs *stmmac_mac_select_pcs(struct phylink_config *config, return pcs; } - if (priv->hw->xpcs) - return &priv->hw->xpcs->pcs; - return priv->hw->phylink_pcs; } From patchwork Mon Jun 10 14:40:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Russell King (Oracle)" X-Patchwork-Id: 13692145 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 E1278C27C55 for ; Mon, 10 Jun 2024 14:41:10 +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:Date:Message-Id:MIME-Version:Subject:Cc :To:From:References:In-Reply-To:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=GdivsiaYQYW4gSTCFyE8cyHKJekn+UU0A7ak0CBlkmU=; b=t4qRdlpV2JcxwZ AJ07+CC6wSiqbwK/b8gjoqOHKPUOdqZXSUFbQh/GUf+/S2jdUxFO/6bXUvAtaKO7MTiWtTW7t8S9a 5wSOyigDdBtIk4TZYPRj9Zw3M0V9xmGygIOZ7LnfRhpX6/f3gUzxX5xXv3jrcKO41kyz0U4y0sWrc xPBYFoUuZryC/0oe47RSJedVmtMASvbvb3JST+fTm8okCpnRF9uVRIdQqAWnbTueyb9jajWXWe4XM M8+dDIO0N4uUK3qzkoCQc1hnhkh+tZIShDjR0vr7VUe6BlSKkM9jjQxpdMvwde/sJYkpuFWEThWn4 e6tJX/qpY6a8DMnnzo+w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sGgCe-00000005SPx-0qEG; Mon, 10 Jun 2024 14:40:56 +0000 Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:32c8:5054:ff:fe00:142]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sGgCb-00000005SNh-2esN for linux-arm-kernel@lists.infradead.org; Mon, 10 Jun 2024 14:40:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Date:Sender:Message-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:References: In-Reply-To:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=SNwgbigX1ci9uok9QpNvOvvdhi7uYTHIbZL8XLOiAs0=; b=bySBVZ1WVTUaoTnpKTwXy1Z7E7 DQGEvSoqKScAb2H2fddu2Qy7vV9RGb7kWfcnFiTSQbGmGJTARrhoVJNhxfLW+t/FZs42Kf+UGi7fG RwlDENxPiankwnNmb5k3OORLHwWTgYA2+/iWPwVESd0JuByfLe5QYQLvvLYwJTE/f1Z8P06jAWuNr SUELNmBj+qZwDP3ezMXQ77NKluM5KghinbGqMkrunCyVF6R6puCuPzXFW8iNk4tI1V4IrF8tfLbFA D72ePVbov/VWWFERK9cCH47wSkQNL42/pnAlkq3TNvc4lD4FLedDTAowgEpFn8EWp0q3KdYbifhab RSO2GzBQ==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:55864 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sGgCP-0001fH-0F; Mon, 10 Jun 2024 15:40:41 +0100 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.94.2) (envelope-from ) id 1sGgCS-00Facz-4s; Mon, 10 Jun 2024 15:40:44 +0100 In-Reply-To: References: From: "Russell King (Oracle)" To: Serge Semin Cc: Alexandre Torgue , Andrew Halaney , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Jose Abreu , linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, Maxime Coquelin , netdev@vger.kernel.org, Paolo Abeni , Romain Gantois Subject: [PATCH net-next 3/5] net: stmmac: dwmac-rzn1: provide select_pcs() implementation MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Mon, 10 Jun 2024 15:40:44 +0100 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240610_074053_716594_BA013EC7 X-CRM114-Status: UNSURE ( 9.14 ) X-CRM114-Notice: Please train this message. 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 Provide a .select_pcs() implementation which returns the phylink PCS that was created in the .pcs_init() method. Signed-off-by: Russell King (Oracle) Tested-by: Romain Gantois Reviewed-by: Romain Gantois --- drivers/net/ethernet/stmicro/stmmac/dwmac-rzn1.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rzn1.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rzn1.c index 848cf3c01f4a..59a7bd560f96 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rzn1.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rzn1.c @@ -39,6 +39,12 @@ static void rzn1_dwmac_pcs_exit(struct stmmac_priv *priv) miic_destroy(priv->hw->phylink_pcs); } +static struct phylink_pcs *rzn1_dwmac_select_pcs(struct stmmac_priv *priv, + phy_interface_t interface) +{ + return priv->hw->phylink_pcs; +} + static int rzn1_dwmac_probe(struct platform_device *pdev) { struct plat_stmmacenet_data *plat_dat; @@ -57,6 +63,7 @@ static int rzn1_dwmac_probe(struct platform_device *pdev) plat_dat->bsp_priv = plat_dat; plat_dat->pcs_init = rzn1_dwmac_pcs_init; plat_dat->pcs_exit = rzn1_dwmac_pcs_exit; + plat_dat->select_pcs = rzn1_dwmac_select_pcs; ret = stmmac_dvr_probe(dev, plat_dat, &stmmac_res); if (ret) From patchwork Mon Jun 10 14:40:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Russell King (Oracle)" X-Patchwork-Id: 13692146 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 55D1DC27C55 for ; Mon, 10 Jun 2024 14:41:19 +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:Date:Message-Id:MIME-Version:Subject:Cc :To:From:References:In-Reply-To:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=yLZ2zu/ecaoSwVsP3h4Lo3f1jku3wCQFdG5+sMiQQMc=; b=Z3DLW7Od5eoKyB wDeGsLCO3IXNMeOaMxidaBGhiqC/ODOsXiLiprbn3xgizeVxdLCcJe0vF0we14FFJdnP6JfmwAx1Y vOU1n4zfHpperMGfrDOMrbifQnSZSF3rZQNuSYssRLU2aAAsaL+QAff46v7GXWTPP4VEYprXw3dJ0 ZF6x35iIG2q/ngEwj8+rI6F56xDCcBvBUi+EMpugtGTSkKIS+Ja2L1E6lucVRxjGA8/02OHT7/zMs YmeVsXFDO1iBV8VrUGuUW0wPlqYxwHAfUDDvtQr/aI4DnZDkEj8yodXOQJpN1XUPOYufICFHXwHkA RtYykK4TBE7rp8c2UhKg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sGgCl-00000005SUt-422S; Mon, 10 Jun 2024 14:41:03 +0000 Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:32c8:5054:ff:fe00:142]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sGgCi-00000005SRp-0J2O for linux-arm-kernel@lists.infradead.org; Mon, 10 Jun 2024 14:41:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Date:Sender:Message-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:References: In-Reply-To:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=qnh/kTu/JXmNom+PLgMCpgP4S1lfWoc9AvP15HS0AJA=; b=hgv+NT0zRIBQvI29Nzf5xF1Ue7 +ndz+46e+K4eYu8wTcm3elIntgAh7RFwXx4qwAREr4yDfX9tVRhMJdano4k7i41atq8AqutewPSao baEObDsNw/aumyQVjXCj+u3ZZnQYLH3w3W9HTYpkA75b3En3iKNMiFRtkOWQtace3sUq4oSFIv+2a m2J5KNC1CQhCYibD2RPdoP/GoyTdMAwM0L9j0NegrvhlnX569rlwvt0+e7NfnKKAPhmHllCLsKWPl nGSXhxY5c50Eft5rnSN35wbt8w7zOPSmEOWWHMOio0+KCQjhjukjNcWhXHlIozE5dmLCckhAU0VgS /8zF4kZg==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:55868 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sGgCU-0001fZ-1x; Mon, 10 Jun 2024 15:40:46 +0100 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.94.2) (envelope-from ) id 1sGgCX-00Fad5-92; Mon, 10 Jun 2024 15:40:49 +0100 In-Reply-To: References: From: "Russell King (Oracle)" To: Serge Semin Cc: Alexandre Torgue , Andrew Halaney , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Jose Abreu , linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, Maxime Coquelin , netdev@vger.kernel.org, Paolo Abeni , Romain Gantois Subject: [PATCH net-next 4/5] net: stmmac: dwmac-socfpga: provide select_pcs() implementation MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Mon, 10 Jun 2024 15:40:49 +0100 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240610_074100_328876_7E310332 X-CRM114-Status: UNSURE ( 9.35 ) X-CRM114-Notice: Please train this message. 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 Provide a .select_pcs() implementation which returns the phylink PCS that was created in the .pcs_init() method. Signed-off-by: Russell King (Oracle) Reviewed-by: Romain Gantois --- drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c index b3d45f9dfb55..fdb4c773ec98 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c @@ -429,6 +429,12 @@ static void socfpga_dwmac_pcs_exit(struct stmmac_priv *priv) lynx_pcs_destroy(priv->hw->phylink_pcs); } +static struct phylink_pcs *socfpga_dwmac_select_pcs(struct stmmac_priv *priv, + phy_interface_t interface) +{ + return priv->hw->phylink_pcs; +} + static int socfpga_dwmac_probe(struct platform_device *pdev) { struct plat_stmmacenet_data *plat_dat; @@ -478,6 +484,7 @@ static int socfpga_dwmac_probe(struct platform_device *pdev) plat_dat->fix_mac_speed = socfpga_dwmac_fix_mac_speed; plat_dat->pcs_init = socfpga_dwmac_pcs_init; plat_dat->pcs_exit = socfpga_dwmac_pcs_exit; + plat_dat->select_pcs = socfpga_dwmac_select_pcs; ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res); if (ret) From patchwork Mon Jun 10 14:40:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Russell King (Oracle)" X-Patchwork-Id: 13692147 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 96A98C27C55 for ; Mon, 10 Jun 2024 14:41:21 +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:Date:Message-Id:MIME-Version:Subject:Cc :To:From:References:In-Reply-To:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=fa+SOreIt3eUw2DPkDlh2ZKbChPbj7t4XWKFcvbvdI8=; b=hPRKdFKnwz5GjQ Hx6Jwu0cEhrM4cd4SC39TLzI8OIQfB3DhpGeed1Q4WrSLcUsOau6/9LW2J+NvaJjA/Xk9xw239T/K 8fUI8BuA1jerCe6WaXTzJluj3ym37cZvtI8ke/aJKmREY9Mujm3tnGqjgwu1Yi/IKatIm9HHwLec9 /aBGHZxNfEaiGmr2ixwLMQbzgSCwPj0qRWGOVkO93sR0b049PWs58VW1KtoDBuONQGuUL0YgJk5ui YPuEC9JDZRmMY2tOJTN1rsW4BRHbmqno3HW3i0E3FViOiPzopLclu/U4eDfxou5oKVW/QkztBESv/ J1UIz1wPzLT7tpC5Nqmw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sGgCr-00000005SYq-2NEE; Mon, 10 Jun 2024 14:41:09 +0000 Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:32c8:5054:ff:fe00:142]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sGgCn-00000005SUy-16o7 for linux-arm-kernel@lists.infradead.org; Mon, 10 Jun 2024 14:41:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Date:Sender:Message-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:References: In-Reply-To:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=BWNZHsS70/QjgSQEoGOeY4EqJuojEQ3o1GbogG6YuSM=; b=aFN9Dtt71SZcljf3N6tl77BQXr 5sRXskmGKkIPtETe02zygZfaCwL5RNVzhxIL/vnFm6JeKk9NaCe2f6NFLzJlH4qcuSJ0ha/xXccJz MyIEWYxSal5mus0jCNVUCd7dlCeb/Fspo3rgmm9yduKawktSUvILnN3f2Z4k/2IH0rWStU5XNf8dF OErEWPBE7IPY3eRaRARJT5MMC4Luxgvijyf1+6UCGMhiLa3L1teatgKng9f8jUhpHqZt0i6MxvIok yP81vLZ2DIDH2HqDIczo89TPQK+ALLHUqEv+jZIop+jOJkSDnVSEiV75jIS2iVGX51dP/KuEQRvUe 7I10C7BQ==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:38386 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sGgCZ-0001ft-2B; Mon, 10 Jun 2024 15:40:51 +0100 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.94.2) (envelope-from ) id 1sGgCc-00FadB-Ch; Mon, 10 Jun 2024 15:40:54 +0100 In-Reply-To: References: From: "Russell King (Oracle)" To: Serge Semin Cc: Alexandre Torgue , Andrew Halaney , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Jose Abreu , linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, Maxime Coquelin , netdev@vger.kernel.org, Paolo Abeni , Romain Gantois Subject: [PATCH net-next 5/5] net: stmmac: clean up stmmac_mac_select_pcs() MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Mon, 10 Jun 2024 15:40:54 +0100 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240610_074105_467518_B0E5FB35 X-CRM114-Status: GOOD ( 10.68 ) 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 Since all platform providers of PCS now populate the select_pcs() method, there is no need for the common code to look at priv->hw->phylink_pcs, so remove it. Signed-off-by: Russell King (Oracle) Reviewed-by: Romain Gantois --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index e9e2a95c91a3..5ddbb0d44373 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -957,7 +957,7 @@ static struct phylink_pcs *stmmac_mac_select_pcs(struct phylink_config *config, return pcs; } - return priv->hw->phylink_pcs; + return NULL; } static void stmmac_mac_config(struct phylink_config *config, unsigned int mode,