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: 13692137 X-Patchwork-Delegate: kuba@kernel.org Received: from pandora.armlinux.org.uk (pandora.armlinux.org.uk [78.32.30.218]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 195AB80BE5 for ; Mon, 10 Jun 2024 14:40:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=78.32.30.218 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718030446; cv=none; b=q9SaYhzJiXQrpdyZwwhb8za01a9IYU1ymGlRMRh6QROvNYUx83Nv84hr9om98vfcYnOjEPc9JyWQRCQty8OagQio22Wj2gxft291Ocyeb+9g7L7gIPoFtdt3B2Uqo1pFfIG62HC5WAgqOf4gQ1k8KoSdfGkgWh1Bi2ff1mZ/Am0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718030446; c=relaxed/simple; bh=8cgXOuc05YqlvcSTRVt5oHwmke6xdfBgQiSijkGOGfg=; h=In-Reply-To:References:From:To:Cc:Subject:MIME-Version: Content-Disposition:Content-Type:Message-Id:Date; b=I3NzxNRnYBWI2Iyirau7ztB7jAKWh3DyUFyWsNYOAfSnVyG7M/nFR4xnZBylJn3juFoL5JVJFO6i0e+WMvaJhnWNSUg4J7y9V/ozKr3bmqsCvqPr2enK8NzybBydGRcADUFB7CiSUZYl4D+VtXwh932BXU/F1kPRkDz2Vx1fxSw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=armlinux.org.uk; spf=none smtp.mailfrom=armlinux.org.uk; dkim=pass (2048-bit key) header.d=armlinux.org.uk header.i=@armlinux.org.uk header.b=kfWY4TsC; arc=none smtp.client-ip=78.32.30.218 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=armlinux.org.uk Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=armlinux.org.uk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=armlinux.org.uk header.i=@armlinux.org.uk header.b="kfWY4TsC" 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 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline Message-Id: Sender: Russell King Date: Mon, 10 Jun 2024 15:40:33 +0100 X-Patchwork-Delegate: kuba@kernel.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: 13692138 X-Patchwork-Delegate: kuba@kernel.org Received: from pandora.armlinux.org.uk (pandora.armlinux.org.uk [78.32.30.218]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 55DBF132136 for ; Mon, 10 Jun 2024 14:40:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=78.32.30.218 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718030451; cv=none; b=emRAMqR+DlfN57Ed1OgwaDEGQ/LeuFQ3KRirZ6+P97RCyO+VVuVU4T/M5WpSSJEQstBxePPX14pKUwLgeIjIKCr1mY21fKGcDeC/3G4jJ2j0lP6XRUDu5oORaGti4Su8yP5VxABTA9QlZqcetOhbPbn4bEgs5wczn8pNdIIjaMM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718030451; c=relaxed/simple; bh=MernDuDmeDfVXfB8vnQSsWF4P09hNAa8mhbeF8sVQ6Y=; h=In-Reply-To:References:From:To:Cc:Subject:MIME-Version: Content-Disposition:Content-Type:Message-Id:Date; b=Bfkc2J7Pb6BmYWs9QEg5QT44tXsenQ5TKOtIGu3PzmBFFFO9tmgfZguJ7yhwD/lXShJ/hcDO4rbUqwQvV8OQdQB0Ym/mNRmGiid14ldUEHlTJP6wavMLA5OlIVfILJ4BfUmuW3wuMA8M8F7nvr7UU76kHIjwW7vsurD8KImFyM4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=armlinux.org.uk; spf=none smtp.mailfrom=armlinux.org.uk; dkim=pass (2048-bit key) header.d=armlinux.org.uk header.i=@armlinux.org.uk header.b=hQj8F7Qp; arc=none smtp.client-ip=78.32.30.218 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=armlinux.org.uk Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=armlinux.org.uk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=armlinux.org.uk header.i=@armlinux.org.uk header.b="hQj8F7Qp" 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 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline Message-Id: Sender: Russell King Date: Mon, 10 Jun 2024 15:40:39 +0100 X-Patchwork-Delegate: kuba@kernel.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: 13692139 X-Patchwork-Delegate: kuba@kernel.org Received: from pandora.armlinux.org.uk (pandora.armlinux.org.uk [78.32.30.218]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D54C380BE5 for ; Mon, 10 Jun 2024 14:40:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=78.32.30.218 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718030456; cv=none; b=pMU8+lrYzRhFOTq5sVewaCv+lGKtEdoK+s2wWO78CjYYDBkus0QbDdTyQJXfdEZdPRW79fOkgFa2f3hlh1PZy+2HkGR8IC+TfYJjugCXej3kxCN7ZXXH4qWlZEx3mMq/IFb8LF9LBaC3pjDsGijTb1Zf1PoxJtuGqVreTy/7OeI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718030456; c=relaxed/simple; bh=dXlScvBx0DRQYqk5UBcpMatM/k7plPNnT01AfHVOHKo=; h=In-Reply-To:References:From:To:Cc:Subject:MIME-Version: Content-Disposition:Content-Type:Message-Id:Date; b=tzQkLKiUuVqCZECcf2JDeqXC0x9143hVkGciq4gmbsW9/hUMV2y5tyU8tcwyMvMU3JUwAomQxS6JdmEQW+qa8UPp9o3anONJ6ZKQxpruBHpY/85ikLp4enkgsak2tVdSN9YAxt1RzqIbM8OOVCMzgkf7lh6kD8VMPSEQQUkygT8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=armlinux.org.uk; spf=none smtp.mailfrom=armlinux.org.uk; dkim=pass (2048-bit key) header.d=armlinux.org.uk header.i=@armlinux.org.uk header.b=bySBVZ1W; arc=none smtp.client-ip=78.32.30.218 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=armlinux.org.uk Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=armlinux.org.uk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=armlinux.org.uk header.i=@armlinux.org.uk header.b="bySBVZ1W" 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 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline Message-Id: Sender: Russell King Date: Mon, 10 Jun 2024 15:40:44 +0100 X-Patchwork-Delegate: kuba@kernel.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: 13692140 X-Patchwork-Delegate: kuba@kernel.org Received: from pandora.armlinux.org.uk (pandora.armlinux.org.uk [78.32.30.218]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5DDF680BE5 for ; Mon, 10 Jun 2024 14:41:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=78.32.30.218 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718030464; cv=none; b=atdllxuT3BkpqeeL59VIiXZd+1fY7iLxDBH4O20dGU8h9wwf5VA5g+u+xippN2uUoV03lHVzwuryEZ5TDlrGw0IDuZLH2TmxX0i4mQ5E9JPu3Gl6ULi93Jum0nWGmz5uny5LL7Qz0/aGpVm57a8i8a9Z80hIUZQOtTS15DxgBSE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718030464; c=relaxed/simple; bh=2oE/8hJn9cYyQuF73TPogjEQ0Ky8tE9HSDoZFULPWjY=; h=In-Reply-To:References:From:To:Cc:Subject:MIME-Version: Content-Disposition:Content-Type:Message-Id:Date; b=gAzLgYnmuUA1Szv4S883k7NDCp0++/2AeZ20gFaCMnm5Jw7RaiZHytn4sbcHxIQl3BcWIA39B1w4Y5hUX03YD3h9zZYRHUomOFve9Web5rHsIx1MCx7DgPxZYTffefOH+Sj24TX/9ym60+eFzzMqQaURr4Lw92soSp9NEi0thCA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=armlinux.org.uk; spf=none smtp.mailfrom=armlinux.org.uk; dkim=pass (2048-bit key) header.d=armlinux.org.uk header.i=@armlinux.org.uk header.b=hgv+NT0z; arc=none smtp.client-ip=78.32.30.218 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=armlinux.org.uk Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=armlinux.org.uk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=armlinux.org.uk header.i=@armlinux.org.uk header.b="hgv+NT0z" 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 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline Message-Id: Sender: Russell King Date: Mon, 10 Jun 2024 15:40:49 +0100 X-Patchwork-Delegate: kuba@kernel.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: 13692141 X-Patchwork-Delegate: kuba@kernel.org Received: from pandora.armlinux.org.uk (pandora.armlinux.org.uk [78.32.30.218]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1CB9B12FB0A for ; Mon, 10 Jun 2024 14:41:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=78.32.30.218 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718030469; cv=none; b=uBqGakXc1iQIgrjrcoRtfG4i9ge2uxUlNuGA+o2yn/JVNeAyePrFZyJQoRS48MHVI0UOlBnR1mMYMhrvVFVFLfx93qLFkNzHKX8xs7zrONJN77+vtAkSnpBYVtIanbZkwO+yR+GtAFoUMB9Js5uUIHmnzWDEoxbu/zRTH/Jv8wk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718030469; c=relaxed/simple; bh=R6tPxkh1qQgqNv5XuhFEoq8drrzo3CEPQ765Glu+u+I=; h=In-Reply-To:References:From:To:Cc:Subject:MIME-Version: Content-Disposition:Content-Type:Message-Id:Date; b=iW2PMh6okcIbuIILJuUaPJmAIEM+ZIbXMSsZ4vCu0HV0zLNImccKMayuD1aFU2lr2loR0FAk/Gdf6vh6d8h8uS+ssK56LyD2+WF59sT6g0fzdyTGzqX3wn+nSaImg0Q9qqz5OXW7GPpHHK17j8MDewqTMa2xGmvnxKBdj8ccOFQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=armlinux.org.uk; spf=none smtp.mailfrom=armlinux.org.uk; dkim=pass (2048-bit key) header.d=armlinux.org.uk header.i=@armlinux.org.uk header.b=aFN9Dtt7; arc=none smtp.client-ip=78.32.30.218 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=armlinux.org.uk Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=armlinux.org.uk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=armlinux.org.uk header.i=@armlinux.org.uk header.b="aFN9Dtt7" 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() Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline Message-Id: Sender: Russell King Date: Mon, 10 Jun 2024 15:40:54 +0100 X-Patchwork-Delegate: kuba@kernel.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,