Re: [net-next,07/21] net: stmmac: rk: convert to mask-based interface mode configuration
From: Jakub Kicinski <kuba@kernel.org>
Date: 2026-01-25 22:16:38
Also in:
linux-arm-kernel, linux-rockchip
This is an AI-generated review of your patch. The human sending this email has considered the AI review valid, or at least plausible. For local reproduction steps see https://netdev-ai.bots.linux.dev/ai-local.html --- net: stmmac: rk: convert to mask-based interface mode configuration This patch consolidates PHY interface mode configuration into a common infrastructure. It introduces mask fields for phy_intf_sel and rmii_mode, and moves the register writes from SoC-specific set_to_rgmii/set_to_rmii functions into the common rk_gmac_powerup() function.
quoted hunk ↗ jump to hunk
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c index 4117f6863ff0..48fc5b58092f 100644
[ ... ]
quoted hunk ↗ jump to hunk
@@ -1198,9 +1225,6 @@ static const struct rk_gmac_ops rk3576_ops = { #define RK3588_GRF_GMAC_CON0 0X0008 #define RK3588_GRF_CLK_CON1 0X0070
The comment above these defines says "/* php_grf */" indicating that RK3588_GRF_GMAC_CON0 is in the php_grf register space. [ ... ]
+static int rk3588_init(struct rk_priv_data *bsp_priv)
+{
+ switch (bsp_priv->id) {
+ case 0:
+ bsp_priv->gmac_phy_intf_sel_mask = GENMASK_U16(5, 3);
+ return 0;
+
+ case 1:
+ bsp_priv->gmac_phy_intf_sel_mask = GENMASK_U16(11, 9);
+ return 0;
+
+ default:
+ return -EINVAL;
+ }
+}[ ... ]
quoted hunk ↗ jump to hunk
@@ -1296,10 +1330,14 @@ static void rk3588_set_clock_selection(struct rk_priv_data *bsp_priv, bool input } static const struct rk_gmac_ops rk3588_ops = { + .init = rk3588_init, .set_to_rgmii = rk3588_set_to_rgmii, .set_to_rmii = rk3588_set_to_rmii, .set_speed = rk3588_set_gmac_speed, .set_clock_selection = rk3588_set_clock_selection, + + .gmac_grf_reg = RK3588_GRF_GMAC_CON0,
rk3588_ops sets gmac_grf_reg to RK3588_GRF_GMAC_CON0, and rk3588_init() sets gmac_phy_intf_sel_mask. This enables the new common code path in rk_gmac_powerup(). [ ... ]
quoted hunk ↗ jump to hunk
@@ -1664,6 +1707,24 @@ static int rk_gmac_powerup(struct rk_priv_data *bsp_priv) if (ret) return ret; + ret = rk_get_phy_intf_sel(bsp_priv->phy_iface); + if (ret < 0) + return ret; + + if (bsp_priv->gmac_phy_intf_sel_mask || + bsp_priv->gmac_rmii_mode_mask) { + /* If defined, encode the phy_intf_sel value */ + val = rk_encode_wm16(ret, bsp_priv->gmac_phy_intf_sel_mask); + + /* If defined, encode the RMII mode mask setting. */ + val |= rk_encode_wm16(ret == PHY_INTF_SEL_RMII, + bsp_priv->gmac_rmii_mode_mask); + + ret = regmap_write(bsp_priv->grf, bsp_priv->gmac_grf_reg, val);
^^^^
For rk3588, does this write to the wrong regmap? The old code in
rk3588_set_to_rgmii() and rk3588_set_to_rmii() wrote the PHY_INTF_SEL
register to bsp_priv->php_grf:
regmap_write(bsp_priv->php_grf, RK3588_GRF_GMAC_CON0,
RK3588_GMAC_PHY_INTF_SEL(id, PHY_INTF_SEL_RGMII));
But the new common code writes to bsp_priv->grf instead. The comment in
the source indicates RK3588_GRF_GMAC_CON0 is in the php_grf register
space. Should this be using php_grf for rk3588?
+ if (ret < 0) + return ret; + }