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 D93F3304969 for ; Mon, 3 Nov 2025 11:50:48 +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=1762170651; cv=none; b=cVbJ2QccgBjdbnfz09ZtO6Niwo7Y3ml+H3PpeuxMGw9lk9Z4BRehF2VkOT9bFzpoSZRoQrqHFd1Gr876PC3HqtgnNGxoelPe1o4WThYS4sJXgMiXEtmJ9H37vweujZXwEmjTcW/cOaF/dqI7VBdPEvLFhjeLCyqIlfqpVYcb54k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762170651; c=relaxed/simple; bh=q1FS11zaR79tuCLLMWukchO0tuXNYhpDKJDhm82jZdM=; h=In-Reply-To:References:From:To:Cc:Subject:MIME-Version: Content-Disposition:Content-Type:Message-Id:Date; b=ASJzZ+IRSAn4GCVs9IMOmpcJfjDax5uw7wqR5HQo/n7Aj5pFJn1v3Bok4KzrvFDFLiiW6qsIyg0uc58i5Eo1UHnwnGHulOOBaJMJAsyhMfy/ZnIz/MzWt9GSg+kC54/ev2g2wnC70jf9wZ7jc9LRx+A8cRHxh3Gwo7qOH9I3qms= 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=C+pj2AL4; 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="C+pj2AL4" 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=hxtZc9DxAp4rwz/OaxnGtR7sGKct7r/qlyJWz+2oUkc=; b=C+pj2AL4iRGWtz6E8XodiWYxJs mxGGdtrHZ7PpacZGgUaGxkifRBk7kc+jHr6Y4DCe+t0Bldh8nF9g8IWSgQsIrSxohbAYbZbo2Amfu oCRM0YV54WTKigbsmj5NVnYL2IwlAXnCuBksnGbSUpyEq8q6BgyKDloNLV8criiMw8sZ/gJIaKpzU vHjbmeoX2EUb9FhI54Tzpz3f8n0EBVTZ2lPXIyqE9+O/rREVQeEMdnDAbcCdp6zQjcS7eOikXr39R EOZLY2dcTvsp5lfNusXN1ipEe10GPZAY5lZCzFTHsMZOoNTjpZk1TxekoS9ZkVYbuKti7tpcp+Y5N 3XqtGFFQ==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:50024 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 1vFt50-000000000hS-3qZo; Mon, 03 Nov 2025 11:50:35 +0000 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.98.2) (envelope-from ) id 1vFt4x-0000000ChpA-1Edr; Mon, 03 Nov 2025 11:50:31 +0000 In-Reply-To: References: From: "Russell King (Oracle)" To: Andrew Lunn , Heiner Kallweit Cc: Alexandre Torgue , Andrew Lunn , "David S. Miller" , Eric Dumazet , Fabio Estevam , imx@lists.linux.dev, Jakub Kicinski , Jan Petrous , linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, Maxime Coquelin , netdev@vger.kernel.org, Paolo Abeni , Pengutronix Kernel Team , s32@nxp.com, Sascha Hauer , Shawn Guo Subject: [PATCH net-next 08/11] net: stmmac: imx: use stmmac_get_phy_intf_sel() Precedence: bulk X-Mailing-List: imx@lists.linux.dev 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: Mon, 03 Nov 2025 11:50:31 +0000 i.MX implementations other than IMX8DXL involve setting the dwmac core phy_intf_sel input. Use stmmac_get_phy_intf_sel() to decode the PHY interface mode to the phy_intf_sel value, validating the result, and passing it into the implementation specific .set_intf_mode() method rather than each .set_intf_mode() method doing this. Signed-off-by: Russell King (Oracle) --- .../net/ethernet/stmicro/stmmac/dwmac-imx.c | 43 +++++++++++-------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c index f1cfccd4269c..dc28486a7af0 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c @@ -45,7 +45,8 @@ struct imx_dwmac_ops { bool mac_rgmii_txclk_auto_adj; int (*fix_soc_reset)(struct stmmac_priv *priv, void __iomem *ioaddr); - int (*set_intf_mode)(struct plat_stmmacenet_data *plat_dat); + int (*set_intf_mode)(struct plat_stmmacenet_data *plat_dat, + u8 phy_intf_sel); void (*fix_mac_speed)(void *priv, int speed, unsigned int mode); }; @@ -62,26 +63,23 @@ struct imx_priv_data { struct plat_stmmacenet_data *plat_dat; }; -static int imx8mp_set_intf_mode(struct plat_stmmacenet_data *plat_dat) +static int imx8mp_set_intf_mode(struct plat_stmmacenet_data *plat_dat, + u8 phy_intf_sel) { struct imx_priv_data *dwmac = plat_dat->bsp_priv; - u8 phy_intf_sel; int val; switch (plat_dat->phy_interface) { case PHY_INTERFACE_MODE_MII: - phy_intf_sel = PHY_INTF_SEL_GMII_MII; val = 0; break; case PHY_INTERFACE_MODE_RMII: - phy_intf_sel = PHY_INTF_SEL_RMII; val = dwmac->rmii_refclk_ext ? 0 : GPR_ENET_QOS_CLK_TX_CLK_SEL; break; case PHY_INTERFACE_MODE_RGMII: case PHY_INTERFACE_MODE_RGMII_ID: case PHY_INTERFACE_MODE_RGMII_RXID: case PHY_INTERFACE_MODE_RGMII_TXID: - phy_intf_sel = PHY_INTF_SEL_RGMII; val = GPR_ENET_QOS_RGMII_EN; break; default: @@ -98,7 +96,8 @@ static int imx8mp_set_intf_mode(struct plat_stmmacenet_data *plat_dat) }; static int -imx8dxl_set_intf_mode(struct plat_stmmacenet_data *plat_dat) +imx8dxl_set_intf_mode(struct plat_stmmacenet_data *plat_dat, + u8 phy_intf_sel) { int ret = 0; @@ -106,16 +105,13 @@ imx8dxl_set_intf_mode(struct plat_stmmacenet_data *plat_dat) return ret; } -static int imx93_set_intf_mode(struct plat_stmmacenet_data *plat_dat) +static int imx93_set_intf_mode(struct plat_stmmacenet_data *plat_dat, + u8 phy_intf_sel) { struct imx_priv_data *dwmac = plat_dat->bsp_priv; - u8 phy_intf_sel; int val, ret; switch (plat_dat->phy_interface) { - case PHY_INTERFACE_MODE_MII: - phy_intf_sel = PHY_INTF_SEL_GMII_MII; - break; case PHY_INTERFACE_MODE_RMII: if (dwmac->rmii_refclk_ext) { ret = regmap_clear_bits(dwmac->intf_regmap, @@ -125,13 +121,12 @@ static int imx93_set_intf_mode(struct plat_stmmacenet_data *plat_dat) if (ret) return ret; } - phy_intf_sel = PHY_INTF_SEL_RMII; break; + case PHY_INTERFACE_MODE_MII: case PHY_INTERFACE_MODE_RGMII: case PHY_INTERFACE_MODE_RGMII_ID: case PHY_INTERFACE_MODE_RGMII_RXID: case PHY_INTERFACE_MODE_RGMII_TXID: - phy_intf_sel = PHY_INTF_SEL_RGMII; break; default: dev_dbg(dwmac->dev, "imx dwmac doesn't support %s interface\n", @@ -176,12 +171,24 @@ static int imx_dwmac_init(struct platform_device *pdev, void *priv) { struct plat_stmmacenet_data *plat_dat; struct imx_priv_data *dwmac = priv; - int ret; - - plat_dat = dwmac->plat_dat; + phy_interface_t interface; + int phy_intf_sel, ret; if (dwmac->ops->set_intf_mode) { - ret = dwmac->ops->set_intf_mode(plat_dat); + plat_dat = dwmac->plat_dat; + interface = plat_dat->phy_interface; + + phy_intf_sel = stmmac_get_phy_intf_sel(interface); + if (phy_intf_sel != PHY_INTF_SEL_GMII_MII && + phy_intf_sel != PHY_INTF_SEL_RGMII && + phy_intf_sel != PHY_INTF_SEL_RMII) { + dev_dbg(dwmac->dev, + "imx dwmac doesn't support %s interface\n", + phy_modes(interface)); + return phy_intf_sel < 0 ? phy_intf_sel : -EINVAL; + } + + ret = dwmac->ops->set_intf_mode(plat_dat, phy_intf_sel); if (ret) return ret; } -- 2.47.3