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 CFE762BD033 for ; Thu, 6 Nov 2025 11:23:52 +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=1762428234; cv=none; b=rI3tM632CP5I71XWCzC1htNDTdVBOrQ3jaxfdNOF5RCtdg0/J75L+SoudMxMqDbZPly0q5udYW1kQ2KyzON0O2ezRklaBhRtvHCJaJXzw5ZILuRL77+ADaYDndecl5pc4+qNG5gbyclsRYsyPpCixWVj18ReYWhAZVBePa8qKvQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762428234; c=relaxed/simple; bh=hySRlau3rHs8BcwZwAd+JEYPSZdkhZf2eQLBeQx6Swc=; h=In-Reply-To:References:From:To:Cc:Subject:MIME-Version: Content-Disposition:Content-Type:Message-Id:Date; b=p0fX7aok1jaWRWkGZoDeUsnM3O21plTKkYMqIQNSsyuSpJuH32KJ8LSWvAQseki0m4Y7Vlupo9ltTRH7G0jba97PAcHGqwq4OykwLtq0KkbICn7nB3OH0guRciEVbHhNW2J63bqoADaz2uQ3m7iuu7gVifkLGrAsE9w7h9DaGeE= 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=moOzjbag; 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="moOzjbag" 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=TBl80ntOVSw5ZoCrR85twsw0/NxyN3XF7nXCwTrs0C8=; b=moOzjbagfA5GbRgRUfYVAkVFTn kfs0aq3a6+hNmskzb/1EqkDEukHwSpFaw7a7y2TpiPYisrNL0zuHDGygtkl++okhBytopvcoeWe3o bmznlyV4SwcARL32ejVD5E3oQ/5Th6s7gZzyiJ5qh04gooGdUkUiT2Bfit+JYdns+mxoYDzkAqBu+ ZaL//EUrOLoKSfYDV7yDR8sUGgp7bSsZtYL877XBDvNreej2JLb63a4EoCUHKSRxSUC12F6jWD7s+ ElRP+ZXhZImUYl/4o2By1TCXDLp7Qf2zrROavm/3MHWVU7gTujpMm9X0Yuo4LpBdZbdSYwt3xbSAq lgs3XmyQ==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:48248 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 1vGy5f-000000004w8-25Qr; Thu, 06 Nov 2025 11:23:43 +0000 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.98.2) (envelope-from ) id 1vGy5e-0000000DhQb-2B7I; Thu, 06 Nov 2025 11:23:42 +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 , linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, Maxime Coquelin , netdev@vger.kernel.org, Paolo Abeni , Vladimir Zapolskiy Subject: [PATCH net-next 7/9] net: stmmac: sti: use PHY_INTF_SEL_x directly 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: Thu, 06 Nov 2025 11:23:42 +0000 Use the PHY_INTF_SEL_x values directly rather than the driver private ETH_PHY_SEL_x values. Move the FIELD_PREP() into sti_dwmac_set_mode(). Use dwmac->interface directly. Signed-off-by: Russell King (Oracle) --- .../net/ethernet/stmicro/stmmac/dwmac-sti.c | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c index 1e8769a81d77..c97535824be0 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c @@ -81,11 +81,6 @@ */ #define MII_PHY_SEL_MASK GENMASK(4, 2) #define MII_PHY_SEL_VAL(val) FIELD_PREP_CONST(MII_PHY_SEL_MASK, val) -#define ETH_PHY_SEL_RMII MII_PHY_SEL_VAL(PHY_INTF_SEL_RMII) -#define ETH_PHY_SEL_SGMII MII_PHY_SEL_VAL(PHY_INTF_SEL_SGMII) -#define ETH_PHY_SEL_RGMII MII_PHY_SEL_VAL(PHY_INTF_SEL_RGMII) -#define ETH_PHY_SEL_GMII MII_PHY_SEL_VAL(PHY_INTF_SEL_GMII_MII) -#define ETH_PHY_SEL_MII MII_PHY_SEL_VAL(PHY_INTF_SEL_GMII_MII) struct sti_dwmac { phy_interface_t interface; /* MII interface */ @@ -104,13 +99,13 @@ struct sti_dwmac_of_data { void (*fix_retime_src)(void *priv, int speed, unsigned int mode); }; -static u32 phy_intf_sels[] = { - [PHY_INTERFACE_MODE_MII] = ETH_PHY_SEL_MII, - [PHY_INTERFACE_MODE_GMII] = ETH_PHY_SEL_GMII, - [PHY_INTERFACE_MODE_RGMII] = ETH_PHY_SEL_RGMII, - [PHY_INTERFACE_MODE_RGMII_ID] = ETH_PHY_SEL_RGMII, - [PHY_INTERFACE_MODE_SGMII] = ETH_PHY_SEL_SGMII, - [PHY_INTERFACE_MODE_RMII] = ETH_PHY_SEL_RMII, +static u8 phy_intf_sels[] = { + [PHY_INTERFACE_MODE_MII] = PHY_INTF_SEL_GMII_MII, + [PHY_INTERFACE_MODE_GMII] = PHY_INTF_SEL_GMII_MII, + [PHY_INTERFACE_MODE_RGMII] = PHY_INTF_SEL_RGMII, + [PHY_INTERFACE_MODE_RGMII_ID] = PHY_INTF_SEL_RGMII, + [PHY_INTERFACE_MODE_SGMII] = PHY_INTF_SEL_SGMII, + [PHY_INTERFACE_MODE_RMII] = PHY_INTF_SEL_RMII, }; enum { @@ -164,16 +159,18 @@ static void stih4xx_fix_retime_src(void *priv, int spd, unsigned int mode) static int sti_dwmac_set_mode(struct sti_dwmac *dwmac) { struct regmap *regmap = dwmac->regmap; - int iface = dwmac->interface; u32 reg = dwmac->ctrl_reg; + u8 phy_intf_sel; u32 val; if (dwmac->gmac_en) regmap_update_bits(regmap, reg, EN_MASK, EN); - regmap_update_bits(regmap, reg, MII_PHY_SEL_MASK, phy_intf_sels[iface]); + phy_intf_sel = phy_intf_sels[dwmac->interface]; + regmap_update_bits(regmap, reg, MII_PHY_SEL_MASK, + FIELD_PREP(MII_PHY_SEL_MASK, phy_intf_sel)); - val = (iface == PHY_INTERFACE_MODE_REVMII) ? 0 : ENMII; + val = (dwmac->interface == PHY_INTERFACE_MODE_REVMII) ? 0 : ENMII; regmap_update_bits(regmap, reg, ENMII_MASK, val); dwmac->fix_retime_src(dwmac, dwmac->speed, 0); -- 2.47.3