From mboxrd@z Thu Jan 1 00:00:00 1970 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 DCB30322A1D; Wed, 14 Jan 2026 17:45:56 +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=1768412758; cv=none; b=koqWxhDo0b3xEE52ZZ1SwXYwQ7r51cnia7m2b5iLmT9SOsyUY5JqO/1RI6er0BS7oCvN0C0NjL7Ddh6cVsfVIW4NWwq5rK+btD9IUZ3WP0Ri8xgAN7LMz1JdvUL8mYrFAfQjFd/P2F2JTt5JtOt6tuqaNnLzEzT12+4qVZw0MOg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768412758; c=relaxed/simple; bh=dvMV4003XIwPch/kAAX1D1dC4Cj2SAtD8y62MzqhhVQ=; h=In-Reply-To:References:From:To:Cc:Subject:MIME-Version: Content-Disposition:Content-Type:Message-Id:Date; b=NnszybFB/+ktohqesFl/zBUluoKs5dW2wpYblwtbfBYwPoLqixUKhBkHZ5lXEtpIVOKH2MGIHVZUV3YulCy7fs0CZEXA6MFpcIVZ2wyfQfqZOnhDQdKP0fxu5Rhk0p4izQa3iDqP0Bocsk/EfkPSjC0/y8QgU4uIalcsCp0vKuI= 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=Ls/DvdJO; 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="Ls/DvdJO" 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=MarsTdgtHs8teQdoPboCZ01yZL+brlqUeB6u3oqnnnU=; b=Ls/DvdJONU9WbjF10boC8I5ZeB R1FQjCz8+2ErEKzTNfBc7arrA4/TPxNTZiuekkgCTwuunC/70eXZdAkkXn3iQ/kRN+GnXwZy3USRx k9SUB/SFJ1tQs/fzJ+JcQ/G+7+oYSNignwvv13F8SjWyALLbTz0PB+NsKfjHGmMIjsJLeuquk1LfQ 1JEITX6ZZ5bb3lMgvEf8ihaVeZcP/2FEpFPIdWyJQVO/IYmY6vhNVepIeiZylCpPxAmCmrTj5DdFO kTYnq/oTmG3qpxzFRy9YFJrvfgNbg4OMkI7gAkCztLLvc6GiEP3sZJABh/QzXfJLBOcLxBQDGgXl5 BBQ46DFQ==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:42456 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.98.2) (envelope-from ) id 1vg4wA-000000000UU-1kVu; Wed, 14 Jan 2026 17:45:42 +0000 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.98.2) (envelope-from ) id 1vg4w7-00000003SGB-2foG; Wed, 14 Jan 2026 17:45:39 +0000 In-Reply-To: References: From: "Russell King (Oracle)" To: Andrew Lunn , Heiner Kallweit Cc: Alexandre Torgue , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Konrad Dybcio , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, Maxime Coquelin , Mohd Ayaan Anwar , Neil Armstrong , netdev@vger.kernel.org, Paolo Abeni , Vinod Koul Subject: [PATCH net-next 06/14] net: stmmac: qcom-ethqos: convert to dwmac generic SerDes support Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" Message-Id: Sender: Russell King Date: Wed, 14 Jan 2026 17:45:39 +0000 Convert qcom-ethqos to use the dwmac core's generic SerDes support, which will handle SerDes initialisation, powering, and mode setting. Note that generic support requires the SerDes to support phy_validate() in order to probe which PHY interface modes are supported, and phy_set_mode_ext() to configure the appropriate PHY interface mode (and thus the speed.) Signed-off-by: Russell King (Oracle) --- .../stmicro/stmmac/dwmac-qcom-ethqos.c | 50 ++----------------- 1 file changed, 3 insertions(+), 47 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c index 80ea69fc8ee5..a0b893d3fbd4 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c @@ -103,8 +103,6 @@ struct qcom_ethqos { int (*configure_func)(struct qcom_ethqos *ethqos, int speed); struct clk *link_clk; - struct phy *serdes_phy; - int serdes_speed; phy_interface_t phy_mode; const struct ethqos_emac_por *por; @@ -584,14 +582,6 @@ static int ethqos_configure_rgmii(struct qcom_ethqos *ethqos, int speed) return 0; } -static void ethqos_set_serdes_speed(struct qcom_ethqos *ethqos, int speed) -{ - if (ethqos->serdes_speed != speed) { - phy_set_speed(ethqos->serdes_phy, speed); - ethqos->serdes_speed = speed; - } -} - static void ethqos_pcs_set_inband(struct stmmac_priv *priv, bool enable) { stmmac_pcs_ctrl_ane(priv, enable, 0); @@ -609,17 +599,14 @@ static int ethqos_configure_sgmii(struct qcom_ethqos *ethqos, int speed) case SPEED_2500: rgmii_setmask(ethqos, RGMII_CONFIG2_RGMII_CLK_SEL_CFG, RGMII_IO_MACRO_CONFIG2); - ethqos_set_serdes_speed(ethqos, SPEED_2500); ethqos_pcs_set_inband(priv, false); break; case SPEED_1000: rgmii_setmask(ethqos, RGMII_CONFIG2_RGMII_CLK_SEL_CFG, RGMII_IO_MACRO_CONFIG2); - ethqos_set_serdes_speed(ethqos, SPEED_1000); ethqos_pcs_set_inband(priv, true); break; case SPEED_100: - ethqos_set_serdes_speed(ethqos, SPEED_1000); ethqos_pcs_set_inband(priv, true); break; case SPEED_10: @@ -627,7 +614,6 @@ static int ethqos_configure_sgmii(struct qcom_ethqos *ethqos, int speed) FIELD_PREP(RGMII_CONFIG_SGMII_CLK_DVDR, SGMII_10M_RX_CLK_DVDR), RGMII_IO_MACRO_CONFIG); - ethqos_set_serdes_speed(ethqos, SPEED_1000); ethqos_pcs_set_inband(priv, true); break; } @@ -648,30 +634,6 @@ static void ethqos_fix_mac_speed(void *priv, int speed, unsigned int mode) ethqos_configure(ethqos, speed); } -static int qcom_ethqos_serdes_powerup(struct net_device *ndev, void *priv) -{ - struct qcom_ethqos *ethqos = priv; - int ret; - - ret = phy_init(ethqos->serdes_phy); - if (ret) - return ret; - - ret = phy_power_on(ethqos->serdes_phy); - if (ret) - return ret; - - return phy_set_speed(ethqos->serdes_phy, ethqos->serdes_speed); -} - -static void qcom_ethqos_serdes_powerdown(struct net_device *ndev, void *priv) -{ - struct qcom_ethqos *ethqos = priv; - - phy_power_off(ethqos->serdes_phy); - phy_exit(ethqos->serdes_phy); -} - static int ethqos_clks_config(void *priv, bool enabled) { struct qcom_ethqos *ethqos = priv; @@ -790,12 +752,11 @@ static int qcom_ethqos_probe(struct platform_device *pdev) if (ret) return ret; - ethqos->serdes_phy = devm_phy_optional_get(dev, "serdes"); - if (IS_ERR(ethqos->serdes_phy)) - return dev_err_probe(dev, PTR_ERR(ethqos->serdes_phy), + plat_dat->serdes = devm_phy_optional_get(dev, "serdes"); + if (IS_ERR(plat_dat->serdes)) + return dev_err_probe(dev, PTR_ERR(plat_dat->serdes), "Failed to get serdes phy\n"); - ethqos->serdes_speed = SPEED_1000; ethqos_set_clk_tx_rate(ethqos, NULL, plat_dat->phy_interface, SPEED_1000); ethqos_set_func_clk_en(ethqos); @@ -816,11 +777,6 @@ static int qcom_ethqos_probe(struct platform_device *pdev) if (data->dma_addr_width) plat_dat->host_dma_width = data->dma_addr_width; - if (ethqos->serdes_phy) { - plat_dat->serdes_powerup = qcom_ethqos_serdes_powerup; - plat_dat->serdes_powerdown = qcom_ethqos_serdes_powerdown; - } - /* Enable TSO on queue0 and enable TBS on rest of the queues */ for (i = 1; i < plat_dat->tx_queues_to_use; i++) plat_dat->tx_queues_cfg[i].tbs_en = 1; -- 2.47.3