net: stmmac: rk: simplify per-SoC configuration
Subsystems (5)
v2 cover net: stmmac: rk: simplify per-SoC configuration
[Please note: due to google's spam filtering, I can no longer send patch series to @gmail.com addresses, and thus, to save being spammed with failed deliveries, I'm dropping such addresses from my patch series. Stop giving google so much power, use other email services.]
dwmac-rk has an excessive variability between each individual SoCs which makes this file extremely large.
This series reworks the per-SoC handling, moving the majority of it out of code and into data in a way that greatly reduces the lines of code necessary for each SoC, moving the code into the higher level functions in this file.
In order to do this, we need a version of FIELD_PREP_WM16() that works with non-constant masks, so we introduce rk_encode_wm16().
We change the definitions to reveal the fact that in all of this variability, there is a lot of commonality in terms of the values of the bitfields, even though these bitfields appear to be randomly placed within registers.
Both of these allow us to progressively move to a situation where the SoC independent code can, in the mojority of cases, program these RGMII clocks, RMII clocks and RMII speed without calling any SoC specific code.
Further cleanup may be possible with the (actually incorrect) handling of RGMII delays, but this is not addressed in this already large series.
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 1237 ++++++++++-------------- 1 file changed, 508 insertions(+), 729 deletions(-)
v2: fix AI review comments
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
PATCH v2 1/22 net: stmmac: rk: avoid phy_power_on()
In https://lore.kernel.org/netdev/[email protected]/
I requested that a follow-up patch to change the name of dwmac-rk's phy_power_on() function, which clashes with the drivers/phy function of the same name. This can cause confusion when grepping for this function name, or when reviewing code. Thankfully, stmmac doesn't make use of drivers/phy which saves this from compile errors.
However, as is the usual case when a request is made as part of a review, if the review leads to successful application of the patch the author doesn't bother following up with any such requests, and so the problem falls back onto the reviewer to address... so here is the solution.
Rename dwmac-rk's function to rk_phy_power_ctl(), as the function both powers up and down.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +3 -3
@@ -1498,7 +1498,7 @@ static int gmac_clk_enable(struct rk_priv_data *bsp_priv, bool enable)return 0 ; } -static int phy_power_on (struct rk_priv_data *bsp_priv,bool enable) +static int rk_phy_power_ctl (struct rk_priv_data *bsp_priv,bool enable) {struct regulator *ldo = bsp_priv->regulator;struct device *dev = bsp_priv->dev;
@@ -1692,7 +1692,7 @@ static int rk_gmac_powerup(struct rk_priv_data *bsp_priv)dev_err (dev,"NO interface defined!\n" ); } - ret =phy_power_on (bsp_priv, true); + ret =rk_phy_power_ctl (bsp_priv, true);if (ret) {gmac_clk_enable (bsp_priv, false);return ret;
@@ -1713,7 +1713,7 @@ static void rk_gmac_powerdown(struct rk_priv_data *gmac)pm_runtime_put_sync (gmac->dev); -phy_power_on (gmac, false); +rk_phy_power_ctl (gmac, false);gmac_clk_enable (gmac, false); }
Signature · 1 line
2.47.3
PATCH v2 2/22 net: stmmac: rk: get rid of rk_phy_power_ctl()
In reply to Russell King (Oracle)It is not worth having a common rk_phy_power_ctl() when the only difference is which regulator function is called. Also, passing true/false is non-descriptive. Split this function, moving the code appropriately into rk_phy_powerup() and rk_phy_powerdown().
--- .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +17 -14
@@ -1498,23 +1498,26 @@ static int gmac_clk_enable(struct rk_priv_data *bsp_priv, bool enable)return 0 ; } -static int rk_phy_power_ctl (struct rk_priv_data *bsp_priv,bool enable) +static int rk_phy_powerup (struct rk_priv_data *bsp_priv) {struct regulator *ldo = bsp_priv->regulator; -struct device *dev = bsp_priv->dev;int ret; -if (enable) { - ret =regulator_enable (ldo); -if (ret) -dev_err (dev,"fail to enable phy-supply\n" ); - }else { - ret =regulator_disable (ldo); -if (ret) -dev_err (dev,"fail to disable phy-supply\n" ); - } + ret =regulator_enable (ldo); +if (ret) +dev_err (bsp_priv->dev,"fail to enable phy-supply\n" ); -return 0 ; +return ret; +} + +static void rk_phy_powerdown (struct rk_priv_data *bsp_priv) +{ +struct regulator *ldo = bsp_priv->regulator; +int ret; + + ret =regulator_disable (ldo); +if (ret) +dev_err (bsp_priv->dev,"fail to disable phy-supply\n" ); } static struct rk_priv_data *rk_gmac_setup(struct platform_device *pdev,
@@ -1692,7 +1695,7 @@ static int rk_gmac_powerup(struct rk_priv_data *bsp_priv)dev_err (dev,"NO interface defined!\n" ); } - ret =rk_phy_power_ctl (bsp_priv, true); + ret =rk_phy_powerup (bsp_priv);if (ret) {gmac_clk_enable (bsp_priv, false);return ret;
@@ -1713,7 +1716,7 @@ static void rk_gmac_powerdown(struct rk_priv_data *gmac)pm_runtime_put_sync (gmac->dev); -rk_phy_power_ctl (gmac, false); +rk_phy_powerdown (gmac);gmac_clk_enable (gmac, false); }
Signature · 1 line
2.47.3
PATCH v2 3/22 net: stmmac: rk: convert rk3328 to use bsp_priv->id
In reply to Russell King (Oracle)rk3328 contains two GMAC instances - gmac2io and gmac2phy. While the gmac2io instance may be connected to an external PHY, the gmac2phy instance is permanently connected via RMII to an on-SoC integrated PHY.
The driver currently tests for the gmac2phy instance by checking bsp_priv->integrated_phy (determined from the PHY's phy-is-integrated property) and sometimes that the interface mode is RMII. This works because the rk3328.dtsi has:
gmac2phy: ethernet@ff550000 {
compatible = "rockchip,rk3328-gmac";
phy-mode = "rmii";
phy-handle = <&phy>;
mdio {
phy: ethernet-phy@0 {
phy-is-integrated;
};
};
};The driver contains a mechanism to look up the MMIO address in a table to determine bsp_priv->id, which is used for every other Rockchip device. Switch rk3328 to use this mechanism to determine bsp_priv->id and use that to select which GRF register is used for configuration, similarly to how the other Rockchip SoCs handle such differences.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +9 -6
@@ -570,8 +570,7 @@ static void rk3328_set_to_rmii(struct rk_priv_data *bsp_priv) {unsigned int reg; - reg = bsp_priv->integrated_phy ?RK3328_GRF_MAC_CON2 : -RK3328_GRF_MAC_CON1 ; + reg = bsp_priv->id ?RK3328_GRF_MAC_CON2 :RK3328_GRF_MAC_CON1 ; regmap_write(bsp_priv->grf, reg, RK3328_GMAC_PHY_INTF_SEL(PHY_INTF_SEL_RMII) |
@@ -591,10 +590,7 @@ static int rk3328_set_speed(struct rk_priv_data *bsp_priv, {unsigned int reg; -if (interface ==PHY_INTERFACE_MODE_RMII && bsp_priv->integrated_phy) - reg =RK3328_GRF_MAC_CON2 ; -else - reg =RK3328_GRF_MAC_CON1 ; + reg = bsp_priv->id ?RK3328_GRF_MAC_CON2 :RK3328_GRF_MAC_CON1 ;return rk_set_reg_speed (bsp_priv, &rk3328_reg_speed_data, reg, interface, speed);
@@ -614,6 +610,13 @@ static const struct rk_gmac_ops rk3328_ops = { .set_speed = rk3328_set_speed, .integrated_phy_powerup = rk3328_integrated_phy_powerup, .integrated_phy_powerdown = rk_gmac_integrated_ephy_powerdown, + + .regs_valid = true, + .regs = { +0xff540000 ,/* gmac2io */ +0xff550000 ,/* gmac2phy */ + 0, /* sentinel */ + }, };#define RK3366_GRF_SOC_CON6 0x0418
Signature · 1 line
2.47.3
PATCH v2 4/22 net: stmmac: rk: group MACPHY register offset and fields together
In reply to Russell King (Oracle)Group the MACPHY register offsets and associated bitfields together to become self-documenting which definitions are associated with which register.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +6 -4
@@ -162,15 +162,17 @@ static int rk_set_clk_mac_speed(struct rk_priv_data *bsp_priv, ((rx) ? soc##_GMAC_RXCLK_DLY_ENABLE : soc##_GMAC_RXCLK_DLY_DISABLE))#define RK_GRF_MACPHY_CON0 0xb00 -#define RK_GRF_MACPHY_CON1 0xb04 -#define RK_GRF_MACPHY_CON2 0xb08 -#define RK_GRF_MACPHY_CON3 0xb0c -#define RK_MACPHY_ENABLE GRF_BIT(0)#define RK_MACPHY_DISABLE GRF_CLR_BIT(0)#define RK_MACPHY_CFG_CLK_50M GRF_BIT(14)#define RK_GMAC2PHY_RMII_MODE GRF_FIELD(7, 6, 1) + +#define RK_GRF_MACPHY_CON1 0xb04 + +#define RK_GRF_MACPHY_CON2 0xb08#define RK_GRF_CON2_MACPHY_ID GRF_FIELD(15, 0, 0x1234) + +#define RK_GRF_MACPHY_CON3 0xb0c#define RK_GRF_CON3_MACPHY_ID GRF_FIELD(5, 0, 0x35)static void rk_gmac_integrated_ephy_powerup (struct rk_priv_data *priv)
Signature · 1 line
2.47.3
PATCH v2 5/22 net: stmmac: rk: add GMAC_CLK_xx constants, simplify RGMII definitions
In reply to Russell King (Oracle)All the definitions of the RGMII related xxx_GMAC_CLK_xxx definitions use the same field values to select the clock rate. Provide common defintions for these field values, passing them in to a single macro for each variant that generates the appropriate values for the speed register.
No change to produced code on aarch64.
--- .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 108 ++++++++---------- 1 file changed, 45 insertions(+), 63 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +45 -63
@@ -91,6 +91,10 @@ struct rk_priv_data {struct regmap *php_grf; }; +#define GMAC_CLK_DIV1_125M 0 +#define GMAC_CLK_DIV50_2_5M 2 +#define GMAC_CLK_DIV5_25M 3 + static int rk_set_reg_speed(struct rk_priv_data *bsp_priv, const struct rk_reg_speed_data *rsd, unsigned int reg, phy_interface_t interface,
@@ -299,9 +303,7 @@ static const struct rk_gmac_ops px30_ops = {#define RK3128_GMAC_SPEED_100M GRF_BIT(10)#define RK3128_GMAC_RMII_CLK_25M GRF_BIT(11)#define RK3128_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(11) -#define RK3128_GMAC_CLK_125M GRF_FIELD_CONST(13, 12, 0) -#define RK3128_GMAC_CLK_25M GRF_FIELD_CONST(13, 12, 3) -#define RK3128_GMAC_CLK_2_5M GRF_FIELD_CONST(13, 12, 2) +#define RK3128_GMAC_CLK (val) GRF_FIELD_CONST(13, 12, val)#define RK3128_GMAC_RMII_MODE GRF_BIT(14)#define RK3128_GMAC_RMII_MODE_CLR GRF_CLR_BIT(14)
@@ -325,9 +327,9 @@ static void rk3128_set_to_rmii(struct rk_priv_data *bsp_priv) }static const struct rk_reg_speed_data rk3128_reg_speed_data = { - .rgmii_10 =RK3128_GMAC_CLK_2_5M , - .rgmii_100 =RK3128_GMAC_CLK_25M , - .rgmii_1000 =RK3128_GMAC_CLK_125M , + .rgmii_10 =RK3128_GMAC_CLK (GMAC_CLK_DIV50_2_5M ), + .rgmii_100 =RK3128_GMAC_CLK (GMAC_CLK_DIV5_25M ), + .rgmii_1000 =RK3128_GMAC_CLK (GMAC_CLK_DIV1_125M ), .rmii_10 =RK3128_GMAC_RMII_CLK_2_5M |RK3128_GMAC_SPEED_10M , .rmii_100 =RK3128_GMAC_RMII_CLK_25M |RK3128_GMAC_SPEED_100M , };
@@ -362,9 +364,7 @@ static const struct rk_gmac_ops rk3128_ops = {#define RK3228_GMAC_SPEED_100M GRF_BIT(2)#define RK3228_GMAC_RMII_CLK_25M GRF_BIT(7)#define RK3228_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(7) -#define RK3228_GMAC_CLK_125M GRF_FIELD_CONST(9, 8, 0) -#define RK3228_GMAC_CLK_25M GRF_FIELD_CONST(9, 8, 3) -#define RK3228_GMAC_CLK_2_5M GRF_FIELD_CONST(9, 8, 2) +#define RK3228_GMAC_CLK (val) GRF_FIELD_CONST(9, 8, val)#define RK3228_GMAC_RMII_MODE GRF_BIT(10)#define RK3228_GMAC_RMII_MODE_CLR GRF_CLR_BIT(10)#define RK3228_GMAC_TXCLK_DLY_ENABLE GRF_BIT(0)
@@ -399,9 +399,9 @@ static void rk3228_set_to_rmii(struct rk_priv_data *bsp_priv) }static const struct rk_reg_speed_data rk3228_reg_speed_data = { - .rgmii_10 =RK3228_GMAC_CLK_2_5M , - .rgmii_100 =RK3228_GMAC_CLK_25M , - .rgmii_1000 =RK3228_GMAC_CLK_125M , + .rgmii_10 =RK3228_GMAC_CLK (GMAC_CLK_DIV50_2_5M ), + .rgmii_100 =RK3228_GMAC_CLK (GMAC_CLK_DIV5_25M ), + .rgmii_1000 =RK3228_GMAC_CLK (GMAC_CLK_DIV1_125M ), .rmii_10 =RK3228_GMAC_RMII_CLK_2_5M |RK3228_GMAC_SPEED_10M , .rmii_100 =RK3228_GMAC_RMII_CLK_25M |RK3228_GMAC_SPEED_100M , };
@@ -440,9 +440,7 @@ static const struct rk_gmac_ops rk3228_ops = {#define RK3288_GMAC_SPEED_100M GRF_BIT(10)#define RK3288_GMAC_RMII_CLK_25M GRF_BIT(11)#define RK3288_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(11) -#define RK3288_GMAC_CLK_125M GRF_FIELD_CONST(13, 12, 0) -#define RK3288_GMAC_CLK_25M GRF_FIELD_CONST(13, 12, 3) -#define RK3288_GMAC_CLK_2_5M GRF_FIELD_CONST(13, 12, 2) +#define RK3288_GMAC_CLK (val) GRF_FIELD_CONST(13, 12, val)#define RK3288_GMAC_RMII_MODE GRF_BIT(14)#define RK3288_GMAC_RMII_MODE_CLR GRF_CLR_BIT(14)
@@ -474,9 +472,9 @@ static void rk3288_set_to_rmii(struct rk_priv_data *bsp_priv) }static const struct rk_reg_speed_data rk3288_reg_speed_data = { - .rgmii_10 =RK3288_GMAC_CLK_2_5M , - .rgmii_100 =RK3288_GMAC_CLK_25M , - .rgmii_1000 =RK3288_GMAC_CLK_125M , + .rgmii_10 =RK3288_GMAC_CLK (GMAC_CLK_DIV50_2_5M ), + .rgmii_100 =RK3288_GMAC_CLK (GMAC_CLK_DIV5_25M ), + .rgmii_1000 =RK3288_GMAC_CLK (GMAC_CLK_DIV1_125M ), .rmii_10 =RK3288_GMAC_RMII_CLK_2_5M |RK3288_GMAC_SPEED_10M , .rmii_100 =RK3288_GMAC_RMII_CLK_25M |RK3288_GMAC_SPEED_100M , };
@@ -543,9 +541,7 @@ static const struct rk_gmac_ops rk3308_ops = {#define RK3328_GMAC_SPEED_100M GRF_BIT(2)#define RK3328_GMAC_RMII_CLK_25M GRF_BIT(7)#define RK3328_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(7) -#define RK3328_GMAC_CLK_125M GRF_FIELD_CONST(12, 11, 0) -#define RK3328_GMAC_CLK_25M GRF_FIELD_CONST(12, 11, 3) -#define RK3328_GMAC_CLK_2_5M GRF_FIELD_CONST(12, 11, 2) +#define RK3328_GMAC_CLK (val) GRF_FIELD_CONST(12, 11, val)#define RK3328_GMAC_RMII_MODE GRF_BIT(9)#define RK3328_GMAC_RMII_MODE_CLR GRF_CLR_BIT(9)#define RK3328_GMAC_TXCLK_DLY_ENABLE GRF_BIT(0)
@@ -580,9 +576,9 @@ static void rk3328_set_to_rmii(struct rk_priv_data *bsp_priv) }static const struct rk_reg_speed_data rk3328_reg_speed_data = { - .rgmii_10 =RK3328_GMAC_CLK_2_5M , - .rgmii_100 =RK3328_GMAC_CLK_25M , - .rgmii_1000 =RK3328_GMAC_CLK_125M , + .rgmii_10 =RK3328_GMAC_CLK (GMAC_CLK_DIV50_2_5M ), + .rgmii_100 =RK3328_GMAC_CLK (GMAC_CLK_DIV5_25M ), + .rgmii_1000 =RK3328_GMAC_CLK (GMAC_CLK_DIV1_125M ), .rmii_10 =RK3328_GMAC_RMII_CLK_2_5M |RK3328_GMAC_SPEED_10M , .rmii_100 =RK3328_GMAC_RMII_CLK_25M |RK3328_GMAC_SPEED_100M , };
@@ -632,9 +628,7 @@ static const struct rk_gmac_ops rk3328_ops = {#define RK3366_GMAC_SPEED_100M GRF_BIT(7)#define RK3366_GMAC_RMII_CLK_25M GRF_BIT(3)#define RK3366_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(3) -#define RK3366_GMAC_CLK_125M GRF_FIELD_CONST(5, 4, 0) -#define RK3366_GMAC_CLK_25M GRF_FIELD_CONST(5, 4, 3) -#define RK3366_GMAC_CLK_2_5M GRF_FIELD_CONST(5, 4, 2) +#define RK3366_GMAC_CLK (val) GRF_FIELD_CONST(5, 4, val)#define RK3366_GMAC_RMII_MODE GRF_BIT(6)#define RK3366_GMAC_RMII_MODE_CLR GRF_CLR_BIT(6)
@@ -666,9 +660,9 @@ static void rk3366_set_to_rmii(struct rk_priv_data *bsp_priv) }static const struct rk_reg_speed_data rk3366_reg_speed_data = { - .rgmii_10 =RK3366_GMAC_CLK_2_5M , - .rgmii_100 =RK3366_GMAC_CLK_25M , - .rgmii_1000 =RK3366_GMAC_CLK_125M , + .rgmii_10 =RK3366_GMAC_CLK (GMAC_CLK_DIV50_2_5M ), + .rgmii_100 =RK3366_GMAC_CLK (GMAC_CLK_DIV5_25M ), + .rgmii_1000 =RK3366_GMAC_CLK (GMAC_CLK_DIV1_125M ), .rmii_10 =RK3366_GMAC_RMII_CLK_2_5M |RK3366_GMAC_SPEED_10M , .rmii_100 =RK3366_GMAC_RMII_CLK_25M |RK3366_GMAC_SPEED_100M , };
@@ -697,9 +691,7 @@ static const struct rk_gmac_ops rk3366_ops = {#define RK3368_GMAC_SPEED_100M GRF_BIT(7)#define RK3368_GMAC_RMII_CLK_25M GRF_BIT(3)#define RK3368_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(3) -#define RK3368_GMAC_CLK_125M GRF_FIELD_CONST(5, 4, 0) -#define RK3368_GMAC_CLK_25M GRF_FIELD_CONST(5, 4, 3) -#define RK3368_GMAC_CLK_2_5M GRF_FIELD_CONST(5, 4, 2) +#define RK3368_GMAC_CLK (val) GRF_FIELD_CONST(5, 4, val)#define RK3368_GMAC_RMII_MODE GRF_BIT(6)#define RK3368_GMAC_RMII_MODE_CLR GRF_CLR_BIT(6)
@@ -731,9 +723,9 @@ static void rk3368_set_to_rmii(struct rk_priv_data *bsp_priv) }static const struct rk_reg_speed_data rk3368_reg_speed_data = { - .rgmii_10 =RK3368_GMAC_CLK_2_5M , - .rgmii_100 =RK3368_GMAC_CLK_25M , - .rgmii_1000 =RK3368_GMAC_CLK_125M , + .rgmii_10 =RK3368_GMAC_CLK (GMAC_CLK_DIV50_2_5M ), + .rgmii_100 =RK3368_GMAC_CLK (GMAC_CLK_DIV5_25M ), + .rgmii_1000 =RK3368_GMAC_CLK (GMAC_CLK_DIV1_125M ), .rmii_10 =RK3368_GMAC_RMII_CLK_2_5M |RK3368_GMAC_SPEED_10M , .rmii_100 =RK3368_GMAC_RMII_CLK_25M |RK3368_GMAC_SPEED_100M , };
@@ -762,9 +754,7 @@ static const struct rk_gmac_ops rk3368_ops = {#define RK3399_GMAC_SPEED_100M GRF_BIT(7)#define RK3399_GMAC_RMII_CLK_25M GRF_BIT(3)#define RK3399_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(3) -#define RK3399_GMAC_CLK_125M GRF_FIELD_CONST(5, 4, 0) -#define RK3399_GMAC_CLK_25M GRF_FIELD_CONST(5, 4, 3) -#define RK3399_GMAC_CLK_2_5M GRF_FIELD_CONST(5, 4, 2) +#define RK3399_GMAC_CLK (val) GRF_FIELD_CONST(5, 4, val)#define RK3399_GMAC_RMII_MODE GRF_BIT(6)#define RK3399_GMAC_RMII_MODE_CLR GRF_CLR_BIT(6)
@@ -796,9 +786,9 @@ static void rk3399_set_to_rmii(struct rk_priv_data *bsp_priv) }static const struct rk_reg_speed_data rk3399_reg_speed_data = { - .rgmii_10 =RK3399_GMAC_CLK_2_5M , - .rgmii_100 =RK3399_GMAC_CLK_25M , - .rgmii_1000 =RK3399_GMAC_CLK_125M , + .rgmii_10 =RK3399_GMAC_CLK (GMAC_CLK_DIV50_2_5M ), + .rgmii_100 =RK3399_GMAC_CLK (GMAC_CLK_DIV5_25M ), + .rgmii_1000 =RK3399_GMAC_CLK (GMAC_CLK_DIV1_125M ), .rmii_10 =RK3399_GMAC_RMII_CLK_2_5M |RK3399_GMAC_SPEED_10M , .rmii_100 =RK3399_GMAC_RMII_CLK_25M |RK3399_GMAC_SPEED_100M , };
@@ -905,9 +895,7 @@ static const struct rk_gmac_ops rk3506_ops = {#define RK3528_GMAC1_CLK_RMII_DIV2 GRF_BIT(10)#define RK3528_GMAC1_CLK_RMII_DIV20 GRF_CLR_BIT(10) -#define RK3528_GMAC1_CLK_RGMII_DIV1 GRF_FIELD_CONST(11, 10, 0) -#define RK3528_GMAC1_CLK_RGMII_DIV5 GRF_FIELD_CONST(11, 10, 3) -#define RK3528_GMAC1_CLK_RGMII_DIV50 GRF_FIELD_CONST(11, 10, 2) +#define RK3528_GMAC1_CLK_RGMII (val) GRF_FIELD_CONST(11, 10, val)#define RK3528_GMAC0_CLK_RMII_GATE GRF_BIT(2)#define RK3528_GMAC0_CLK_RMII_NOGATE GRF_CLR_BIT(2)
@@ -945,9 +933,9 @@ static const struct rk_reg_speed_data rk3528_gmac0_reg_speed_data = { };static const struct rk_reg_speed_data rk3528_gmac1_reg_speed_data = { - .rgmii_10 =RK3528_GMAC1_CLK_RGMII_DIV50 , - .rgmii_100 =RK3528_GMAC1_CLK_RGMII_DIV5 , - .rgmii_1000 =RK3528_GMAC1_CLK_RGMII_DIV1 , + .rgmii_10 =RK3528_GMAC1_CLK_RGMII (GMAC_CLK_DIV50_2_5M ), + .rgmii_100 =RK3528_GMAC1_CLK_RGMII (GMAC_CLK_DIV5_25M ), + .rgmii_1000 =RK3528_GMAC1_CLK_RGMII (GMAC_CLK_DIV1_125M ), .rmii_10 =RK3528_GMAC1_CLK_RMII_DIV20 , .rmii_100 =RK3528_GMAC1_CLK_RMII_DIV2 , };
@@ -1099,9 +1087,7 @@ static const struct rk_gmac_ops rk3568_ops = {#define RK3576_GMAC_CLK_RMII_DIV2 GRF_BIT(5)#define RK3576_GMAC_CLK_RMII_DIV20 GRF_CLR_BIT(5) -#define RK3576_GMAC_CLK_RGMII_DIV1 GRF_FIELD_CONST(6, 5, 0) -#define RK3576_GMAC_CLK_RGMII_DIV5 GRF_FIELD_CONST(6, 5, 3) -#define RK3576_GMAC_CLK_RGMII_DIV50 GRF_FIELD_CONST(6, 5, 2) +#define RK3576_GMAC_CLK_RGMII (val) GRF_FIELD_CONST(6, 5, val)#define RK3576_GMAC_CLK_RMII_GATE GRF_BIT(4)#define RK3576_GMAC_CLK_RMII_NOGATE GRF_CLR_BIT(4)
@@ -1145,9 +1131,9 @@ static void rk3576_set_to_rmii(struct rk_priv_data *bsp_priv) }static const struct rk_reg_speed_data rk3578_reg_speed_data = { - .rgmii_10 =RK3576_GMAC_CLK_RGMII_DIV50 , - .rgmii_100 =RK3576_GMAC_CLK_RGMII_DIV5 , - .rgmii_1000 =RK3576_GMAC_CLK_RGMII_DIV1 , + .rgmii_10 =RK3576_GMAC_CLK_RGMII (GMAC_CLK_DIV50_2_5M ), + .rgmii_100 =RK3576_GMAC_CLK_RGMII (GMAC_CLK_DIV5_25M ), + .rgmii_1000 =RK3576_GMAC_CLK_RGMII (GMAC_CLK_DIV1_125M ), .rmii_10 =RK3576_GMAC_CLK_RMII_DIV20 , .rmii_100 =RK3576_GMAC_CLK_RMII_DIV2 , };
@@ -1223,12 +1209,8 @@ static const struct rk_gmac_ops rk3576_ops = {#define RK3588_GMA_CLK_RMII_DIV2 (id) GRF_BIT(5 * (id) + 2)#define RK3588_GMA_CLK_RMII_DIV20 (id) GRF_CLR_BIT(5 * (id) + 2) -#define RK3588_GMAC_CLK_RGMII_DIV1 (id) \ - (GRF_FIELD_CONST(3, 2, 0) << ((id) * 5)) -#define RK3588_GMAC_CLK_RGMII_DIV5 (id) \ - (GRF_FIELD_CONST(3, 2, 3) << ((id) * 5)) -#define RK3588_GMAC_CLK_RGMII_DIV50 (id) \ - (GRF_FIELD_CONST(3, 2, 2) << ((id) * 5)) +#define RK3588_GMAC_CLK_RGMII (id, val) \ + (GRF_FIELD_CONST(3, 2, val) << ((id) * 5))#define RK3588_GMAC_CLK_RMII_GATE (id) GRF_BIT(5 * (id) + 1)#define RK3588_GMAC_CLK_RMII_NOGATE (id) GRF_CLR_BIT(5 * (id) + 1)
@@ -1275,17 +1257,17 @@ static int rk3588_set_gmac_speed(struct rk_priv_data *bsp_priv,if (interface ==PHY_INTERFACE_MODE_RMII ) val =RK3588_GMA_CLK_RMII_DIV20 (id);else - val =RK3588_GMAC_CLK_RGMII_DIV50 (id); + val =RK3588_GMAC_CLK_RGMII (id,GMAC_CLK_DIV50_2_5M );break ;case 100 :if (interface ==PHY_INTERFACE_MODE_RMII ) val =RK3588_GMA_CLK_RMII_DIV2 (id);else - val =RK3588_GMAC_CLK_RGMII_DIV5 (id); + val =RK3588_GMAC_CLK_RGMII (id,GMAC_CLK_DIV5_25M );break ;case 1000 :if (interface !=PHY_INTERFACE_MODE_RMII ) - val =RK3588_GMAC_CLK_RGMII_DIV1 (id); + val =RK3588_GMAC_CLK_RGMII (id,GMAC_CLK_DIV1_125M );else goto err;break ;
Signature · 1 line
2.47.3
PATCH v2 6/22 net: stmmac: rk: add SoC specific ->init() method
In reply to Russell King (Oracle)Add a SoC specific init method.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +9 -0
@@ -35,6 +35,7 @@ struct rk_reg_speed_data { };struct rk_gmac_ops { +int (*init)(struct rk_priv_data *bsp_priv);void (*set_to_rgmii)(struct rk_priv_data *bsp_priv,int tx_delay,int rx_delay);void (*set_to_rmii)(struct rk_priv_data *bsp_priv);
@@ -1618,6 +1619,14 @@ static struct rk_priv_data *rk_gmac_setup(struct platform_device *pdev, bsp_priv->dev = dev; +if (ops->init) { + ret = ops->init (bsp_priv); +if (ret) { +dev_err_probe (dev, ret,"failed to init BSP\n" ); +return ERR_PTR (ret); + } + } +return bsp_priv; }
Signature · 1 line
2.47.3
Re: [PATCH net-next v2 06/22] net: stmmac: rk: add SoC specific ->init() method
Quoted 3 lines · Russell King (Oracle)
Add a SoC specific init method.
Signed-off-by Russell King (Oracle) <[email protected]>
I see the AI review has identified that this patch has an issue, whereas in the previous review, it was fine with this patch. I can't imagine what it's problem with this patch is, and there's no way to find out for about 9 hours (more like 19 hours for me because of the timezone) as the AI reviews are not accessible until then. Makes me wonder whether it's worth continuing to submit patches to netdev anymore.
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
Jakub Kicinski
maintainerRe: [PATCH net-next v2 06/22] net: stmmac: rk: add SoC specific ->init() method
Quoted 8 lines · On Mon, 26 Jan 2026 14:34:17 +0000 Russell King (Oracle) wrote:
Quoted 3 lines · Russell King (Oracle)
Add a SoC specific init method.
Signed-off-by Russell King (Oracle) <[email protected]>I see the AI review has identified that this patch has an issue, whereas in the previous review, it was fine with this patch. I can't imagine what it's problem with this patch is
I released the reviews for you, the first one looks legit, I haven't scanned the rest so YMMV.
Quoted 3 lines
and there's no way to find out for about 9 hours (more like 19 hours for me because of the timezone) as the AI reviews are not accessible until then.
The patchwork checks are for maintainers. If someone wants to build a public CI for contributors that'd be great. We can even provide funds from the netdev foundation. But let us be clear that the current setup is until now maintained primarily by me for me on the weekends. Unless you make an effort to actually help I don't think it is in good taste to complain.
Quoted 2 lines
Makes me wonder whether it's worth continuing to submit patches to netdev anymore.
If you choose to continue I'd appreciate if you could follow the common guidance:
https://www.kernel.org/doc/html/next/process/maintainer-netdev.html
Re: [PATCH net-next v2 06/22] net: stmmac: rk: add SoC specific ->init() method
Quoted 17 lines · Jakub Kicinski
Quoted 8 lines · On Mon, 26 Jan 2026 14:34:17 +0000 Russell King (Oracle) wrote:
Quoted 3 lines · Russell King (Oracle)
Add a SoC specific init method.
Signed-off-by Russell King (Oracle) <[email protected]>I see the AI review has identified that this patch has an issue, whereas in the previous review, it was fine with this patch. I can't imagine what it's problem with this patch is
I released the reviews for you, the first one looks legit, I haven't scanned the rest so YMMV.
Quoted 3 lines
and there's no way to find out for about 9 hours (more like 19 hours for me because of the timezone) as the AI reviews are not accessible until then.
Quoted 6 lines
The patchwork checks are for maintainers. If someone wants to build a public CI for contributors that'd be great. We can even provide funds from the netdev foundation. But let us be clear that the current setup is until now maintained primarily by me for me on the weekends. Unless you make an effort to actually help I don't think it is in good taste to complain.
This sounds like my contributions to netdev aren't valued, and if that's the case, I will stop.
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
Jakub Kicinski
maintainerRe: [PATCH net-next v2 06/22] net: stmmac: rk: add SoC specific ->init() method
Quoted 11 lines · On Tue, 27 Jan 2026 00:59:05 +0000 Russell King (Oracle) wrote:
Quoted 10 lines
Quoted 3 lines
and there's no way to find out for about 9 hours (more like 19 hours for me because of the timezone) as the AI reviews are not accessible until then.
The patchwork checks are for maintainers. If someone wants to build a public CI for contributors that'd be great. We can even provide funds from the netdev foundation. But let us be clear that the current setup is until now maintained primarily by me for me on the weekends. Unless you make an effort to actually help I don't think it is in good taste to complain.
Quoted 2 lines
This sounds like my contributions to netdev aren't valued, and if that's the case, I will stop.
Quite the opposite, what I'm saying is that your complaints make me feel like the weekends spent on trying to make this project come out of stone age testing-wise are not appreciated. Of course your contributions are appreciated.
The AI code reviews on existing buggy code are indeed very painful. Not sure what we can do here to make the contributing easier. It costs us around $2 now to review a single patch so we can't afford public access. I think Google is working on making Gemini code reviews public and free, hopefully that materializes.
Re: [PATCH net-next v2 06/22] net: stmmac: rk: add SoC specific ->init() method
Quoted 20 lines · Jakub Kicinski
Quoted 11 lines · On Tue, 27 Jan 2026 00:59:05 +0000 Russell King (Oracle) wrote:
Quoted 10 lines
Quoted 3 lines
and there's no way to find out for about 9 hours (more like 19 hours for me because of the timezone) as the AI reviews are not accessible until then.
The patchwork checks are for maintainers. If someone wants to build a public CI for contributors that'd be great. We can even provide funds from the netdev foundation. But let us be clear that the current setup is until now maintained primarily by me for me on the weekends. Unless you make an effort to actually help I don't think it is in good taste to complain.
Quoted 2 lines
This sounds like my contributions to netdev aren't valued, and if that's the case, I will stop.
Quite the opposite, what I'm saying is that your complaints make me feel like the weekends spent on trying to make this project come out of stone age testing-wise are not appreciated. Of course your contributions are appreciated.
Quoted 5 lines
The AI code reviews on existing buggy code are indeed very painful. Not sure what we can do here to make the contributing easier. It costs us around $2 now to review a single patch so we can't afford public access. I think Google is working on making Gemini code reviews public and free, hopefully that materializes.
For a series of this size and complexity, the AI reviews are valued because it's finding real issues that I can't test for.
The big problem is that the AI only finds one issue with a patch, not all the issues. So, it's going to take multiple submissions to get to a point where the AI review of this series is clean.
I suspect the problem with "AI only finds one issue" is that the AI systems aren't advanced enough to do anything else yet.
So, do I continue fixing the AI issues each day and resubmitting a new version of this series each day this week, costing $44 each time? Do we reach a point where it gets merged even though the AI review still has issues?
These are honest questions... and if they haven't been considered, I think they need to be, because I can see this series becoming very expensive.
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
Jakub Kicinski
maintainerRe: [PATCH net-next v2 06/22] net: stmmac: rk: add SoC specific ->init() method
Quoted 19 lines · On Tue, 27 Jan 2026 01:55:29 +0000 Russell King (Oracle) wrote:
Quoted 9 lines · Jakub Kicinski
Quoted 2 lines · On Tue, 27 Jan 2026 00:59:05 +0000 Russell King (Oracle) wrote:
This sounds like my contributions to netdev aren't valued, and if that's the case, I will stop.
Quite the opposite, what I'm saying is that your complaints make me feel like the weekends spent on trying to make this project come out of stone age testing-wise are not appreciated. Of course your contributions are appreciated.
Quoted 5 lines
The AI code reviews on existing buggy code are indeed very painful. Not sure what we can do here to make the contributing easier. It costs us around $2 now to review a single patch so we can't afford public access. I think Google is working on making Gemini code reviews public and free, hopefully that materializes.
For a series of this size and complexity, the AI reviews are valued because it's finding real issues that I can't test for.
Quoted 6 lines
The big problem is that the AI only finds one issue with a patch, not all the issues. So, it's going to take multiple submissions to get to a point where the AI review of this series is clean.
I suspect the problem with "AI only finds one issue" is that the AI systems aren't advanced enough to do anything else yet.
Yes, looking at its "reasoning" output it both goes down different investigation paths each time but more importantly it runs out of tokens at some point, so it won't cover all the same paths each time.
Quoted 2 lines
So, do I continue fixing the AI issues each day and resubmitting a new version of this series each day this week, costing $44 each time?
I think so.. I don't want to change our process because of AI, but some ways to save cost rhyme with our normal recommendations. Keep the series under 15 patches. Split the series up, and extract trivial patches out so that they can be applied and not reposted.
Quoted 2 lines
Do we reach a point where it gets merged even though the AI review still has issues?
Whether the comment comes from AI is secondary, so it's just a question of whether we merge code knowing that it has issues. Rarely, I guess.
Quoted 3 lines
These are honest questions... and if they haven't been considered, I think they need to be, because I can see this series becoming very expensive.
Jakub Kicinski
maintainerRe: [net-next,v2,06/22] net: stmmac: rk: add SoC specific ->init() method
In reply to Russell King (Oracle)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: add SoC specific ->init() method
This commit adds infrastructure for SoC-specific initialization by adding an init callback to rk_gmac_ops and calling it from rk_gmac_setup().
Quoted 4 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +0
-0
[ ... ]
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c static struct rk_priv_data *rk_gmac_setup(struct platform_device *pdev, · line 1626
Quoted 9 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +5
-0@@ -1618,6 +1619,14 @@ static struct rk_priv_data *rk_gmac_setup(struct platform_device *pdev, bsp_priv->dev = dev; +if (ops->init) { + ret = ops->init (bsp_priv); +if (ret) { +dev_err_probe (dev, ret,"failed to init BSP\n" ); +return ERR_PTR (ret);
^^^^^^^^^^^^^^^
If ops->init() fails here, does bsp_priv->phy_reset need to be released?
Earlier in rk_gmac_setup(), at line 1610, the code calls:
bsp_priv->phy_reset = of_reset_control_get(plat->phy_node, NULL);
of_reset_control_get() is not a devm-managed function, so the reset control would need to be explicitly released with reset_control_put() on error paths.
This new error return happens after phy_reset could have been acquired (when the device has an integrated PHY), but before the function successfully returns. If this path is taken, it appears the reset control would be leaked.
Currently no SoC sets ops->init so this path cannot trigger, but when a future SoC implements this callback, the leak would occur on init failure for devices with integrated PHYs.
Quoted 5 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +3
-0+ } + } +return bsp_priv; }
Re: [net-next,v2,06/22] net: stmmac: rk: add SoC specific ->init() method
Quoted 37 lines · Jakub Kicinski
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: add SoC specific ->init() methodThis commit adds infrastructure for SoC-specific initialization by adding an init callback to
rk_gmac_opsand calling it fromrk_gmac_setup().Quoted 4 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +0
-0[ ... ]
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c static struct rk_priv_data *rk_gmac_setup(struct platform_device *pdev, · line 1626
Quoted 9 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +5
-0@@ -1618,6 +1619,14 @@ static struct rk_priv_data *rk_gmac_setup(struct platform_device *pdev, bsp_priv->dev = dev; +if (ops->init) { + ret = ops->init (bsp_priv); +if (ret) { +dev_err_probe (dev, ret,"failed to init BSP\n" ); +return ERR_PTR (ret);^^^^^^^^^^^^^^^If
ops->init()fails here, doesbsp_priv->phy_resetneed to be released?Earlier in
rk_gmac_setup(), at line 1610, the code calls:bsp_priv->phy_reset = of_reset_control_get(plat->phy_node, NULL);
of_reset_control_get()is not a devm-managed function, so the reset control would need to be explicitly released withreset_control_put()on error paths.
Quoted 7 lines
This new error return happens after
phy_resetcould have been acquired (when the device has an integrated PHY), but before the function successfully returns. If this path is taken, it appears the reset control would be leaked.Currently no SoC sets
ops->initso this path cannot trigger, but when a future SoC implements this callback, the leak would occur on init failure for devices with integrated PHYs.
However, the driver does not release this resource when cleaning up, so that's already a bug as the driver currently stands. I think this could be converted to devm_reset_control_get(), which would resolve both leakages, but not sure.
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
Re: [net-next,v2,06/22] net: stmmac: rk: add SoC specific ->init() method
Quoted 42 lines · Russell King (Oracle)
Quoted 41 lines · Jakub Kicinski
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: add SoC specific ->init() methodThis commit adds infrastructure for SoC-specific initialization by adding an init callback to
rk_gmac_opsand calling it fromrk_gmac_setup().Quoted 4 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +0
-0[ ... ]
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c static struct rk_priv_data *rk_gmac_setup(struct platform_device *pdev, · line 1626
Quoted 9 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +5
-0@@ -1618,6 +1619,14 @@ static struct rk_priv_data *rk_gmac_setup(struct platform_device *pdev, bsp_priv->dev = dev; +if (ops->init) { + ret = ops->init (bsp_priv); +if (ret) { +dev_err_probe (dev, ret,"failed to init BSP\n" ); +return ERR_PTR (ret);^^^^^^^^^^^^^^^If
ops->init()fails here, doesbsp_priv->phy_resetneed to be released?Earlier in
rk_gmac_setup(), at line 1610, the code calls:bsp_priv->phy_reset = of_reset_control_get(plat->phy_node, NULL);
of_reset_control_get()is not a devm-managed function, so the reset control would need to be explicitly released withreset_control_put()on error paths.This new error return happens after
phy_resetcould have been acquired (when the device has an integrated PHY), but before the function successfully returns. If this path is taken, it appears the reset control would be leaked.
Quoted 8 lines
Quoted 3 lines
Currently no SoC sets
ops->initso this path cannot trigger, but when a future SoC implements this callback, the leak would occur on init failure for devices with integrated PHYs.However, the driver does not release this resource when cleaning up, so that's already a bug as the driver currently stands. I think this could be converted to
devm_reset_control_get(), which would resolve both leakages, but not sure.
Note that fixing this is going to add yet another patch to the series, because this is a pre-existing bug in the driver. It can't be replaced with devm_reset_control_get(), because this driver is getting resources for a foreign device (we don't have the struct device pointer.)
So, it isn't going to be a simple patch to fix this.
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
Jakub Kicinski
maintainerRe: [net-next,v2,06/22] net: stmmac: rk: add SoC specific ->init() method
Quoted 22 lines · On Tue, 27 Jan 2026 11:09:58 +0000 Russell King (Oracle) wrote:
Quoted 13 lines
Quoted 13 lines
If
ops->init()fails here, doesbsp_priv->phy_resetneed to be released?Earlier in
rk_gmac_setup(), at line 1610, the code calls:bsp_priv->phy_reset = of_reset_control_get(plat->phy_node, NULL);
of_reset_control_get()is not a devm-managed function, so the reset control would need to be explicitly released withreset_control_put()on error paths.This new error return happens after
phy_resetcould have been acquired (when the device has an integrated PHY), but before the function successfully returns. If this path is taken, it appears the reset control would be leaked.Quoted 8 lines
Quoted 3 lines
Currently no SoC sets
ops->initso this path cannot trigger, but when a future SoC implements this callback, the leak would occur on init failure for devices with integrated PHYs.However, the driver does not release this resource when cleaning up, so that's already a bug as the driver currently stands. I think this could be converted to
devm_reset_control_get(), which would resolve both leakages, but not sure.
Quoted 6 lines
Note that fixing this is going to add yet another patch to the series, because this is a pre-existing bug in the driver. It can't be replaced with
devm_reset_control_get(), because this driver is getting resources for a foreign device (we don't have the struct device pointer.)So, it isn't going to be a simple patch to fix this.
Would it work to make that plus patches 1-4,6 a separate series?
Re: [net-next,v2,06/22] net: stmmac: rk: add SoC specific ->init() method
Quoted 23 lines · Jakub Kicinski
Quoted 22 lines · On Tue, 27 Jan 2026 11:09:58 +0000 Russell King (Oracle) wrote:
Quoted 21 lines
Quoted 9 lines
If
ops->init()fails here, doesbsp_priv->phy_resetneed to be released?Earlier in
rk_gmac_setup(), at line 1610, the code calls:bsp_priv->phy_reset = of_reset_control_get(plat->phy_node, NULL);
of_reset_control_get()is not a devm-managed function, so the reset control would need to be explicitly released withreset_control_put()on error paths.Quoted 7 lines
This new error return happens after
phy_resetcould have been acquired (when the device has an integrated PHY), but before the function successfully returns. If this path is taken, it appears the reset control would be leaked.Currently no SoC sets
ops->initso this path cannot trigger, but when a future SoC implements this callback, the leak would occur on init failure for devices with integrated PHYs.However, the driver does not release this resource when cleaning up, so that's already a bug as the driver currently stands. I think this could be converted to
devm_reset_control_get(), which would resolve both leakages, but not sure.
Quoted 8 lines
Quoted 6 lines
Note that fixing this is going to add yet another patch to the series, because this is a pre-existing bug in the driver. It can't be replaced with
devm_reset_control_get(), because this driver is getting resources for a foreign device (we don't have the struct device pointer.)So, it isn't going to be a simple patch to fix this.
Would it work to make that plus patches 1-4,6 a separate series?
The problem I have with that is the proximity of the merge window, and the likelyhood of conflicting changes making the _entire_ series very very very painful, because it changes all the individual SoC support.
If I'm going to have to split it up just for the sake of reducing the cost of AI review, can I ask for a moritorium on other development changes to dwmac-rk until this is merged?
As I see it, this is required _because_ of the introduction of AI review, not because something has actually changed. You have said in the past to me that the 15 patch limit is only advisory and can be exceeded where it makes sense to, and for this series, it does make sense.
Note that fixing _this_ problem has added yet another patch to the series, as fixing the underlying issue (the lack of release of bsp_priv->phy_reset on remove) is a separate issue. I've not yet decided whether that needs to be submitted via the net tree or not, which will further complicate the submission of this series if it the fix needs to go through the net tree.
Author: Russell King (Oracle) <[email protected]>
net: stmmac: rk: fix missing reset_control_put()
rk_gmac_setup() delves into the PHY's DT node to retrieve its reset control using of_reset_control_get(). However, it never releases it when the driver is removed. Add reset_control_put() to rk_gmac_exit() to clean this up.
drivers/net/ethern renamed from drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +0 -0
et/stmicro/stmmac/dwmac-rk.c
index 0e66252eb5ae..2237b09b50bb 100644
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +0 -0
@@ -1779,6 +1779,8 @@ static void rk_gmac_exit(struct device *dev, void *bsp_pri
v_)
if (priv->plat->phy_node && bsp_priv->integrated_phy)
clk_put(bsp_priv->clk_phy);+
+ reset_control_put(bsp_priv->phy_reset);
}
static int rk_gmac_probe(struct platform_device *pdev)
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
Jakub Kicinski
maintainerRe: [net-next,v2,06/22] net: stmmac: rk: add SoC specific ->init() method
Quoted 2 lines · On Tue, 27 Jan 2026 16:42:05 +0000 Russell King (Oracle) wrote:
If I'm going to have to split it up just for the sake of reducing the cost of AI review,
Incorrect, as previously stated do not worry about the cost. I was citing the cost as the reason we can't give people open access to the AI bot.
Quoted 2 lines
can I ask for a moritorium on other development changes to dwmac-rk until this is merged?
Seems reasonable, as long as you're posting and making active progress we can prioritize merging this work.
Quoted 2 lines
As I see it, this is required _because_ of the introduction of AI review, not because something has actually changed.
Can't argue with how you feel.
Quoted 3 lines
You have said in the past to me that the 15 patch limit is only advisory and can be exceeded where it makes sense to, and for this series, it does make sense.
Advisory is too weak. Unless there's a strong reason not to break up the series it should be under 15 patches.
This conversation doesn't feel very productive. Let me just apply patches 1-4 and move on :|
PATCH v2 7/22 net: stmmac: rk: convert to mask-based interface mode configuration
In reply to Russell King (Oracle)The majority of Rockchip implementations require three common pieces of information to configure the PHY interface mode:
- The grf register offset for configuring the GMAC phy_intf_sel field and the RMII mode bit.
- The bitfield in this register for the GMAC's phy_intf_sel.
- The bit position for RMII mode but clear for RGMII mode.
Introduce members for this information into struct rk_priv_data and struct rk_gmac_ops, which will be used to pre-initialise the struct rk_priv_data members. We describe the register contents using bitfields, even for those that are a single bit for consistency.
As each register comprises of two halves, where the upper half enables changing the bit state in the lower half, we can describe these bitfields using a 16-bit data type, and provide rk_encode_wm16() to generate the actual register values from the field mask and field value. We are unable to use the FIELD_PREP_WM16() macros for this as these require the field mask to be a constant.
Add code to rk_gmac_powerup() to get the phy_intf_sel value, validating that the resulting mode is either RMII or RGMII. No other modes are supported by any of the Rockchip SoCs supported by this driver.
If either of the bitfield mask values are populated in struct rk_priv_data, use these to generate the register contents, and write the resulting value to the specified GRF register.
Convert many Rockchip implementations to use this new infrastructure. For those where there is a single GMAC instance, it is merely a case of filling in the new members of struct rk_gmac_ops. For those with multiple instances, one or more of these members depends on the GMAC instance, so setup of the members in struct rk_gmac has to be done via the .init method of struct rk_gmac_ops. The corresponding code is removed from the set_to_rgmii() and set_to_rmii() implementations.
Since the member name documents the purpose of the field that is being initialised, providing preprocessor macros to define the bitfields is deemed to be less than useful given the massive size of this driver.
The existing mechanisms remain behind for those SoCs that can not be converted to this scheme.
--- .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 255 +++++++++++------- 1 file changed, 154 insertions(+), 101 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +154 -101
@@ -45,6 +45,11 @@ struct rk_gmac_ops { bool enable);void (*integrated_phy_powerup)(struct rk_priv_data *bsp_priv);void (*integrated_phy_powerdown)(struct rk_priv_data *bsp_priv); + +u16 gmac_grf_reg; +u16 gmac_phy_intf_sel_mask; +u16 gmac_rmii_mode_mask; +bool php_grf_required;bool regs_valid;u32 regs[];
@@ -90,12 +95,37 @@ struct rk_priv_data {struct regmap *grf;struct regmap *php_grf; + +u16 gmac_grf_reg; +u16 gmac_phy_intf_sel_mask; +u16 gmac_rmii_mode_mask; };#define GMAC_CLK_DIV1_125M 0#define GMAC_CLK_DIV50_2_5M 2#define GMAC_CLK_DIV5_25M 3 +static int rk_get_phy_intf_sel (phy_interface_t interface) +{ +int ret =stmmac_get_phy_intf_sel (interface); + +/* Only RGMII and RMII are supported */ +if (ret !=PHY_INTF_SEL_RGMII && ret !=PHY_INTF_SEL_RMII ) + ret = -EINVAL ; + +return ret; +} + +static u32 rk_encode_wm16 (u16 val,u16 mask) +{ +u32 reg_val = mask <<16 ; + +if (mask) + reg_val |= mask & (val << (ffs (mask) -1 )); + +return reg_val; +} + static int rk_set_reg_speed(struct rk_priv_data *bsp_priv, const struct rk_reg_speed_data *rsd, unsigned int reg, phy_interface_t interface,
@@ -241,14 +271,11 @@ static void rk_gmac_integrated_fephy_powerdown(struct rk_priv_data *priv,#define PX30_GRF_GMAC_CON1 0x0904/* PX30_GRF_GMAC_CON1 */ -#define PX30_GMAC_PHY_INTF_SEL (val) GRF_FIELD(6, 4, val)#define PX30_GMAC_SPEED_10M GRF_CLR_BIT(2)#define PX30_GMAC_SPEED_100M GRF_BIT(2)static void px30_set_to_rmii (struct rk_priv_data *bsp_priv) { -regmap_write (bsp_priv->grf,PX30_GRF_GMAC_CON1 , -PX30_GMAC_PHY_INTF_SEL (PHY_INTF_SEL_RMII )); } static int px30_set_speed(struct rk_priv_data *bsp_priv,
@@ -283,6 +310,9 @@ static int px30_set_speed(struct rk_priv_data *bsp_priv,static const struct rk_gmac_ops px30_ops = { .set_to_rmii = px30_set_to_rmii, .set_speed = px30_set_speed, + + .gmac_grf_reg =PX30_GRF_GMAC_CON1 , + .gmac_phy_intf_sel_mask =GENMASK_U16 (6 ,4 ), };#define RK3128_GRF_MAC_CON0 0x0168
@@ -297,7 +327,6 @@ static const struct rk_gmac_ops px30_ops = {#define RK3128_GMAC_CLK_TX_DL_CFG (val) GRF_FIELD(6, 0, val)/* RK3128_GRF_MAC_CON1 */ -#define RK3128_GMAC_PHY_INTF_SEL (val) GRF_FIELD(8, 6, val)#define RK3128_GMAC_FLOW_CTRL GRF_BIT(9)#define RK3128_GMAC_FLOW_CTRL_CLR GRF_CLR_BIT(9)#define RK3128_GMAC_SPEED_10M GRF_CLR_BIT(10)
@@ -305,15 +334,10 @@ static const struct rk_gmac_ops px30_ops = {#define RK3128_GMAC_RMII_CLK_25M GRF_BIT(11)#define RK3128_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(11)#define RK3128_GMAC_CLK (val) GRF_FIELD_CONST(13, 12, val) -#define RK3128_GMAC_RMII_MODE GRF_BIT(14) -#define RK3128_GMAC_RMII_MODE_CLR GRF_CLR_BIT(14)static void rk3128_set_to_rgmii (struct rk_priv_data *bsp_priv,int tx_delay,int rx_delay) { -regmap_write (bsp_priv->grf,RK3128_GRF_MAC_CON1 , -RK3128_GMAC_PHY_INTF_SEL (PHY_INTF_SEL_RGMII ) | -RK3128_GMAC_RMII_MODE_CLR ); regmap_write(bsp_priv->grf, RK3128_GRF_MAC_CON0, DELAY_ENABLE(RK3128, tx_delay, rx_delay) | RK3128_GMAC_CLK_RX_DL_CFG(rx_delay) |
@@ -322,9 +346,6 @@ static void rk3128_set_to_rgmii(struct rk_priv_data *bsp_priv,static void rk3128_set_to_rmii (struct rk_priv_data *bsp_priv) { -regmap_write (bsp_priv->grf,RK3128_GRF_MAC_CON1 , -RK3128_GMAC_PHY_INTF_SEL (PHY_INTF_SEL_RMII ) | -RK3128_GMAC_RMII_MODE ); }static const struct rk_reg_speed_data rk3128_reg_speed_data = {
@@ -346,6 +367,10 @@ static const struct rk_gmac_ops rk3128_ops = { .set_to_rgmii = rk3128_set_to_rgmii, .set_to_rmii = rk3128_set_to_rmii, .set_speed = rk3128_set_speed, + + .gmac_grf_reg = RK3128_GRF_MAC_CON1, + .gmac_phy_intf_sel_mask = GENMASK_U16(8, 6), + .gmac_rmii_mode_mask = BIT_U16(14), };#define RK3228_GRF_MAC_CON0 0x0900
@@ -358,7 +383,6 @@ static const struct rk_gmac_ops rk3128_ops = {#define RK3228_GMAC_CLK_TX_DL_CFG (val) GRF_FIELD(6, 0, val)/* RK3228_GRF_MAC_CON1 */ -#define RK3228_GMAC_PHY_INTF_SEL (val) GRF_FIELD(6, 4, val)#define RK3228_GMAC_FLOW_CTRL GRF_BIT(3)#define RK3228_GMAC_FLOW_CTRL_CLR GRF_CLR_BIT(3)#define RK3228_GMAC_SPEED_10M GRF_CLR_BIT(2)
@@ -366,8 +390,6 @@ static const struct rk_gmac_ops rk3128_ops = {#define RK3228_GMAC_RMII_CLK_25M GRF_BIT(7)#define RK3228_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(7)#define RK3228_GMAC_CLK (val) GRF_FIELD_CONST(9, 8, val) -#define RK3228_GMAC_RMII_MODE GRF_BIT(10) -#define RK3228_GMAC_RMII_MODE_CLR GRF_CLR_BIT(10)#define RK3228_GMAC_TXCLK_DLY_ENABLE GRF_BIT(0)#define RK3228_GMAC_TXCLK_DLY_DISABLE GRF_CLR_BIT(0)#define RK3228_GMAC_RXCLK_DLY_ENABLE GRF_BIT(1)
@@ -380,8 +402,6 @@ static void rk3228_set_to_rgmii(struct rk_priv_data *bsp_priv, int tx_delay, int rx_delay) {regmap_write (bsp_priv->grf,RK3228_GRF_MAC_CON1 , -RK3228_GMAC_PHY_INTF_SEL (PHY_INTF_SEL_RGMII ) | -RK3228_GMAC_RMII_MODE_CLR |DELAY_ENABLE (RK3228 , tx_delay, rx_delay)); regmap_write(bsp_priv->grf, RK3228_GRF_MAC_CON0,
@@ -391,10 +411,6 @@ static void rk3228_set_to_rgmii(struct rk_priv_data *bsp_priv,static void rk3228_set_to_rmii (struct rk_priv_data *bsp_priv) { -regmap_write (bsp_priv->grf,RK3228_GRF_MAC_CON1 , -RK3228_GMAC_PHY_INTF_SEL (PHY_INTF_SEL_RMII ) | -RK3228_GMAC_RMII_MODE ); -/* set MAC to RMII mode */ regmap_write (bsp_priv->grf,RK3228_GRF_MAC_CON1 ,GRF_BIT (11 )); }
@@ -428,13 +444,17 @@ static const struct rk_gmac_ops rk3228_ops = { .set_speed = rk3228_set_speed, .integrated_phy_powerup = rk3228_integrated_phy_powerup, .integrated_phy_powerdown = rk_gmac_integrated_ephy_powerdown, + + .gmac_grf_reg = RK3228_GRF_MAC_CON1, + .gmac_phy_intf_sel_mask = GENMASK_U16(6, 4), + .gmac_rmii_mode_mask = BIT_U16(10), + };#define RK3288_GRF_SOC_CON1 0x0248#define RK3288_GRF_SOC_CON3 0x0250/*RK3288_GRF_SOC_CON1*/ -#define RK3288_GMAC_PHY_INTF_SEL (val) GRF_FIELD(8, 6, val)#define RK3288_GMAC_FLOW_CTRL GRF_BIT(9)#define RK3288_GMAC_FLOW_CTRL_CLR GRF_CLR_BIT(9)#define RK3288_GMAC_SPEED_10M GRF_CLR_BIT(10)
@@ -442,8 +462,6 @@ static const struct rk_gmac_ops rk3228_ops = {#define RK3288_GMAC_RMII_CLK_25M GRF_BIT(11)#define RK3288_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(11)#define RK3288_GMAC_CLK (val) GRF_FIELD_CONST(13, 12, val) -#define RK3288_GMAC_RMII_MODE GRF_BIT(14) -#define RK3288_GMAC_RMII_MODE_CLR GRF_CLR_BIT(14)/*RK3288_GRF_SOC_CON3*/ #define RK3288_GMAC_TXCLK_DLY_ENABLE GRF_BIT(14)
@@ -456,9 +474,6 @@ static const struct rk_gmac_ops rk3228_ops = {static void rk3288_set_to_rgmii (struct rk_priv_data *bsp_priv,int tx_delay,int rx_delay) { -regmap_write (bsp_priv->grf,RK3288_GRF_SOC_CON1 , -RK3288_GMAC_PHY_INTF_SEL (PHY_INTF_SEL_RGMII ) | -RK3288_GMAC_RMII_MODE_CLR ); regmap_write(bsp_priv->grf, RK3288_GRF_SOC_CON3, DELAY_ENABLE(RK3288, tx_delay, rx_delay) | RK3288_GMAC_CLK_RX_DL_CFG(rx_delay) |
@@ -467,9 +482,6 @@ static void rk3288_set_to_rgmii(struct rk_priv_data *bsp_priv,static void rk3288_set_to_rmii (struct rk_priv_data *bsp_priv) { -regmap_write (bsp_priv->grf,RK3288_GRF_SOC_CON1 , -RK3288_GMAC_PHY_INTF_SEL (PHY_INTF_SEL_RMII ) | -RK3288_GMAC_RMII_MODE ); }static const struct rk_reg_speed_data rk3288_reg_speed_data = {
@@ -491,12 +503,15 @@ static const struct rk_gmac_ops rk3288_ops = { .set_to_rgmii = rk3288_set_to_rgmii, .set_to_rmii = rk3288_set_to_rmii, .set_speed = rk3288_set_speed, + + .gmac_grf_reg = RK3288_GRF_SOC_CON1, + .gmac_phy_intf_sel_mask = GENMASK_U16(8, 6), + .gmac_rmii_mode_mask = BIT_U16(14), };#define RK3308_GRF_MAC_CON0 0x04a0/* RK3308_GRF_MAC_CON0 */ -#define RK3308_GMAC_PHY_INTF_SEL (val) GRF_FIELD(4, 2, val)#define RK3308_GMAC_FLOW_CTRL GRF_BIT(3)#define RK3308_GMAC_FLOW_CTRL_CLR GRF_CLR_BIT(3)#define RK3308_GMAC_SPEED_10M GRF_CLR_BIT(0)
@@ -504,8 +519,6 @@ static const struct rk_gmac_ops rk3288_ops = {static void rk3308_set_to_rmii (struct rk_priv_data *bsp_priv) { -regmap_write (bsp_priv->grf,RK3308_GRF_MAC_CON0 , -RK3308_GMAC_PHY_INTF_SEL (PHY_INTF_SEL_RMII )); }static const struct rk_reg_speed_data rk3308_reg_speed_data = {
@@ -523,6 +536,9 @@ static int rk3308_set_speed(struct rk_priv_data *bsp_priv,static const struct rk_gmac_ops rk3308_ops = { .set_to_rmii = rk3308_set_to_rmii, .set_speed = rk3308_set_speed, + + .gmac_grf_reg =RK3308_GRF_MAC_CON0 , + .gmac_phy_intf_sel_mask =GENMASK_U16 (4 ,2 ), };#define RK3328_GRF_MAC_CON0 0x0900
@@ -535,7 +551,6 @@ static const struct rk_gmac_ops rk3308_ops = {#define RK3328_GMAC_CLK_TX_DL_CFG (val) GRF_FIELD(6, 0, val)/* RK3328_GRF_MAC_CON1 */ -#define RK3328_GMAC_PHY_INTF_SEL (val) GRF_FIELD(6, 4, val)#define RK3328_GMAC_FLOW_CTRL GRF_BIT(3)#define RK3328_GMAC_FLOW_CTRL_CLR GRF_CLR_BIT(3)#define RK3328_GMAC_SPEED_10M GRF_CLR_BIT(2)
@@ -543,20 +558,32 @@ static const struct rk_gmac_ops rk3308_ops = {#define RK3328_GMAC_RMII_CLK_25M GRF_BIT(7)#define RK3328_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(7)#define RK3328_GMAC_CLK (val) GRF_FIELD_CONST(12, 11, val) -#define RK3328_GMAC_RMII_MODE GRF_BIT(9) -#define RK3328_GMAC_RMII_MODE_CLR GRF_CLR_BIT(9)#define RK3328_GMAC_TXCLK_DLY_ENABLE GRF_BIT(0)#define RK3328_GMAC_RXCLK_DLY_ENABLE GRF_BIT(1)/* RK3328_GRF_MACPHY_CON1 */ #define RK3328_MACPHY_RMII_MODE GRF_BIT(9) +static int rk3328_init (struct rk_priv_data *bsp_priv) +{ +switch (bsp_priv->id) { +case 0 :/* gmac2io */ + bsp_priv->gmac_grf_reg =RK3328_GRF_MAC_CON1 ; +return 0 ; + +case 1 :/* gmac2phy */ + bsp_priv->gmac_grf_reg =RK3328_GRF_MAC_CON2 ; +return 0 ; + +default : +return -EINVAL ; + } +} +static void rk3328_set_to_rgmii (struct rk_priv_data *bsp_priv,int tx_delay,int rx_delay) {regmap_write (bsp_priv->grf,RK3328_GRF_MAC_CON1 , -RK3328_GMAC_PHY_INTF_SEL (PHY_INTF_SEL_RGMII ) | -RK3328_GMAC_RMII_MODE_CLR |RK3328_GMAC_RXCLK_DLY_ENABLE |RK3328_GMAC_TXCLK_DLY_ENABLE );
@@ -567,13 +594,6 @@ static void rk3328_set_to_rgmii(struct rk_priv_data *bsp_priv,static void rk3328_set_to_rmii (struct rk_priv_data *bsp_priv) { -unsigned int reg; - - reg = bsp_priv->id ?RK3328_GRF_MAC_CON2 :RK3328_GRF_MAC_CON1 ; - -regmap_write (bsp_priv->grf, reg, -RK3328_GMAC_PHY_INTF_SEL (PHY_INTF_SEL_RMII ) | -RK3328_GMAC_RMII_MODE ); }static const struct rk_reg_speed_data rk3328_reg_speed_data = {
@@ -604,12 +624,16 @@ static void rk3328_integrated_phy_powerup(struct rk_priv_data *priv) }static const struct rk_gmac_ops rk3328_ops = { + .init = rk3328_init, .set_to_rgmii = rk3328_set_to_rgmii, .set_to_rmii = rk3328_set_to_rmii, .set_speed = rk3328_set_speed, .integrated_phy_powerup = rk3328_integrated_phy_powerup, .integrated_phy_powerdown = rk_gmac_integrated_ephy_powerdown, + .gmac_phy_intf_sel_mask =GENMASK_U16 (6 ,4 ), + .gmac_rmii_mode_mask =BIT_U16 (9 ), + .regs_valid = true, .regs = {0xff540000 ,/* gmac2io */
@@ -622,7 +646,6 @@ static const struct rk_gmac_ops rk3328_ops = {#define RK3366_GRF_SOC_CON7 0x041c/* RK3366_GRF_SOC_CON6 */ -#define RK3366_GMAC_PHY_INTF_SEL (val) GRF_FIELD(11, 9, val)#define RK3366_GMAC_FLOW_CTRL GRF_BIT(8)#define RK3366_GMAC_FLOW_CTRL_CLR GRF_CLR_BIT(8)#define RK3366_GMAC_SPEED_10M GRF_CLR_BIT(7)
@@ -630,8 +653,6 @@ static const struct rk_gmac_ops rk3328_ops = {#define RK3366_GMAC_RMII_CLK_25M GRF_BIT(3)#define RK3366_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(3)#define RK3366_GMAC_CLK (val) GRF_FIELD_CONST(5, 4, val) -#define RK3366_GMAC_RMII_MODE GRF_BIT(6) -#define RK3366_GMAC_RMII_MODE_CLR GRF_CLR_BIT(6)/* RK3366_GRF_SOC_CON7 */ #define RK3366_GMAC_TXCLK_DLY_ENABLE GRF_BIT(7)
@@ -644,9 +665,6 @@ static const struct rk_gmac_ops rk3328_ops = {static void rk3366_set_to_rgmii (struct rk_priv_data *bsp_priv,int tx_delay,int rx_delay) { -regmap_write (bsp_priv->grf,RK3366_GRF_SOC_CON6 , -RK3366_GMAC_PHY_INTF_SEL (PHY_INTF_SEL_RGMII ) | -RK3366_GMAC_RMII_MODE_CLR ); regmap_write(bsp_priv->grf, RK3366_GRF_SOC_CON7, DELAY_ENABLE(RK3366, tx_delay, rx_delay) | RK3366_GMAC_CLK_RX_DL_CFG(rx_delay) |
@@ -655,9 +673,6 @@ static void rk3366_set_to_rgmii(struct rk_priv_data *bsp_priv,static void rk3366_set_to_rmii (struct rk_priv_data *bsp_priv) { -regmap_write (bsp_priv->grf,RK3366_GRF_SOC_CON6 , -RK3366_GMAC_PHY_INTF_SEL (PHY_INTF_SEL_RMII ) | -RK3366_GMAC_RMII_MODE ); }static const struct rk_reg_speed_data rk3366_reg_speed_data = {
@@ -679,13 +694,16 @@ static const struct rk_gmac_ops rk3366_ops = { .set_to_rgmii = rk3366_set_to_rgmii, .set_to_rmii = rk3366_set_to_rmii, .set_speed = rk3366_set_speed, + + .gmac_grf_reg = RK3366_GRF_SOC_CON6, + .gmac_phy_intf_sel_mask = GENMASK_U16(11, 9), + .gmac_rmii_mode_mask = BIT_U16(6), };#define RK3368_GRF_SOC_CON15 0x043c#define RK3368_GRF_SOC_CON16 0x0440/* RK3368_GRF_SOC_CON15 */ -#define RK3368_GMAC_PHY_INTF_SEL (val) GRF_FIELD(11, 9, val)#define RK3368_GMAC_FLOW_CTRL GRF_BIT(8)#define RK3368_GMAC_FLOW_CTRL_CLR GRF_CLR_BIT(8)#define RK3368_GMAC_SPEED_10M GRF_CLR_BIT(7)
@@ -693,8 +711,6 @@ static const struct rk_gmac_ops rk3366_ops = {#define RK3368_GMAC_RMII_CLK_25M GRF_BIT(3)#define RK3368_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(3)#define RK3368_GMAC_CLK (val) GRF_FIELD_CONST(5, 4, val) -#define RK3368_GMAC_RMII_MODE GRF_BIT(6) -#define RK3368_GMAC_RMII_MODE_CLR GRF_CLR_BIT(6)/* RK3368_GRF_SOC_CON16 */ #define RK3368_GMAC_TXCLK_DLY_ENABLE GRF_BIT(7)
@@ -707,9 +723,6 @@ static const struct rk_gmac_ops rk3366_ops = {static void rk3368_set_to_rgmii (struct rk_priv_data *bsp_priv,int tx_delay,int rx_delay) { -regmap_write (bsp_priv->grf,RK3368_GRF_SOC_CON15 , -RK3368_GMAC_PHY_INTF_SEL (PHY_INTF_SEL_RGMII ) | -RK3368_GMAC_RMII_MODE_CLR ); regmap_write(bsp_priv->grf, RK3368_GRF_SOC_CON16, DELAY_ENABLE(RK3368, tx_delay, rx_delay) | RK3368_GMAC_CLK_RX_DL_CFG(rx_delay) |
@@ -718,9 +731,6 @@ static void rk3368_set_to_rgmii(struct rk_priv_data *bsp_priv,static void rk3368_set_to_rmii (struct rk_priv_data *bsp_priv) { -regmap_write (bsp_priv->grf,RK3368_GRF_SOC_CON15 , -RK3368_GMAC_PHY_INTF_SEL (PHY_INTF_SEL_RMII ) | -RK3368_GMAC_RMII_MODE ); }static const struct rk_reg_speed_data rk3368_reg_speed_data = {
@@ -742,13 +752,16 @@ static const struct rk_gmac_ops rk3368_ops = { .set_to_rgmii = rk3368_set_to_rgmii, .set_to_rmii = rk3368_set_to_rmii, .set_speed = rk3368_set_speed, + + .gmac_grf_reg = RK3368_GRF_SOC_CON15, + .gmac_phy_intf_sel_mask = GENMASK_U16(11, 9), + .gmac_rmii_mode_mask = BIT_U16(6), };#define RK3399_GRF_SOC_CON5 0xc214#define RK3399_GRF_SOC_CON6 0xc218/* RK3399_GRF_SOC_CON5 */ -#define RK3399_GMAC_PHY_INTF_SEL (val) GRF_FIELD(11, 9, val)#define RK3399_GMAC_FLOW_CTRL GRF_BIT(8)#define RK3399_GMAC_FLOW_CTRL_CLR GRF_CLR_BIT(8)#define RK3399_GMAC_SPEED_10M GRF_CLR_BIT(7)
@@ -756,8 +769,6 @@ static const struct rk_gmac_ops rk3368_ops = {#define RK3399_GMAC_RMII_CLK_25M GRF_BIT(3)#define RK3399_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(3)#define RK3399_GMAC_CLK (val) GRF_FIELD_CONST(5, 4, val) -#define RK3399_GMAC_RMII_MODE GRF_BIT(6) -#define RK3399_GMAC_RMII_MODE_CLR GRF_CLR_BIT(6)/* RK3399_GRF_SOC_CON6 */ #define RK3399_GMAC_TXCLK_DLY_ENABLE GRF_BIT(7)
@@ -770,9 +781,6 @@ static const struct rk_gmac_ops rk3368_ops = {static void rk3399_set_to_rgmii (struct rk_priv_data *bsp_priv,int tx_delay,int rx_delay) { -regmap_write (bsp_priv->grf,RK3399_GRF_SOC_CON5 , -RK3399_GMAC_PHY_INTF_SEL (PHY_INTF_SEL_RGMII ) | -RK3399_GMAC_RMII_MODE_CLR ); regmap_write(bsp_priv->grf, RK3399_GRF_SOC_CON6, DELAY_ENABLE(RK3399, tx_delay, rx_delay) | RK3399_GMAC_CLK_RX_DL_CFG(rx_delay) |
@@ -781,9 +789,6 @@ static void rk3399_set_to_rgmii(struct rk_priv_data *bsp_priv,static void rk3399_set_to_rmii (struct rk_priv_data *bsp_priv) { -regmap_write (bsp_priv->grf,RK3399_GRF_SOC_CON5 , -RK3399_GMAC_PHY_INTF_SEL (PHY_INTF_SEL_RMII ) | -RK3399_GMAC_RMII_MODE ); }static const struct rk_reg_speed_data rk3399_reg_speed_data = {
@@ -805,6 +810,10 @@ static const struct rk_gmac_ops rk3399_ops = { .set_to_rgmii = rk3399_set_to_rgmii, .set_to_rmii = rk3399_set_to_rmii, .set_speed = rk3399_set_speed, + + .gmac_grf_reg = RK3399_GRF_SOC_CON5, + .gmac_phy_intf_sel_mask = GENMASK_U16(11, 9), + .gmac_rmii_mode_mask = BIT_U16(6), };#define RK3506_GRF_SOC_CON8 0x0020
@@ -1007,7 +1016,6 @@ static const struct rk_gmac_ops rk3528_ops = {#define RK3568_GRF_GMAC1_CON1 0x038c/* RK3568_GRF_GMAC0_CON1 && RK3568_GRF_GMAC1_CON1 */ -#define RK3568_GMAC_PHY_INTF_SEL (val) GRF_FIELD(6, 4, val)#define RK3568_GMAC_FLOW_CTRL GRF_BIT(3)#define RK3568_GMAC_FLOW_CTRL_CLR GRF_CLR_BIT(3)#define RK3568_GMAC_RXCLK_DLY_ENABLE GRF_BIT(1)
@@ -1019,6 +1027,22 @@ static const struct rk_gmac_ops rk3528_ops = {#define RK3568_GMAC_CLK_RX_DL_CFG (val) GRF_FIELD(14, 8, val)#define RK3568_GMAC_CLK_TX_DL_CFG (val) GRF_FIELD(6, 0, val) +static int rk3568_init (struct rk_priv_data *bsp_priv) +{ +switch (bsp_priv->id) { +case 0 : + bsp_priv->gmac_grf_reg =RK3568_GRF_GMAC0_CON1 ; +return 0 ; + +case 1 : + bsp_priv->gmac_grf_reg =RK3568_GRF_GMAC1_CON1 ; +return 0 ; + +default : +return -EINVAL ; + } +} +static void rk3568_set_to_rgmii (struct rk_priv_data *bsp_priv,int tx_delay,int rx_delay) {
@@ -1034,25 +1058,22 @@ static void rk3568_set_to_rgmii(struct rk_priv_data *bsp_priv, RK3568_GMAC_CLK_TX_DL_CFG(tx_delay));regmap_write (bsp_priv->grf, con1, -RK3568_GMAC_PHY_INTF_SEL (PHY_INTF_SEL_RGMII ) |RK3568_GMAC_RXCLK_DLY_ENABLE |RK3568_GMAC_TXCLK_DLY_ENABLE ); }static void rk3568_set_to_rmii (struct rk_priv_data *bsp_priv) { -u32 con1; - - con1 = (bsp_priv->id ==1 ) ?RK3568_GRF_GMAC1_CON1 : -RK3568_GRF_GMAC0_CON1 ; -regmap_write (bsp_priv->grf, con1, -RK3568_GMAC_PHY_INTF_SEL (PHY_INTF_SEL_RMII )); }static const struct rk_gmac_ops rk3568_ops = { + .init = rk3568_init, .set_to_rgmii = rk3568_set_to_rgmii, .set_to_rmii = rk3568_set_to_rmii, .set_speed = rk_set_clk_mac_speed, + + .gmac_phy_intf_sel_mask =GENMASK_U16 (6 ,4 ), + .regs_valid = true, .regs = {0xfe2a0000 ,/* gmac0 */
@@ -1079,9 +1100,6 @@ static const struct rk_gmac_ops rk3568_ops = {#define RK3576_GRF_GMAC_CON0 0X0020#define RK3576_GRF_GMAC_CON1 0X0024 -#define RK3576_GMAC_RMII_MODE GRF_BIT(3) -#define RK3576_GMAC_RGMII_MODE GRF_CLR_BIT(3) -#define RK3576_GMAC_CLK_SELECT_IO GRF_BIT(7)#define RK3576_GMAC_CLK_SELECT_CRU GRF_CLR_BIT(7)
@@ -1093,16 +1111,27 @@ static const struct rk_gmac_ops rk3568_ops = {#define RK3576_GMAC_CLK_RMII_GATE GRF_BIT(4)#define RK3576_GMAC_CLK_RMII_NOGATE GRF_CLR_BIT(4) +static int rk3576_init (struct rk_priv_data *bsp_priv) +{ +switch (bsp_priv->id) { +case 0 : + bsp_priv->gmac_grf_reg =RK3576_GRF_GMAC_CON0 ; +return 0 ; + +case 1 : + bsp_priv->gmac_grf_reg =RK3576_GRF_GMAC_CON1 ; +return 0 ; + +default : +return -EINVAL ; + } +} +static void rk3576_set_to_rgmii (struct rk_priv_data *bsp_priv,int tx_delay,int rx_delay) {unsigned int offset_con; - offset_con = bsp_priv->id ==1 ?RK3576_GRF_GMAC_CON1 : -RK3576_GRF_GMAC_CON0 ; - -regmap_write (bsp_priv->grf, offset_con,RK3576_GMAC_RGMII_MODE ); - offset_con = bsp_priv->id ==1 ?RK3576_VCCIO0_1_3_IOC_CON4 :RK3576_VCCIO0_1_3_IOC_CON2 ;
@@ -1123,12 +1152,6 @@ static void rk3576_set_to_rgmii(struct rk_priv_data *bsp_priv,static void rk3576_set_to_rmii (struct rk_priv_data *bsp_priv) { -unsigned int offset_con; - - offset_con = bsp_priv->id ==1 ?RK3576_GRF_GMAC_CON1 : -RK3576_GRF_GMAC_CON0 ; - -regmap_write (bsp_priv->grf, offset_con,RK3576_GMAC_RMII_MODE ); }static const struct rk_reg_speed_data rk3578_reg_speed_data = {
@@ -1168,10 +1191,14 @@ static void rk3576_set_clock_selection(struct rk_priv_data *bsp_priv, bool input }static const struct rk_gmac_ops rk3576_ops = { + .init = rk3576_init, .set_to_rgmii = rk3576_set_to_rgmii, .set_to_rmii = rk3576_set_to_rmii, .set_speed = rk3576_set_gmac_speed, .set_clock_selection = rk3576_set_clock_selection, + + .gmac_rmii_mode_mask =BIT_U16 (3 ), + .php_grf_required = true, .regs_valid = true, .regs = {
@@ -1312,7 +1339,6 @@ static const struct rk_gmac_ops rk3588_ops = {#define RV1108_GRF_GMAC_CON0 0X0900/* RV1108_GRF_GMAC_CON0 */ -#define RV1108_GMAC_PHY_INTF_SEL (val) GRF_FIELD(6, 4, val)#define RV1108_GMAC_FLOW_CTRL GRF_BIT(3)#define RV1108_GMAC_FLOW_CTRL_CLR GRF_CLR_BIT(3)#define RV1108_GMAC_SPEED_10M GRF_CLR_BIT(2)
@@ -1322,8 +1348,6 @@ static const struct rk_gmac_ops rk3588_ops = {static void rv1108_set_to_rmii (struct rk_priv_data *bsp_priv) { -regmap_write (bsp_priv->grf,RV1108_GRF_GMAC_CON0 , -RV1108_GMAC_PHY_INTF_SEL (PHY_INTF_SEL_RMII )); }static const struct rk_reg_speed_data rv1108_reg_speed_data = {
@@ -1341,6 +1365,9 @@ static int rv1108_set_speed(struct rk_priv_data *bsp_priv,static const struct rk_gmac_ops rv1108_ops = { .set_to_rmii = rv1108_set_to_rmii, .set_speed = rv1108_set_speed, + + .gmac_grf_reg =RV1108_GRF_GMAC_CON0 , + .gmac_phy_intf_sel_mask =GENMASK_U16 (6 ,4 ), };#define RV1126_GRF_GMAC_CON0 0X0070
@@ -1348,7 +1375,6 @@ static const struct rk_gmac_ops rv1108_ops = {#define RV1126_GRF_GMAC_CON2 0X0078/* RV1126_GRF_GMAC_CON0 */ -#define RV1126_GMAC_PHY_INTF_SEL (val) GRF_FIELD(6, 4, val)#define RV1126_GMAC_FLOW_CTRL GRF_BIT(7)#define RV1126_GMAC_FLOW_CTRL_CLR GRF_CLR_BIT(7)#define RV1126_GMAC_M0_RXCLK_DLY_ENABLE GRF_BIT(1)
@@ -1371,7 +1397,6 @@ static void rv1126_set_to_rgmii(struct rk_priv_data *bsp_priv, int tx_delay, int rx_delay) { regmap_write(bsp_priv->grf, RV1126_GRF_GMAC_CON0, - RV1126_GMAC_PHY_INTF_SEL(PHY_INTF_SEL_RGMII) | RV1126_GMAC_M0_RXCLK_DLY_ENABLE | RV1126_GMAC_M0_TXCLK_DLY_ENABLE | RV1126_GMAC_M1_RXCLK_DLY_ENABLE |
@@ -1388,14 +1413,15 @@ static void rv1126_set_to_rgmii(struct rk_priv_data *bsp_priv,static void rv1126_set_to_rmii (struct rk_priv_data *bsp_priv) { -regmap_write (bsp_priv->grf,RV1126_GRF_GMAC_CON0 , -RV1126_GMAC_PHY_INTF_SEL (PHY_INTF_SEL_RMII )); }static const struct rk_gmac_ops rv1126_ops = { .set_to_rgmii = rv1126_set_to_rgmii, .set_to_rmii = rv1126_set_to_rmii, .set_speed = rk_set_clk_mac_speed, + + .gmac_grf_reg =RV1126_GRF_GMAC_CON0 , + .gmac_phy_intf_sel_mask =GENMASK_U16 (6 ,4 ), };static int rk_gmac_clk_init (struct plat_stmmacenet_data *plat)
@@ -1619,6 +1645,11 @@ static struct rk_priv_data *rk_gmac_setup(struct platform_device *pdev, bsp_priv->dev = dev; +/* Set the default phy_intf_sel and RMII mode register parameters. */ + bsp_priv->gmac_grf_reg = ops->gmac_grf_reg; + bsp_priv->gmac_phy_intf_sel_mask = ops->gmac_phy_intf_sel_mask; + bsp_priv->gmac_rmii_mode_mask = ops->gmac_rmii_mode_mask; +if (ops->init) { ret = ops->init (bsp_priv);if (ret) {
@@ -1654,7 +1685,9 @@ static int rk_gmac_check_ops(struct rk_priv_data *bsp_priv)static int rk_gmac_powerup (struct rk_priv_data *bsp_priv) {struct device *dev = bsp_priv->dev; +u32 val;int ret; +u8 intf; ret =rk_gmac_check_ops (bsp_priv);if (ret)
@@ -1664,6 +1697,26 @@ 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; + + intf = 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 (intf, bsp_priv->gmac_phy_intf_sel_mask); + +/* If defined, encode the RMII mode mask setting. */ + val |=rk_encode_wm16 (intf ==PHY_INTF_SEL_RMII , + bsp_priv->gmac_rmii_mode_mask); + + ret =regmap_write (bsp_priv->grf, bsp_priv->gmac_grf_reg, val); +if (ret <0 ) +return ret; + } +/*rmii or rgmii*/ switch (bsp_priv->phy_iface) {case PHY_INTERFACE_MODE_RGMII :
Signature · 1 line
2.47.3
Jakub Kicinski
maintainerRe: [net-next,v2,07/22] net: stmmac: rk: convert to mask-based interface mode configuration
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 commit consolidates PHY interface mode configuration into common infrastructure by introducing mask fields for phy_intf_sel and rmii_mode, moving the register writes from SoC-specific functions into the common rk_gmac_powerup() function.
Quoted 2 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +0
-0
[ ... ]
Quoted 11 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +2
-0@@ -1654,7 +1685,9 @@ static int rk_gmac_check_ops(struct rk_priv_data *bsp_priv)static int rk_gmac_powerup (struct rk_priv_data *bsp_priv) {struct device *dev = bsp_priv->dev; +u32 val;int ret; +u8 intf; ret =rk_gmac_check_ops (bsp_priv);if (ret)
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c static int rk_gmac_powerup(struct rk_priv_data *bsp_priv) · line 1702
Quoted 6 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +3
-0@@ -1664,6 +1697,26 @@ 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;
Should this error path call gmac_clk_enable(bsp_priv, false) before returning? The clocks were enabled just above, and the existing error handling for rk_phy_powerup() later in this function disables the clocks on failure:
ret = rk_phy_powerup(bsp_priv);
if (ret) {
gmac_clk_enable(bsp_priv, false);
return ret;
}Quoted 5 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +5
-0+ + intf = ret; + +if (bsp_priv->gmac_phy_intf_sel_mask || + bsp_priv->gmac_rmii_mode_mask) {
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c static int rk_gmac_powerup(struct rk_priv_data *bsp_priv) · line 1717
Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +10
-0+/* If defined, encode the phy_intf_sel value */ + val =rk_encode_wm16 (intf, bsp_priv->gmac_phy_intf_sel_mask); + +/* If defined, encode the RMII mode mask setting. */ + val |=rk_encode_wm16 (intf ==PHY_INTF_SEL_RMII , + bsp_priv->gmac_rmii_mode_mask); + + ret =regmap_write (bsp_priv->grf, bsp_priv->gmac_grf_reg, val); +if (ret <0 ) +return ret;
Same question here - should this also disable clocks before returning?
Quoted 1 line
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +1
-0+ }
Re: [net-next,v2,07/22] net: stmmac: rk: convert to mask-based interface mode configuration
Quoted 40 lines · Jakub Kicinski
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 configurationThis commit consolidates PHY interface mode configuration into common infrastructure by introducing mask fields for
phy_intf_selandrmii_mode, moving the register writes from SoC-specific functions into the commonrk_gmac_powerup()function.Quoted 2 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +0
-0[ ... ]
Quoted 11 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +2
-0@@ -1654,7 +1685,9 @@ static int rk_gmac_check_ops(struct rk_priv_data *bsp_priv)static int rk_gmac_powerup (struct rk_priv_data *bsp_priv) {struct device *dev = bsp_priv->dev; +u32 val;int ret; +u8 intf; ret =rk_gmac_check_ops (bsp_priv);if (ret)drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c static int rk_gmac_powerup(struct rk_priv_data *bsp_priv) · line 1702
Quoted 6 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +3
-0@@ -1664,6 +1697,26 @@ 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;Should this error path call
gmac_clk_enable(bsp_priv, false)before returning? The clocks were enabled just above, and the existing error handling forrk_phy_powerup()later in this function disables the clocks on failure:
Quoted 5 lines
ret = rk_phy_powerup(bsp_priv);
if (ret) {
gmac_clk_enable(bsp_priv, false);
return ret;
}This piecemeal review by AI is like death by a thousand cuts. Can we please either stop using it, or find some way to have _all_ the problems discovered at once.
I fix one problem in this patch, and the bloody AI reports another. And with the 10 sodding hour turn-around time, this is beyond a joke.
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
PATCH v2 8/22 net: stmmac: rk: convert rk3588 to mask-based interface mode config
In reply to Russell King (Oracle)rk3588 has a quirk compared to the other Rockchip implementations in that the interface mode configuration register is in the php_grf regmap rather than the grf regmap. Add a flag to indicate this, and a separate function to write to the appropriate regmap. This allows rk3588 to be converted.
--- .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 45 ++++++++++++++----- 1 file changed, 35 insertions(+), 10 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +35 -10
@@ -50,6 +50,7 @@ struct rk_gmac_ops {u16 gmac_phy_intf_sel_mask;u16 gmac_rmii_mode_mask; +bool gmac_grf_reg_in_php;bool php_grf_required;bool regs_valid;u32 regs[];
@@ -126,6 +127,18 @@ static u32 rk_encode_wm16(u16 val, u16 mask)return reg_val; } +static int rk_write_gmac_grf_reg (struct rk_priv_data *bsp_priv,u32 val) +{ +struct regmap *regmap; + +if (bsp_priv->ops->gmac_grf_reg_in_php) + regmap = bsp_priv->php_grf; +else + regmap = bsp_priv->grf; + +return regmap_write (bsp_priv->grf, bsp_priv->gmac_grf_reg, val); +} + static int rk_set_reg_speed(struct rk_priv_data *bsp_priv, const struct rk_reg_speed_data *rsd, unsigned int reg, phy_interface_t interface,
@@ -1225,9 +1238,6 @@ static const struct rk_gmac_ops rk3576_ops = {#define RK3588_GRF_GMAC_CON0 0X0008#define RK3588_GRF_CLK_CON1 0X0070 -#define RK3588_GMAC_PHY_INTF_SEL (id, val) \ - (GRF_FIELD(5, 3, val) << ((id) * 6)) -#define RK3588_GMAC_CLK_RMII_MODE (id) GRF_BIT(5 * (id))#define RK3588_GMAC_CLK_RGMII_MODE (id) GRF_CLR_BIT(5 * (id))
@@ -1243,6 +1253,22 @@ static const struct rk_gmac_ops rk3576_ops = {#define RK3588_GMAC_CLK_RMII_GATE (id) GRF_BIT(5 * (id) + 1)#define RK3588_GMAC_CLK_RMII_NOGATE (id) GRF_CLR_BIT(5 * (id) + 1) +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 ; + } +} +static void rk3588_set_to_rgmii (struct rk_priv_data *bsp_priv,int tx_delay,int rx_delay) {
@@ -1251,9 +1277,6 @@ static void rk3588_set_to_rgmii(struct rk_priv_data *bsp_priv, offset_con = bsp_priv->id ==1 ?RK3588_GRF_GMAC_CON9 :RK3588_GRF_GMAC_CON8 ; -regmap_write (bsp_priv->php_grf,RK3588_GRF_GMAC_CON0 , -RK3588_GMAC_PHY_INTF_SEL (id,PHY_INTF_SEL_RGMII )); -regmap_write (bsp_priv->php_grf,RK3588_GRF_CLK_CON1 ,RK3588_GMAC_CLK_RGMII_MODE (id));
@@ -1268,9 +1291,6 @@ static void rk3588_set_to_rgmii(struct rk_priv_data *bsp_priv,static void rk3588_set_to_rmii (struct rk_priv_data *bsp_priv) { -regmap_write (bsp_priv->php_grf,RK3588_GRF_GMAC_CON0 , -RK3588_GMAC_PHY_INTF_SEL (bsp_priv->id,PHY_INTF_SEL_RMII )); -regmap_write (bsp_priv->php_grf,RK3588_GRF_CLK_CON1 ,RK3588_GMAC_CLK_RMII_MODE (bsp_priv->id)); }
@@ -1323,10 +1343,15 @@ 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_in_php = true, + .gmac_grf_reg =RK3588_GRF_GMAC_CON0 , + .php_grf_required = true, .regs_valid = true, .regs = {
@@ -1712,7 +1737,7 @@ static int rk_gmac_powerup(struct rk_priv_data *bsp_priv) val |=rk_encode_wm16 (intf ==PHY_INTF_SEL_RMII , bsp_priv->gmac_rmii_mode_mask); - ret =regmap_write (bsp_priv->grf, bsp_priv->gmac_grf_reg, val); + ret =rk_write_gmac_grf_reg (bsp_priv, val);if (ret <0 )return ret; }
Signature · 1 line
2.47.3
kernel test robot
build botRe: [PATCH net-next v2 08/22] net: stmmac: rk: convert rk3588 to mask-based interface mode config
kernel test robot noticed the following build warnings:
Hi Russell,
kernel test robot noticed the following build warnings:
[auto build test WARNING on net-next/main]
url: https://github.com/intel-lab-lkp/linux/commits/Russell-King-Oracle/net-stmmac-rk-avoid-phy_power_on/20260126-234820 base: net-next/main patch link: https://lore.kernel.org/r/E1vkL2I-00000005usu-42Hy%40rmk-PC.armlinux.org.uk patch subject: [PATCH net-next v2 08/22] net: stmmac: rk: convert rk3588 to mask-based interface mode config config: m68k-allyesconfig (https://download.01.org/0day-ci/archive/20260127/[email protected]/config) compiler: m68k-linux-gcc (GCC) 15.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260127/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c: In function 'rk_write_gmac_grf_reg':
>> drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c:132:24: warning: variable 'regmap' set but not used [-Wunused-but-set-variable]
132 | struct regmap *regmap;
| ^~~~~~vim +/regmap +132 drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
129
130 static int rk_write_gmac_grf_reg(struct rk_priv_data *bsp_priv, u32 val)
131 {
> 132 struct regmap *regmap;
133
134 if (bsp_priv->ops->gmac_grf_reg_in_php)
135 regmap = bsp_priv->php_grf;
136 else
137 regmap = bsp_priv->grf;
138
139 return regmap_write(bsp_priv->grf, bsp_priv->gmac_grf_reg, val);
140 }
141
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Jakub Kicinski
maintainerRe: [net-next,v2,08/22] net: stmmac: rk: convert rk3588 to mask-based interface mode config
In reply to Russell King (Oracle)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 rk3588 to mask-based interface mode config
This patch adds a gmac_grf_reg_in_php flag and a rk_write_gmac_grf_reg() helper to write to either php_grf or grf depending on the SoC. It also adds an init function for rk3588 to set up the interface mode mask.
Quoted 4 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +0
-0
[ ... ]
Quoted 4 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +0
-0@@ -126,6 +127,18 @@ static u32 rk_encode_wm16(u16 val, u16 mask)return reg_val; }
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c static u32 rk_encode_wm16(u16 val, u16 mask) · line 139
Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +10
-0+static int rk_write_gmac_grf_reg (struct rk_priv_data *bsp_priv,u32 val) +{ +struct regmap *regmap; + +if (bsp_priv->ops->gmac_grf_reg_in_php) + regmap = bsp_priv->php_grf; +else + regmap = bsp_priv->grf; + +return regmap_write (bsp_priv->grf, bsp_priv->gmac_grf_reg, val);
^^^^^^^^^^^^^^
The regmap variable is computed based on gmac_grf_reg_in_php but then not used - the call always writes to bsp_priv->grf instead of regmap. For rk3588 where gmac_grf_reg_in_php is true, this writes to the wrong register bank. Should this be regmap_write(regmap, ...) instead?
Quoted 1 line
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +1
-0+}
[ ... ]
PATCH v2 9/22 net: stmmac: rk: move speed GRF register offset to private data
In reply to Russell King (Oracle)Move the speed/clocking related GRF register offset into the driver private data, convert rk_set_reg_speed() to use it and initialise this member either from the corresponding member in struct rk_gmac_ops, or the SoC specific initialisation function.
--- .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 114 +++++++++++++----- 1 file changed, 81 insertions(+), 33 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +81 -33
@@ -50,6 +50,8 @@ struct rk_gmac_ops {u16 gmac_phy_intf_sel_mask;u16 gmac_rmii_mode_mask; +u16 clock_grf_reg; +bool gmac_grf_reg_in_php;bool php_grf_required;bool regs_valid;
@@ -100,6 +102,8 @@ struct rk_priv_data {u16 gmac_grf_reg;u16 gmac_phy_intf_sel_mask;u16 gmac_rmii_mode_mask; + +u16 clock_grf_reg; };#define GMAC_CLK_DIV1_125M 0
@@ -139,10 +143,14 @@ static int rk_write_gmac_grf_reg(struct rk_priv_data *bsp_priv, u32 val)return regmap_write (bsp_priv->grf, bsp_priv->gmac_grf_reg, val); } +static int rk_write_clock_grf_reg (struct rk_priv_data *bsp_priv,u32 val) +{ +return regmap_write (bsp_priv->grf, bsp_priv->clock_grf_reg, val); +} +static int rk_set_reg_speed (struct rk_priv_data *bsp_priv,const struct rk_reg_speed_data *rsd, -unsigned int reg,phy_interface_t interface, -int speed) +phy_interface_t interface,int speed) {unsigned int val;
@@ -178,7 +186,7 @@ static int rk_set_reg_speed(struct rk_priv_data *bsp_priv,return -EINVAL ; } -regmap_write (bsp_priv->grf, reg, val); +rk_write_clock_grf_reg (bsp_priv, val);return 0 ;
@@ -373,7 +381,7 @@ static int rk3128_set_speed(struct rk_priv_data *bsp_priv, phy_interface_t interface, int speed) {return rk_set_reg_speed (bsp_priv, &rk3128_reg_speed_data, -RK3128_GRF_MAC_CON1 , interface, speed); + interface, speed); }static const struct rk_gmac_ops rk3128_ops = {
@@ -384,6 +392,8 @@ static const struct rk_gmac_ops rk3128_ops = { .gmac_grf_reg = RK3128_GRF_MAC_CON1, .gmac_phy_intf_sel_mask = GENMASK_U16(8, 6), .gmac_rmii_mode_mask = BIT_U16(14), + + .clock_grf_reg = RK3128_GRF_MAC_CON1, };#define RK3228_GRF_MAC_CON0 0x0900
@@ -440,7 +450,7 @@ static int rk3228_set_speed(struct rk_priv_data *bsp_priv, phy_interface_t interface, int speed) {return rk_set_reg_speed (bsp_priv, &rk3228_reg_speed_data, -RK3228_GRF_MAC_CON1 , interface, speed); + interface, speed); }static void rk3228_integrated_phy_powerup (struct rk_priv_data *priv)
@@ -462,6 +472,7 @@ static const struct rk_gmac_ops rk3228_ops = { .gmac_phy_intf_sel_mask = GENMASK_U16(6, 4), .gmac_rmii_mode_mask = BIT_U16(10), + .clock_grf_reg = RK3228_GRF_MAC_CON1, };#define RK3288_GRF_SOC_CON1 0x0248
@@ -509,7 +520,7 @@ static int rk3288_set_speed(struct rk_priv_data *bsp_priv, phy_interface_t interface, int speed) {return rk_set_reg_speed (bsp_priv, &rk3288_reg_speed_data, -RK3288_GRF_SOC_CON1 , interface, speed); + interface, speed); }static const struct rk_gmac_ops rk3288_ops = {
@@ -520,6 +531,8 @@ static const struct rk_gmac_ops rk3288_ops = { .gmac_grf_reg = RK3288_GRF_SOC_CON1, .gmac_phy_intf_sel_mask = GENMASK_U16(8, 6), .gmac_rmii_mode_mask = BIT_U16(14), + + .clock_grf_reg = RK3288_GRF_SOC_CON1, };#define RK3308_GRF_MAC_CON0 0x04a0
@@ -543,7 +556,7 @@ static int rk3308_set_speed(struct rk_priv_data *bsp_priv, phy_interface_t interface, int speed) {return rk_set_reg_speed (bsp_priv, &rk3308_reg_speed_data, -RK3308_GRF_MAC_CON0 , interface, speed); + interface, speed); }static const struct rk_gmac_ops rk3308_ops = {
@@ -552,6 +565,8 @@ static const struct rk_gmac_ops rk3308_ops = { .gmac_grf_reg = RK3308_GRF_MAC_CON0, .gmac_phy_intf_sel_mask = GENMASK_U16(4, 2), + + .clock_grf_reg = RK3308_GRF_MAC_CON0, };#define RK3328_GRF_MAC_CON0 0x0900
@@ -582,10 +597,12 @@ static int rk3328_init(struct rk_priv_data *bsp_priv)switch (bsp_priv->id) {case 0 :/* gmac2io */ bsp_priv->gmac_grf_reg =RK3328_GRF_MAC_CON1 ; + bsp_priv->clock_grf_reg =RK3328_GRF_MAC_CON1 ;return 0 ;case 1 :/* gmac2phy */ bsp_priv->gmac_grf_reg =RK3328_GRF_MAC_CON2 ; + bsp_priv->clock_grf_reg =RK3328_GRF_MAC_CON2 ;return 0 ;default :
@@ -620,11 +637,7 @@ static const struct rk_reg_speed_data rk3328_reg_speed_data = {static int rk3328_set_speed (struct rk_priv_data *bsp_priv,phy_interface_t interface,int speed) { -unsigned int reg; - - reg = bsp_priv->id ?RK3328_GRF_MAC_CON2 :RK3328_GRF_MAC_CON1 ; - -return rk_set_reg_speed (bsp_priv, &rk3328_reg_speed_data, reg, +return rk_set_reg_speed (bsp_priv, &rk3328_reg_speed_data, interface, speed); }
@@ -700,7 +713,7 @@ static int rk3366_set_speed(struct rk_priv_data *bsp_priv, phy_interface_t interface, int speed) {return rk_set_reg_speed (bsp_priv, &rk3366_reg_speed_data, -RK3366_GRF_SOC_CON6 , interface, speed); + interface, speed); }static const struct rk_gmac_ops rk3366_ops = {
@@ -711,6 +724,8 @@ static const struct rk_gmac_ops rk3366_ops = { .gmac_grf_reg = RK3366_GRF_SOC_CON6, .gmac_phy_intf_sel_mask = GENMASK_U16(11, 9), .gmac_rmii_mode_mask = BIT_U16(6), + + .clock_grf_reg = RK3366_GRF_SOC_CON6, };#define RK3368_GRF_SOC_CON15 0x043c
@@ -758,7 +773,7 @@ static int rk3368_set_speed(struct rk_priv_data *bsp_priv, phy_interface_t interface, int speed) {return rk_set_reg_speed (bsp_priv, &rk3368_reg_speed_data, -RK3368_GRF_SOC_CON15 , interface, speed); + interface, speed); }static const struct rk_gmac_ops rk3368_ops = {
@@ -769,6 +784,8 @@ static const struct rk_gmac_ops rk3368_ops = { .gmac_grf_reg = RK3368_GRF_SOC_CON15, .gmac_phy_intf_sel_mask = GENMASK_U16(11, 9), .gmac_rmii_mode_mask = BIT_U16(6), + + .clock_grf_reg = RK3368_GRF_SOC_CON15, };#define RK3399_GRF_SOC_CON5 0xc214
@@ -816,7 +833,7 @@ static int rk3399_set_speed(struct rk_priv_data *bsp_priv, phy_interface_t interface, int speed) {return rk_set_reg_speed (bsp_priv, &rk3399_reg_speed_data, -RK3399_GRF_SOC_CON5 , interface, speed); + interface, speed); }static const struct rk_gmac_ops rk3399_ops = {
@@ -827,6 +844,8 @@ static const struct rk_gmac_ops rk3399_ops = { .gmac_grf_reg = RK3399_GRF_SOC_CON5, .gmac_phy_intf_sel_mask = GENMASK_U16(11, 9), .gmac_rmii_mode_mask = BIT_U16(6), + + .clock_grf_reg = RK3399_GRF_SOC_CON5, };#define RK3506_GRF_SOC_CON8 0x0020
@@ -843,6 +862,22 @@ static const struct rk_gmac_ops rk3399_ops = {#define RK3506_GMAC_CLK_RMII_GATE GRF_BIT(2)#define RK3506_GMAC_CLK_RMII_NOGATE GRF_CLR_BIT(2) +static int rk3506_init (struct rk_priv_data *bsp_priv) +{ +switch (bsp_priv->id) { +case 0 : + bsp_priv->clock_grf_reg =RK3506_GRF_SOC_CON8 ; +return 0 ; + +case 1 : + bsp_priv->clock_grf_reg =RK3506_GRF_SOC_CON11 ; +return 0 ; + +default : +return -EINVAL ; + } +} +static void rk3506_set_to_rmii (struct rk_priv_data *bsp_priv) {unsigned int id = bsp_priv->id, offset;
@@ -859,11 +894,8 @@ static const struct rk_reg_speed_data rk3506_reg_speed_data = {static int rk3506_set_speed (struct rk_priv_data *bsp_priv,phy_interface_t interface,int speed) { -unsigned int id = bsp_priv->id, offset; - - offset = (id ==1 ) ?RK3506_GRF_SOC_CON11 :RK3506_GRF_SOC_CON8 ;return rk_set_reg_speed (bsp_priv, &rk3506_reg_speed_data, - offset, interface, speed); + interface, speed); } static void rk3506_set_clock_selection(struct rk_priv_data *bsp_priv,
@@ -881,6 +913,7 @@ static void rk3506_set_clock_selection(struct rk_priv_data *bsp_priv, }static const struct rk_gmac_ops rk3506_ops = { + .init = rk3506_init, .set_to_rmii = rk3506_set_to_rmii, .set_speed = rk3506_set_speed, .set_clock_selection = rk3506_set_clock_selection,
@@ -925,6 +958,22 @@ static const struct rk_gmac_ops rk3506_ops = {#define RK3528_GMAC1_CLK_RMII_GATE GRF_BIT(9)#define RK3528_GMAC1_CLK_RMII_NOGATE GRF_CLR_BIT(9) +static int rk3528_init (struct rk_priv_data *bsp_priv) +{ +switch (bsp_priv->id) { +case 0 : + bsp_priv->clock_grf_reg =RK3528_VO_GRF_GMAC_CON ; +return 0 ; + +case 1 : + bsp_priv->clock_grf_reg =RK3528_VPU_GRF_GMAC_CON5 ; +return 0 ; + +default : +return -EINVAL ; + } +} +static void rk3528_set_to_rgmii (struct rk_priv_data *bsp_priv,int tx_delay,int rx_delay) {
@@ -967,17 +1016,13 @@ static int rk3528_set_speed(struct rk_priv_data *bsp_priv, phy_interface_t interface, int speed) {const struct rk_reg_speed_data *rsd; -unsigned int reg; -if (bsp_priv->id ==1 ) { +if (bsp_priv->id ==1 ) rsd = &rk3528_gmac1_reg_speed_data; - reg =RK3528_VPU_GRF_GMAC_CON5 ; - }else { +else rsd = &rk3528_gmac0_reg_speed_data; - reg =RK3528_VO_GRF_GMAC_CON ; - } -return rk_set_reg_speed (bsp_priv, rsd, reg, interface, speed); +return rk_set_reg_speed (bsp_priv, rsd, interface, speed); } static void rk3528_set_clock_selection(struct rk_priv_data *bsp_priv,
@@ -1009,6 +1054,7 @@ static void rk3528_integrated_phy_powerdown(struct rk_priv_data *bsp_priv) }static const struct rk_gmac_ops rk3528_ops = { + .init = rk3528_init, .set_to_rgmii = rk3528_set_to_rgmii, .set_to_rmii = rk3528_set_to_rmii, .set_speed = rk3528_set_speed,
@@ -1129,10 +1175,12 @@ static int rk3576_init(struct rk_priv_data *bsp_priv)switch (bsp_priv->id) {case 0 : bsp_priv->gmac_grf_reg =RK3576_GRF_GMAC_CON0 ; + bsp_priv->clock_grf_reg =RK3576_GRF_GMAC_CON0 ;return 0 ;case 1 : bsp_priv->gmac_grf_reg =RK3576_GRF_GMAC_CON1 ; + bsp_priv->clock_grf_reg =RK3576_GRF_GMAC_CON1 ;return 0 ;default :
@@ -1178,12 +1226,7 @@ static const struct rk_reg_speed_data rk3578_reg_speed_data = {static int rk3576_set_gmac_speed (struct rk_priv_data *bsp_priv,phy_interface_t interface,int speed) { -unsigned int offset_con; - - offset_con = bsp_priv->id ==1 ?RK3576_GRF_GMAC_CON1 : -RK3576_GRF_GMAC_CON0 ; - -return rk_set_reg_speed (bsp_priv, &rk3578_reg_speed_data, offset_con, +return rk_set_reg_speed (bsp_priv, &rk3578_reg_speed_data, interface, speed); }
@@ -1384,7 +1427,7 @@ static int rv1108_set_speed(struct rk_priv_data *bsp_priv, phy_interface_t interface, int speed) {return rk_set_reg_speed (bsp_priv, &rv1108_reg_speed_data, -RV1108_GRF_GMAC_CON0 , interface, speed); + interface, speed); }static const struct rk_gmac_ops rv1108_ops = {
@@ -1393,6 +1436,8 @@ static const struct rk_gmac_ops rv1108_ops = { .gmac_grf_reg = RV1108_GRF_GMAC_CON0, .gmac_phy_intf_sel_mask = GENMASK_U16(6, 4), + + .clock_grf_reg = RV1108_GRF_GMAC_CON0, };#define RV1126_GRF_GMAC_CON0 0X0070
@@ -1675,6 +1720,9 @@ static struct rk_priv_data *rk_gmac_setup(struct platform_device *pdev, bsp_priv->gmac_phy_intf_sel_mask = ops->gmac_phy_intf_sel_mask; bsp_priv->gmac_rmii_mode_mask = ops->gmac_rmii_mode_mask; +/* Set the default clock control register related parameters */ + bsp_priv->clock_grf_reg = ops->clock_grf_reg; +if (ops->init) { ret = ops->init (bsp_priv);if (ret) {
Signature · 1 line
2.47.3
PATCH v2 10/22 net: stmmac: rk: convert rk3588 to rk_set_reg_speed()
In reply to Russell King (Oracle)Update rk_set_reg_speed() to use either the grf or php_grf regmap depending on the SoC's requirements and convert rk3588, removing its custom code.
--- .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 63 ++++++++++--------- 1 file changed, 34 insertions(+), 29 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +34 -29
@@ -53,6 +53,7 @@ struct rk_gmac_ops {u16 clock_grf_reg;bool gmac_grf_reg_in_php; +bool clock_grf_reg_in_php;bool php_grf_required;bool regs_valid;u32 regs[];
@@ -145,7 +146,14 @@ static int rk_write_gmac_grf_reg(struct rk_priv_data *bsp_priv, u32 val)static int rk_write_clock_grf_reg (struct rk_priv_data *bsp_priv,u32 val) { -return regmap_write (bsp_priv->grf, bsp_priv->clock_grf_reg, val); +struct regmap *regmap; + +if (bsp_priv->ops->clock_grf_reg_in_php) + regmap = bsp_priv->php_grf; +else + regmap = bsp_priv->grf; + +return regmap_write (regmap, bsp_priv->clock_grf_reg, val); } static int rk_set_reg_speed(struct rk_priv_data *bsp_priv,
@@ -1338,39 +1346,33 @@ static void rk3588_set_to_rmii(struct rk_priv_data *bsp_priv) RK3588_GMAC_CLK_RMII_MODE(bsp_priv->id)); } +static const struct rk_reg_speed_data rk3588_gmac0_speed_data = { + .rgmii_10 =RK3588_GMAC_CLK_RGMII (0 ,GMAC_CLK_DIV50_2_5M ), + .rgmii_100 =RK3588_GMAC_CLK_RGMII (0 ,GMAC_CLK_DIV5_25M ), + .rgmii_1000 =RK3588_GMAC_CLK_RGMII (0 ,GMAC_CLK_DIV1_125M ), + .rmii_10 =RK3588_GMA_CLK_RMII_DIV20 (0 ), + .rmii_100 =RK3588_GMA_CLK_RMII_DIV2 (0 ), +}; + +static const struct rk_reg_speed_data rk3588_gmac1_speed_data = { + .rgmii_10 =RK3588_GMAC_CLK_RGMII (1 ,GMAC_CLK_DIV50_2_5M ), + .rgmii_100 =RK3588_GMAC_CLK_RGMII (1 ,GMAC_CLK_DIV5_25M ), + .rgmii_1000 =RK3588_GMAC_CLK_RGMII (1 ,GMAC_CLK_DIV1_125M ), + .rmii_10 =RK3588_GMA_CLK_RMII_DIV20 (1 ), + .rmii_100 =RK3588_GMA_CLK_RMII_DIV2 (1 ), +}; +static int rk3588_set_gmac_speed (struct rk_priv_data *bsp_priv,phy_interface_t interface,int speed) { -unsigned int val =0 , id = bsp_priv->id; - -switch (speed) { -case 10 : -if (interface ==PHY_INTERFACE_MODE_RMII ) - val =RK3588_GMA_CLK_RMII_DIV20 (id); -else - val =RK3588_GMAC_CLK_RGMII (id,GMAC_CLK_DIV50_2_5M ); -break ; -case 100 : -if (interface ==PHY_INTERFACE_MODE_RMII ) - val =RK3588_GMA_CLK_RMII_DIV2 (id); -else - val =RK3588_GMAC_CLK_RGMII (id,GMAC_CLK_DIV5_25M ); -break ; -case 1000 : -if (interface !=PHY_INTERFACE_MODE_RMII ) - val =RK3588_GMAC_CLK_RGMII (id,GMAC_CLK_DIV1_125M ); -else - goto err; -break ; -default : - goto err; - } +const struct rk_reg_speed_data *rsd; -regmap_write (bsp_priv->php_grf,RK3588_GRF_CLK_CON1 , val); +if (bsp_priv->id ==0 ) + rsd = &rk3588_gmac0_speed_data; +else + rsd = &rk3588_gmac1_speed_data; -return 0 ; -err: -return -EINVAL ; +return rk_set_reg_speed (bsp_priv, rsd, interface, speed); } static void rk3588_set_clock_selection(struct rk_priv_data *bsp_priv, bool input,
@@ -1395,6 +1397,9 @@ static const struct rk_gmac_ops rk3588_ops = { .gmac_grf_reg_in_php = true, .gmac_grf_reg = RK3588_GRF_GMAC_CON0, + .clock_grf_reg_in_php = true, + .clock_grf_reg = RK3588_GRF_CLK_CON1, + .php_grf_required = true, .regs_valid = true, .regs = {
Signature · 1 line
2.47.3
PATCH v2 11/22 net: stmmac: rk: remove rk3528 RMII clock initialisation
In reply to Russell King (Oracle)There is no need to pre-initialise the rk3528 RMII clock when selecting RMII mode on gmac0.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +1 -2
@@ -1003,8 +1003,7 @@ static void rk3528_set_to_rmii(struct rk_priv_data *bsp_priv) RK3528_GMAC1_PHY_INTF_SEL_RMII); else regmap_write(bsp_priv->grf, RK3528_VO_GRF_GMAC_CON, - RK3528_GMAC0_PHY_INTF_SEL_RMII | -RK3528_GMAC0_CLK_RMII_DIV2 ); +RK3528_GMAC0_PHY_INTF_SEL_RMII ); }static const struct rk_reg_speed_data rk3528_gmac0_reg_speed_data = {
Signature · 1 line
2.47.3
PATCH v2 12/22 net: stmmac: rk: use rk_encode_wm16() for RGMII clocks
In reply to Russell King (Oracle)As all of the RGMII clock selection bitfields (gmii_clk_sel) use the same encoding, parameterise this by providing the bitfield mask in the BSP private data.
This is the last user of GRF_FIELD_CONST(), so remove that definition as well.
One additional change is for RK3328 - as only gmac2io supports RGMII, only initialise the mask for this instance.
--- .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 100 +++++++----------- 1 file changed, 36 insertions(+), 64 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +36 -64
@@ -26,10 +26,11 @@struct rk_priv_data ; +struct rk_clock_fields { +u16 gmii_clk_sel_mask; +}; +struct rk_reg_speed_data { -unsigned int rgmii_10; -unsigned int rgmii_100; -unsigned int rgmii_1000;unsigned int rmii_10;unsigned int rmii_100; };
@@ -51,6 +52,7 @@ struct rk_gmac_ops {u16 gmac_rmii_mode_mask;u16 clock_grf_reg; +struct rk_clock_fields clock;bool gmac_grf_reg_in_php;bool clock_grf_reg_in_php;
@@ -105,12 +107,24 @@ struct rk_priv_data {u16 gmac_rmii_mode_mask;u16 clock_grf_reg; +struct rk_clock_fields clock; };#define GMAC_CLK_DIV1_125M 0#define GMAC_CLK_DIV50_2_5M 2#define GMAC_CLK_DIV5_25M 3 +static int rk_gmac_rgmii_clk_div (int speed) +{ +if (speed ==SPEED_10 ) +return GMAC_CLK_DIV50_2_5M ; +if (speed ==SPEED_100 ) +return GMAC_CLK_DIV5_25M ; +if (speed ==SPEED_1000 ) +return GMAC_CLK_DIV1_125M ; +return -EINVAL ; +} +static int rk_get_phy_intf_sel (phy_interface_t interface) {int ret =stmmac_get_phy_intf_sel (interface);
@@ -161,20 +175,14 @@ static int rk_set_reg_speed(struct rk_priv_data *bsp_priv, phy_interface_t interface, int speed) {unsigned int val; +int ret;if (phy_interface_mode_is_rgmii (interface)) { -if (speed ==SPEED_10 ) { - val = rsd->rgmii_10; - }else if (speed ==SPEED_100 ) { - val = rsd->rgmii_100; - }else if (speed ==SPEED_1000 ) { - val = rsd->rgmii_1000; - }else { -/* Phylink will not allow inappropriate speeds for -* interface modes, so this should never happen. -*/ -return -EINVAL ; - } + ret =rk_gmac_rgmii_clk_div (speed); +if (ret <0 ) +return ret; + + val =rk_encode_wm16 (ret, bsp_priv->clock.gmii_clk_sel_mask); }else if (interface ==PHY_INTERFACE_MODE_RMII ) {if (speed ==SPEED_10 ) { val = rsd->rmii_10;
@@ -215,8 +223,6 @@ static int rk_set_clk_mac_speed(struct rk_priv_data *bsp_priv,#define GRF_FIELD (hi, lo, val) \ FIELD_PREP_WM16(GENMASK_U16(hi, lo), val) -#define GRF_FIELD_CONST (hi, lo, val) \ - FIELD_PREP_WM16_CONST(GENMASK_U16(hi, lo), val)#define GRF_BIT (nr) (BIT(nr) | BIT(nr+16))#define GRF_CLR_BIT (nr) (BIT(nr+16))
@@ -362,7 +368,6 @@ static const struct rk_gmac_ops px30_ops = {#define RK3128_GMAC_SPEED_100M GRF_BIT(10)#define RK3128_GMAC_RMII_CLK_25M GRF_BIT(11)#define RK3128_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(11) -#define RK3128_GMAC_CLK (val) GRF_FIELD_CONST(13, 12, val)static void rk3128_set_to_rgmii (struct rk_priv_data *bsp_priv,int tx_delay,int rx_delay)
@@ -378,9 +383,6 @@ static void rk3128_set_to_rmii(struct rk_priv_data *bsp_priv) }static const struct rk_reg_speed_data rk3128_reg_speed_data = { - .rgmii_10 =RK3128_GMAC_CLK (GMAC_CLK_DIV50_2_5M ), - .rgmii_100 =RK3128_GMAC_CLK (GMAC_CLK_DIV5_25M ), - .rgmii_1000 =RK3128_GMAC_CLK (GMAC_CLK_DIV1_125M ), .rmii_10 =RK3128_GMAC_RMII_CLK_2_5M |RK3128_GMAC_SPEED_10M , .rmii_100 =RK3128_GMAC_RMII_CLK_25M |RK3128_GMAC_SPEED_100M , };
@@ -402,6 +404,7 @@ static const struct rk_gmac_ops rk3128_ops = { .gmac_rmii_mode_mask = BIT_U16(14), .clock_grf_reg = RK3128_GRF_MAC_CON1, + .clock.gmii_clk_sel_mask = GENMASK_U16(13, 12), };#define RK3228_GRF_MAC_CON0 0x0900
@@ -420,7 +423,6 @@ static const struct rk_gmac_ops rk3128_ops = {#define RK3228_GMAC_SPEED_100M GRF_BIT(2)#define RK3228_GMAC_RMII_CLK_25M GRF_BIT(7)#define RK3228_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(7) -#define RK3228_GMAC_CLK (val) GRF_FIELD_CONST(9, 8, val)#define RK3228_GMAC_TXCLK_DLY_ENABLE GRF_BIT(0)#define RK3228_GMAC_TXCLK_DLY_DISABLE GRF_CLR_BIT(0)#define RK3228_GMAC_RXCLK_DLY_ENABLE GRF_BIT(1)
@@ -447,9 +449,6 @@ static void rk3228_set_to_rmii(struct rk_priv_data *bsp_priv) }static const struct rk_reg_speed_data rk3228_reg_speed_data = { - .rgmii_10 =RK3228_GMAC_CLK (GMAC_CLK_DIV50_2_5M ), - .rgmii_100 =RK3228_GMAC_CLK (GMAC_CLK_DIV5_25M ), - .rgmii_1000 =RK3228_GMAC_CLK (GMAC_CLK_DIV1_125M ), .rmii_10 =RK3228_GMAC_RMII_CLK_2_5M |RK3228_GMAC_SPEED_10M , .rmii_100 =RK3228_GMAC_RMII_CLK_25M |RK3228_GMAC_SPEED_100M , };
@@ -481,6 +480,7 @@ static const struct rk_gmac_ops rk3228_ops = { .gmac_rmii_mode_mask = BIT_U16(10), .clock_grf_reg = RK3228_GRF_MAC_CON1, + .clock.gmii_clk_sel_mask = GENMASK_U16(9, 8), };#define RK3288_GRF_SOC_CON1 0x0248
@@ -493,7 +493,6 @@ static const struct rk_gmac_ops rk3228_ops = {#define RK3288_GMAC_SPEED_100M GRF_BIT(10)#define RK3288_GMAC_RMII_CLK_25M GRF_BIT(11)#define RK3288_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(11) -#define RK3288_GMAC_CLK (val) GRF_FIELD_CONST(13, 12, val)/*RK3288_GRF_SOC_CON3*/ #define RK3288_GMAC_TXCLK_DLY_ENABLE GRF_BIT(14)
@@ -517,9 +516,6 @@ static void rk3288_set_to_rmii(struct rk_priv_data *bsp_priv) }static const struct rk_reg_speed_data rk3288_reg_speed_data = { - .rgmii_10 =RK3288_GMAC_CLK (GMAC_CLK_DIV50_2_5M ), - .rgmii_100 =RK3288_GMAC_CLK (GMAC_CLK_DIV5_25M ), - .rgmii_1000 =RK3288_GMAC_CLK (GMAC_CLK_DIV1_125M ), .rmii_10 =RK3288_GMAC_RMII_CLK_2_5M |RK3288_GMAC_SPEED_10M , .rmii_100 =RK3288_GMAC_RMII_CLK_25M |RK3288_GMAC_SPEED_100M , };
@@ -541,6 +537,7 @@ static const struct rk_gmac_ops rk3288_ops = { .gmac_rmii_mode_mask = BIT_U16(14), .clock_grf_reg = RK3288_GRF_SOC_CON1, + .clock.gmii_clk_sel_mask = GENMASK_U16(13, 12), };#define RK3308_GRF_MAC_CON0 0x04a0
@@ -593,7 +590,6 @@ static const struct rk_gmac_ops rk3308_ops = {#define RK3328_GMAC_SPEED_100M GRF_BIT(2)#define RK3328_GMAC_RMII_CLK_25M GRF_BIT(7)#define RK3328_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(7) -#define RK3328_GMAC_CLK (val) GRF_FIELD_CONST(12, 11, val)#define RK3328_GMAC_TXCLK_DLY_ENABLE GRF_BIT(0)#define RK3328_GMAC_RXCLK_DLY_ENABLE GRF_BIT(1)
@@ -606,6 +602,7 @@ static int rk3328_init(struct rk_priv_data *bsp_priv)case 0 :/* gmac2io */ bsp_priv->gmac_grf_reg =RK3328_GRF_MAC_CON1 ; bsp_priv->clock_grf_reg =RK3328_GRF_MAC_CON1 ; + bsp_priv->clock.gmii_clk_sel_mask =GENMASK_U16 (12 ,11 );return 0 ;case 1 :/* gmac2phy */
@@ -635,9 +632,6 @@ static void rk3328_set_to_rmii(struct rk_priv_data *bsp_priv) }static const struct rk_reg_speed_data rk3328_reg_speed_data = { - .rgmii_10 =RK3328_GMAC_CLK (GMAC_CLK_DIV50_2_5M ), - .rgmii_100 =RK3328_GMAC_CLK (GMAC_CLK_DIV5_25M ), - .rgmii_1000 =RK3328_GMAC_CLK (GMAC_CLK_DIV1_125M ), .rmii_10 =RK3328_GMAC_RMII_CLK_2_5M |RK3328_GMAC_SPEED_10M , .rmii_100 =RK3328_GMAC_RMII_CLK_25M |RK3328_GMAC_SPEED_100M , };
@@ -686,7 +680,6 @@ static const struct rk_gmac_ops rk3328_ops = {#define RK3366_GMAC_SPEED_100M GRF_BIT(7)#define RK3366_GMAC_RMII_CLK_25M GRF_BIT(3)#define RK3366_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(3) -#define RK3366_GMAC_CLK (val) GRF_FIELD_CONST(5, 4, val)/* RK3366_GRF_SOC_CON7 */ #define RK3366_GMAC_TXCLK_DLY_ENABLE GRF_BIT(7)
@@ -710,9 +703,6 @@ static void rk3366_set_to_rmii(struct rk_priv_data *bsp_priv) }static const struct rk_reg_speed_data rk3366_reg_speed_data = { - .rgmii_10 =RK3366_GMAC_CLK (GMAC_CLK_DIV50_2_5M ), - .rgmii_100 =RK3366_GMAC_CLK (GMAC_CLK_DIV5_25M ), - .rgmii_1000 =RK3366_GMAC_CLK (GMAC_CLK_DIV1_125M ), .rmii_10 =RK3366_GMAC_RMII_CLK_2_5M |RK3366_GMAC_SPEED_10M , .rmii_100 =RK3366_GMAC_RMII_CLK_25M |RK3366_GMAC_SPEED_100M , };
@@ -734,6 +724,7 @@ static const struct rk_gmac_ops rk3366_ops = { .gmac_rmii_mode_mask = BIT_U16(6), .clock_grf_reg = RK3366_GRF_SOC_CON6, + .clock.gmii_clk_sel_mask = GENMASK_U16(5, 4), };#define RK3368_GRF_SOC_CON15 0x043c
@@ -746,7 +737,6 @@ static const struct rk_gmac_ops rk3366_ops = {#define RK3368_GMAC_SPEED_100M GRF_BIT(7)#define RK3368_GMAC_RMII_CLK_25M GRF_BIT(3)#define RK3368_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(3) -#define RK3368_GMAC_CLK (val) GRF_FIELD_CONST(5, 4, val)/* RK3368_GRF_SOC_CON16 */ #define RK3368_GMAC_TXCLK_DLY_ENABLE GRF_BIT(7)
@@ -770,9 +760,6 @@ static void rk3368_set_to_rmii(struct rk_priv_data *bsp_priv) }static const struct rk_reg_speed_data rk3368_reg_speed_data = { - .rgmii_10 =RK3368_GMAC_CLK (GMAC_CLK_DIV50_2_5M ), - .rgmii_100 =RK3368_GMAC_CLK (GMAC_CLK_DIV5_25M ), - .rgmii_1000 =RK3368_GMAC_CLK (GMAC_CLK_DIV1_125M ), .rmii_10 =RK3368_GMAC_RMII_CLK_2_5M |RK3368_GMAC_SPEED_10M , .rmii_100 =RK3368_GMAC_RMII_CLK_25M |RK3368_GMAC_SPEED_100M , };
@@ -794,6 +781,7 @@ static const struct rk_gmac_ops rk3368_ops = { .gmac_rmii_mode_mask = BIT_U16(6), .clock_grf_reg = RK3368_GRF_SOC_CON15, + .clock.gmii_clk_sel_mask = GENMASK_U16(5, 4), };#define RK3399_GRF_SOC_CON5 0xc214
@@ -806,7 +794,6 @@ static const struct rk_gmac_ops rk3368_ops = {#define RK3399_GMAC_SPEED_100M GRF_BIT(7)#define RK3399_GMAC_RMII_CLK_25M GRF_BIT(3)#define RK3399_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(3) -#define RK3399_GMAC_CLK (val) GRF_FIELD_CONST(5, 4, val)/* RK3399_GRF_SOC_CON6 */ #define RK3399_GMAC_TXCLK_DLY_ENABLE GRF_BIT(7)
@@ -830,9 +817,6 @@ static void rk3399_set_to_rmii(struct rk_priv_data *bsp_priv) }static const struct rk_reg_speed_data rk3399_reg_speed_data = { - .rgmii_10 =RK3399_GMAC_CLK (GMAC_CLK_DIV50_2_5M ), - .rgmii_100 =RK3399_GMAC_CLK (GMAC_CLK_DIV5_25M ), - .rgmii_1000 =RK3399_GMAC_CLK (GMAC_CLK_DIV1_125M ), .rmii_10 =RK3399_GMAC_RMII_CLK_2_5M |RK3399_GMAC_SPEED_10M , .rmii_100 =RK3399_GMAC_RMII_CLK_25M |RK3399_GMAC_SPEED_100M , };
@@ -854,6 +838,7 @@ static const struct rk_gmac_ops rk3399_ops = { .gmac_rmii_mode_mask = BIT_U16(6), .clock_grf_reg = RK3399_GRF_SOC_CON5, + .clock.gmii_clk_sel_mask = GENMASK_U16(5, 4), };#define RK3506_GRF_SOC_CON8 0x0020
@@ -959,8 +944,6 @@ static const struct rk_gmac_ops rk3506_ops = {#define RK3528_GMAC1_CLK_RMII_DIV2 GRF_BIT(10)#define RK3528_GMAC1_CLK_RMII_DIV20 GRF_CLR_BIT(10) -#define RK3528_GMAC1_CLK_RGMII (val) GRF_FIELD_CONST(11, 10, val) -#define RK3528_GMAC0_CLK_RMII_GATE GRF_BIT(2)#define RK3528_GMAC0_CLK_RMII_NOGATE GRF_CLR_BIT(2)#define RK3528_GMAC1_CLK_RMII_GATE GRF_BIT(9)
@@ -975,6 +958,7 @@ static int rk3528_init(struct rk_priv_data *bsp_priv)case 1 : bsp_priv->clock_grf_reg =RK3528_VPU_GRF_GMAC_CON5 ; + bsp_priv->clock.gmii_clk_sel_mask =GENMASK_U16 (11 ,10 );return 0 ;default :
@@ -1012,9 +996,6 @@ static const struct rk_reg_speed_data rk3528_gmac0_reg_speed_data = { };static const struct rk_reg_speed_data rk3528_gmac1_reg_speed_data = { - .rgmii_10 =RK3528_GMAC1_CLK_RGMII (GMAC_CLK_DIV50_2_5M ), - .rgmii_100 =RK3528_GMAC1_CLK_RGMII (GMAC_CLK_DIV5_25M ), - .rgmii_1000 =RK3528_GMAC1_CLK_RGMII (GMAC_CLK_DIV1_125M ), .rmii_10 =RK3528_GMAC1_CLK_RMII_DIV20 , .rmii_100 =RK3528_GMAC1_CLK_RMII_DIV2 , };
@@ -1172,8 +1153,6 @@ static const struct rk_gmac_ops rk3568_ops = {#define RK3576_GMAC_CLK_RMII_DIV2 GRF_BIT(5)#define RK3576_GMAC_CLK_RMII_DIV20 GRF_CLR_BIT(5) -#define RK3576_GMAC_CLK_RGMII (val) GRF_FIELD_CONST(6, 5, val) -#define RK3576_GMAC_CLK_RMII_GATE GRF_BIT(4)#define RK3576_GMAC_CLK_RMII_NOGATE GRF_CLR_BIT(4)
@@ -1223,9 +1202,6 @@ static void rk3576_set_to_rmii(struct rk_priv_data *bsp_priv) }static const struct rk_reg_speed_data rk3578_reg_speed_data = { - .rgmii_10 =RK3576_GMAC_CLK_RGMII (GMAC_CLK_DIV50_2_5M ), - .rgmii_100 =RK3576_GMAC_CLK_RGMII (GMAC_CLK_DIV5_25M ), - .rgmii_1000 =RK3576_GMAC_CLK_RGMII (GMAC_CLK_DIV1_125M ), .rmii_10 =RK3576_GMAC_CLK_RMII_DIV20 , .rmii_100 =RK3576_GMAC_CLK_RMII_DIV2 , };
@@ -1262,6 +1238,8 @@ static const struct rk_gmac_ops rk3576_ops = { .gmac_rmii_mode_mask = BIT_U16(3), + .clock.gmii_clk_sel_mask = GENMASK_U16(6, 5), + .php_grf_required = true, .regs_valid = true, .regs = {
@@ -1297,9 +1275,6 @@ static const struct rk_gmac_ops rk3576_ops = {#define RK3588_GMA_CLK_RMII_DIV2 (id) GRF_BIT(5 * (id) + 2)#define RK3588_GMA_CLK_RMII_DIV20 (id) GRF_CLR_BIT(5 * (id) + 2) -#define RK3588_GMAC_CLK_RGMII (id, val) \ - (GRF_FIELD_CONST(3, 2, val) << ((id) * 5)) -#define RK3588_GMAC_CLK_RMII_GATE (id) GRF_BIT(5 * (id) + 1)#define RK3588_GMAC_CLK_RMII_NOGATE (id) GRF_CLR_BIT(5 * (id) + 1)
@@ -1308,10 +1283,12 @@ 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 ); + bsp_priv->clock.gmii_clk_sel_mask =GENMASK_U16 (3 ,2 );return 0 ;case 1 : bsp_priv->gmac_phy_intf_sel_mask =GENMASK_U16 (11 ,9 ); + bsp_priv->clock.gmii_clk_sel_mask =GENMASK_U16 (8 ,7 );return 0 ;default :
@@ -1346,17 +1323,11 @@ static void rk3588_set_to_rmii(struct rk_priv_data *bsp_priv) }static const struct rk_reg_speed_data rk3588_gmac0_speed_data = { - .rgmii_10 =RK3588_GMAC_CLK_RGMII (0 ,GMAC_CLK_DIV50_2_5M ), - .rgmii_100 =RK3588_GMAC_CLK_RGMII (0 ,GMAC_CLK_DIV5_25M ), - .rgmii_1000 =RK3588_GMAC_CLK_RGMII (0 ,GMAC_CLK_DIV1_125M ), .rmii_10 =RK3588_GMA_CLK_RMII_DIV20 (0 ), .rmii_100 =RK3588_GMA_CLK_RMII_DIV2 (0 ), };static const struct rk_reg_speed_data rk3588_gmac1_speed_data = { - .rgmii_10 =RK3588_GMAC_CLK_RGMII (1 ,GMAC_CLK_DIV50_2_5M ), - .rgmii_100 =RK3588_GMAC_CLK_RGMII (1 ,GMAC_CLK_DIV5_25M ), - .rgmii_1000 =RK3588_GMAC_CLK_RGMII (1 ,GMAC_CLK_DIV1_125M ), .rmii_10 =RK3588_GMA_CLK_RMII_DIV20 (1 ), .rmii_100 =RK3588_GMA_CLK_RMII_DIV2 (1 ), };
@@ -1726,6 +1697,7 @@ static struct rk_priv_data *rk_gmac_setup(struct platform_device *pdev,/* Set the default clock control register related parameters */ bsp_priv->clock_grf_reg = ops->clock_grf_reg; + bsp_priv->clock = ops->clock;if (ops->init) { ret = ops->init (bsp_priv);
Signature · 1 line
2.47.3
PATCH v2 13/22 net: stmmac: rk: use rk_encode_wm16() for RMII speed
In reply to Russell King (Oracle)The RMII speed configuration is encoded as a single bit, which is set for 100M and clean for 10M. Provide the bitfield definition in struct rk_clock_fields, moving it out of struct rk_reg_speed_data's rmii_10 and rmii_100 initialisers. Update rk_set_reg_speed() to handle the new definition location of this bit.
--- .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 69 +++++++++---------- 1 file changed, 31 insertions(+), 38 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +31 -38
@@ -28,6 +28,7 @@ struct rk_priv_data;struct rk_clock_fields {u16 gmii_clk_sel_mask; +u16 mac_speed_mask; };struct rk_reg_speed_data {
@@ -184,10 +185,12 @@ static int rk_set_reg_speed(struct rk_priv_data *bsp_priv, val =rk_encode_wm16 (ret, bsp_priv->clock.gmii_clk_sel_mask); }else if (interface ==PHY_INTERFACE_MODE_RMII ) { + val =rk_encode_wm16 (speed ==SPEED_100 , + bsp_priv->clock.mac_speed_mask);if (speed ==SPEED_10 ) { - val = rsd->rmii_10; + val |= rsd->rmii_10; }else if (speed ==SPEED_100 ) { - val = rsd->rmii_100; + val |= rsd->rmii_100; }else {/* Phylink will not allow inappropriate speeds for * interface modes, so this should never happen.
@@ -364,8 +367,6 @@ static const struct rk_gmac_ops px30_ops = {/* RK3128_GRF_MAC_CON1 */ #define RK3128_GMAC_FLOW_CTRL GRF_BIT(9)#define RK3128_GMAC_FLOW_CTRL_CLR GRF_CLR_BIT(9) -#define RK3128_GMAC_SPEED_10M GRF_CLR_BIT(10) -#define RK3128_GMAC_SPEED_100M GRF_BIT(10)#define RK3128_GMAC_RMII_CLK_25M GRF_BIT(11)#define RK3128_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(11)
@@ -383,8 +384,8 @@ static void rk3128_set_to_rmii(struct rk_priv_data *bsp_priv) }static const struct rk_reg_speed_data rk3128_reg_speed_data = { - .rmii_10 =RK3128_GMAC_RMII_CLK_2_5M |RK3128_GMAC_SPEED_10M , - .rmii_100 =RK3128_GMAC_RMII_CLK_25M |RK3128_GMAC_SPEED_100M , + .rmii_10 =RK3128_GMAC_RMII_CLK_2_5M , + .rmii_100 =RK3128_GMAC_RMII_CLK_25M , }; static int rk3128_set_speed(struct rk_priv_data *bsp_priv,
@@ -405,6 +406,7 @@ static const struct rk_gmac_ops rk3128_ops = { .clock_grf_reg = RK3128_GRF_MAC_CON1, .clock.gmii_clk_sel_mask = GENMASK_U16(13, 12), + .clock.mac_speed_mask = BIT_U16(10), };#define RK3228_GRF_MAC_CON0 0x0900
@@ -419,8 +421,6 @@ static const struct rk_gmac_ops rk3128_ops = {/* RK3228_GRF_MAC_CON1 */ #define RK3228_GMAC_FLOW_CTRL GRF_BIT(3)#define RK3228_GMAC_FLOW_CTRL_CLR GRF_CLR_BIT(3) -#define RK3228_GMAC_SPEED_10M GRF_CLR_BIT(2) -#define RK3228_GMAC_SPEED_100M GRF_BIT(2)#define RK3228_GMAC_RMII_CLK_25M GRF_BIT(7)#define RK3228_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(7)#define RK3228_GMAC_TXCLK_DLY_ENABLE GRF_BIT(0)
@@ -449,8 +449,8 @@ static void rk3228_set_to_rmii(struct rk_priv_data *bsp_priv) }static const struct rk_reg_speed_data rk3228_reg_speed_data = { - .rmii_10 =RK3228_GMAC_RMII_CLK_2_5M |RK3228_GMAC_SPEED_10M , - .rmii_100 =RK3228_GMAC_RMII_CLK_25M |RK3228_GMAC_SPEED_100M , + .rmii_10 =RK3228_GMAC_RMII_CLK_2_5M , + .rmii_100 =RK3228_GMAC_RMII_CLK_25M , }; static int rk3228_set_speed(struct rk_priv_data *bsp_priv,
@@ -481,6 +481,7 @@ static const struct rk_gmac_ops rk3228_ops = { .clock_grf_reg = RK3228_GRF_MAC_CON1, .clock.gmii_clk_sel_mask = GENMASK_U16(9, 8), + .clock.mac_speed_mask = BIT_U16(2), };#define RK3288_GRF_SOC_CON1 0x0248
@@ -489,8 +490,6 @@ static const struct rk_gmac_ops rk3228_ops = {/*RK3288_GRF_SOC_CON1*/ #define RK3288_GMAC_FLOW_CTRL GRF_BIT(9)#define RK3288_GMAC_FLOW_CTRL_CLR GRF_CLR_BIT(9) -#define RK3288_GMAC_SPEED_10M GRF_CLR_BIT(10) -#define RK3288_GMAC_SPEED_100M GRF_BIT(10)#define RK3288_GMAC_RMII_CLK_25M GRF_BIT(11)#define RK3288_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(11)
@@ -516,8 +515,8 @@ static void rk3288_set_to_rmii(struct rk_priv_data *bsp_priv) }static const struct rk_reg_speed_data rk3288_reg_speed_data = { - .rmii_10 =RK3288_GMAC_RMII_CLK_2_5M |RK3288_GMAC_SPEED_10M , - .rmii_100 =RK3288_GMAC_RMII_CLK_25M |RK3288_GMAC_SPEED_100M , + .rmii_10 =RK3288_GMAC_RMII_CLK_2_5M , + .rmii_100 =RK3288_GMAC_RMII_CLK_25M , }; static int rk3288_set_speed(struct rk_priv_data *bsp_priv,
@@ -538,6 +537,7 @@ static const struct rk_gmac_ops rk3288_ops = { .clock_grf_reg = RK3288_GRF_SOC_CON1, .clock.gmii_clk_sel_mask = GENMASK_U16(13, 12), + .clock.mac_speed_mask = BIT_U16(10), };#define RK3308_GRF_MAC_CON0 0x04a0
@@ -545,16 +545,12 @@ static const struct rk_gmac_ops rk3288_ops = {/* RK3308_GRF_MAC_CON0 */ #define RK3308_GMAC_FLOW_CTRL GRF_BIT(3)#define RK3308_GMAC_FLOW_CTRL_CLR GRF_CLR_BIT(3) -#define RK3308_GMAC_SPEED_10M GRF_CLR_BIT(0) -#define RK3308_GMAC_SPEED_100M GRF_BIT(0)static void rk3308_set_to_rmii (struct rk_priv_data *bsp_priv) { }static const struct rk_reg_speed_data rk3308_reg_speed_data = { - .rmii_10 =RK3308_GMAC_SPEED_10M , - .rmii_100 =RK3308_GMAC_SPEED_100M , }; static int rk3308_set_speed(struct rk_priv_data *bsp_priv,
@@ -572,6 +568,7 @@ static const struct rk_gmac_ops rk3308_ops = { .gmac_phy_intf_sel_mask = GENMASK_U16(4, 2), .clock_grf_reg = RK3308_GRF_MAC_CON0, + .clock.mac_speed_mask = BIT_U16(0), };#define RK3328_GRF_MAC_CON0 0x0900
@@ -586,8 +583,6 @@ static const struct rk_gmac_ops rk3308_ops = {/* RK3328_GRF_MAC_CON1 */ #define RK3328_GMAC_FLOW_CTRL GRF_BIT(3)#define RK3328_GMAC_FLOW_CTRL_CLR GRF_CLR_BIT(3) -#define RK3328_GMAC_SPEED_10M GRF_CLR_BIT(2) -#define RK3328_GMAC_SPEED_100M GRF_BIT(2)#define RK3328_GMAC_RMII_CLK_25M GRF_BIT(7)#define RK3328_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(7)#define RK3328_GMAC_TXCLK_DLY_ENABLE GRF_BIT(0)
@@ -632,8 +627,8 @@ static void rk3328_set_to_rmii(struct rk_priv_data *bsp_priv) }static const struct rk_reg_speed_data rk3328_reg_speed_data = { - .rmii_10 =RK3328_GMAC_RMII_CLK_2_5M |RK3328_GMAC_SPEED_10M , - .rmii_100 =RK3328_GMAC_RMII_CLK_25M |RK3328_GMAC_SPEED_100M , + .rmii_10 =RK3328_GMAC_RMII_CLK_2_5M , + .rmii_100 =RK3328_GMAC_RMII_CLK_25M , }; static int rk3328_set_speed(struct rk_priv_data *bsp_priv,
@@ -662,6 +657,8 @@ static const struct rk_gmac_ops rk3328_ops = { .gmac_phy_intf_sel_mask = GENMASK_U16(6, 4), .gmac_rmii_mode_mask = BIT_U16(9), + .clock.mac_speed_mask = BIT_U16(2), + .regs_valid = true, .regs = { 0xff540000, /* gmac2io */
@@ -676,8 +673,6 @@ static const struct rk_gmac_ops rk3328_ops = {/* RK3366_GRF_SOC_CON6 */ #define RK3366_GMAC_FLOW_CTRL GRF_BIT(8)#define RK3366_GMAC_FLOW_CTRL_CLR GRF_CLR_BIT(8) -#define RK3366_GMAC_SPEED_10M GRF_CLR_BIT(7) -#define RK3366_GMAC_SPEED_100M GRF_BIT(7)#define RK3366_GMAC_RMII_CLK_25M GRF_BIT(3)#define RK3366_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(3)
@@ -703,8 +698,8 @@ static void rk3366_set_to_rmii(struct rk_priv_data *bsp_priv) }static const struct rk_reg_speed_data rk3366_reg_speed_data = { - .rmii_10 =RK3366_GMAC_RMII_CLK_2_5M |RK3366_GMAC_SPEED_10M , - .rmii_100 =RK3366_GMAC_RMII_CLK_25M |RK3366_GMAC_SPEED_100M , + .rmii_10 =RK3366_GMAC_RMII_CLK_2_5M , + .rmii_100 =RK3366_GMAC_RMII_CLK_25M , }; static int rk3366_set_speed(struct rk_priv_data *bsp_priv,
@@ -725,6 +720,7 @@ static const struct rk_gmac_ops rk3366_ops = { .clock_grf_reg = RK3366_GRF_SOC_CON6, .clock.gmii_clk_sel_mask = GENMASK_U16(5, 4), + .clock.mac_speed_mask = BIT_U16(7), };#define RK3368_GRF_SOC_CON15 0x043c
@@ -733,8 +729,6 @@ static const struct rk_gmac_ops rk3366_ops = {/* RK3368_GRF_SOC_CON15 */ #define RK3368_GMAC_FLOW_CTRL GRF_BIT(8)#define RK3368_GMAC_FLOW_CTRL_CLR GRF_CLR_BIT(8) -#define RK3368_GMAC_SPEED_10M GRF_CLR_BIT(7) -#define RK3368_GMAC_SPEED_100M GRF_BIT(7)#define RK3368_GMAC_RMII_CLK_25M GRF_BIT(3)#define RK3368_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(3)
@@ -760,8 +754,8 @@ static void rk3368_set_to_rmii(struct rk_priv_data *bsp_priv) }static const struct rk_reg_speed_data rk3368_reg_speed_data = { - .rmii_10 =RK3368_GMAC_RMII_CLK_2_5M |RK3368_GMAC_SPEED_10M , - .rmii_100 =RK3368_GMAC_RMII_CLK_25M |RK3368_GMAC_SPEED_100M , + .rmii_10 =RK3368_GMAC_RMII_CLK_2_5M , + .rmii_100 =RK3368_GMAC_RMII_CLK_25M , }; static int rk3368_set_speed(struct rk_priv_data *bsp_priv,
@@ -782,6 +776,7 @@ static const struct rk_gmac_ops rk3368_ops = { .clock_grf_reg = RK3368_GRF_SOC_CON15, .clock.gmii_clk_sel_mask = GENMASK_U16(5, 4), + .clock.mac_speed_mask = BIT_U16(7), };#define RK3399_GRF_SOC_CON5 0xc214
@@ -790,8 +785,6 @@ static const struct rk_gmac_ops rk3368_ops = {/* RK3399_GRF_SOC_CON5 */ #define RK3399_GMAC_FLOW_CTRL GRF_BIT(8)#define RK3399_GMAC_FLOW_CTRL_CLR GRF_CLR_BIT(8) -#define RK3399_GMAC_SPEED_10M GRF_CLR_BIT(7) -#define RK3399_GMAC_SPEED_100M GRF_BIT(7)#define RK3399_GMAC_RMII_CLK_25M GRF_BIT(3)#define RK3399_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(3)
@@ -817,8 +810,8 @@ static void rk3399_set_to_rmii(struct rk_priv_data *bsp_priv) }static const struct rk_reg_speed_data rk3399_reg_speed_data = { - .rmii_10 =RK3399_GMAC_RMII_CLK_2_5M |RK3399_GMAC_SPEED_10M , - .rmii_100 =RK3399_GMAC_RMII_CLK_25M |RK3399_GMAC_SPEED_100M , + .rmii_10 =RK3399_GMAC_RMII_CLK_2_5M , + .rmii_100 =RK3399_GMAC_RMII_CLK_25M , }; static int rk3399_set_speed(struct rk_priv_data *bsp_priv,
@@ -839,6 +832,7 @@ static const struct rk_gmac_ops rk3399_ops = { .clock_grf_reg = RK3399_GRF_SOC_CON5, .clock.gmii_clk_sel_mask = GENMASK_U16(5, 4), + .clock.mac_speed_mask = BIT_U16(7), };#define RK3506_GRF_SOC_CON8 0x0020
@@ -1384,8 +1378,6 @@ static const struct rk_gmac_ops rk3588_ops = {/* RV1108_GRF_GMAC_CON0 */ #define RV1108_GMAC_FLOW_CTRL GRF_BIT(3)#define RV1108_GMAC_FLOW_CTRL_CLR GRF_CLR_BIT(3) -#define RV1108_GMAC_SPEED_10M GRF_CLR_BIT(2) -#define RV1108_GMAC_SPEED_100M GRF_BIT(2)#define RV1108_GMAC_RMII_CLK_25M GRF_BIT(7)#define RV1108_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(7)
@@ -1394,8 +1386,8 @@ static void rv1108_set_to_rmii(struct rk_priv_data *bsp_priv) }static const struct rk_reg_speed_data rv1108_reg_speed_data = { - .rmii_10 =RV1108_GMAC_RMII_CLK_2_5M |RV1108_GMAC_SPEED_10M , - .rmii_100 =RV1108_GMAC_RMII_CLK_25M |RV1108_GMAC_SPEED_100M , + .rmii_10 =RV1108_GMAC_RMII_CLK_2_5M , + .rmii_100 =RV1108_GMAC_RMII_CLK_25M , }; static int rv1108_set_speed(struct rk_priv_data *bsp_priv,
@@ -1413,6 +1405,7 @@ static const struct rk_gmac_ops rv1108_ops = { .gmac_phy_intf_sel_mask = GENMASK_U16(6, 4), .clock_grf_reg = RV1108_GRF_GMAC_CON0, + .clock.mac_speed_mask = BIT_U16(2), };#define RV1126_GRF_GMAC_CON0 0X0070
Signature · 1 line
2.47.3
PATCH v2 14/22 net: stmmac: rk: use rk_encode_wm16() for RMII clock
In reply to Russell King (Oracle)The RMII clock is a single bit, which is set for 100M and clear for 10M. Move this out of struct rk_reg_speed_data (which gets rid of this structure) into the struct rk_clock_fields as the bitmask for this bit.
This gets rid of the per-SoC variability in the calls to rk_set_reg_speed().
--- .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 191 +++--------------- 1 file changed, 33 insertions(+), 158 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +33 -158
@@ -28,14 +28,10 @@ struct rk_priv_data;struct rk_clock_fields {u16 gmii_clk_sel_mask; +u16 rmii_clk_sel_mask;u16 mac_speed_mask; }; -struct rk_reg_speed_data { -unsigned int rmii_10; -unsigned int rmii_100; -}; -struct rk_gmac_ops {int (*init)(struct rk_priv_data *bsp_priv); void (*set_to_rgmii)(struct rk_priv_data *bsp_priv,
@@ -172,7 +168,6 @@ static int rk_write_clock_grf_reg(struct rk_priv_data *bsp_priv, u32 val) }static int rk_set_reg_speed (struct rk_priv_data *bsp_priv, -const struct rk_reg_speed_data *rsd,phy_interface_t interface,int speed) {unsigned int val;
@@ -186,17 +181,9 @@ static int rk_set_reg_speed(struct rk_priv_data *bsp_priv, val =rk_encode_wm16 (ret, bsp_priv->clock.gmii_clk_sel_mask); }else if (interface ==PHY_INTERFACE_MODE_RMII ) { val =rk_encode_wm16 (speed ==SPEED_100 , - bsp_priv->clock.mac_speed_mask); -if (speed ==SPEED_10 ) { - val |= rsd->rmii_10; - }else if (speed ==SPEED_100 ) { - val |= rsd->rmii_100; - }else { -/* Phylink will not allow inappropriate speeds for -* interface modes, so this should never happen. -*/ -return -EINVAL ; - } + bsp_priv->clock.mac_speed_mask) | +rk_encode_wm16 (speed ==SPEED_100 , + bsp_priv->clock.rmii_clk_sel_mask); }else {/* This should never happen, as .get_interfaces() limits * the interface modes that are supported to RGMII and/or
@@ -367,8 +354,6 @@ static const struct rk_gmac_ops px30_ops = {/* RK3128_GRF_MAC_CON1 */ #define RK3128_GMAC_FLOW_CTRL GRF_BIT(9)#define RK3128_GMAC_FLOW_CTRL_CLR GRF_CLR_BIT(9) -#define RK3128_GMAC_RMII_CLK_25M GRF_BIT(11) -#define RK3128_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(11)static void rk3128_set_to_rgmii (struct rk_priv_data *bsp_priv,int tx_delay,int rx_delay)
@@ -383,16 +368,10 @@ static void rk3128_set_to_rmii(struct rk_priv_data *bsp_priv) { } -static const struct rk_reg_speed_data rk3128_reg_speed_data = { - .rmii_10 =RK3128_GMAC_RMII_CLK_2_5M , - .rmii_100 =RK3128_GMAC_RMII_CLK_25M , -}; -static int rk3128_set_speed (struct rk_priv_data *bsp_priv,phy_interface_t interface,int speed) { -return rk_set_reg_speed (bsp_priv, &rk3128_reg_speed_data, - interface, speed); +return rk_set_reg_speed (bsp_priv, interface, speed); }static const struct rk_gmac_ops rk3128_ops = {
@@ -406,6 +385,7 @@ static const struct rk_gmac_ops rk3128_ops = { .clock_grf_reg = RK3128_GRF_MAC_CON1, .clock.gmii_clk_sel_mask = GENMASK_U16(13, 12), + .clock.rmii_clk_sel_mask = BIT_U16(11), .clock.mac_speed_mask = BIT_U16(10), };
@@ -421,8 +401,6 @@ static const struct rk_gmac_ops rk3128_ops = {/* RK3228_GRF_MAC_CON1 */ #define RK3228_GMAC_FLOW_CTRL GRF_BIT(3)#define RK3228_GMAC_FLOW_CTRL_CLR GRF_CLR_BIT(3) -#define RK3228_GMAC_RMII_CLK_25M GRF_BIT(7) -#define RK3228_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(7)#define RK3228_GMAC_TXCLK_DLY_ENABLE GRF_BIT(0)#define RK3228_GMAC_TXCLK_DLY_DISABLE GRF_CLR_BIT(0)#define RK3228_GMAC_RXCLK_DLY_ENABLE GRF_BIT(1)
@@ -448,16 +426,10 @@ static void rk3228_set_to_rmii(struct rk_priv_data *bsp_priv)regmap_write (bsp_priv->grf,RK3228_GRF_MAC_CON1 ,GRF_BIT (11 )); } -static const struct rk_reg_speed_data rk3228_reg_speed_data = { - .rmii_10 =RK3228_GMAC_RMII_CLK_2_5M , - .rmii_100 =RK3228_GMAC_RMII_CLK_25M , -}; -static int rk3228_set_speed (struct rk_priv_data *bsp_priv,phy_interface_t interface,int speed) { -return rk_set_reg_speed (bsp_priv, &rk3228_reg_speed_data, - interface, speed); +return rk_set_reg_speed (bsp_priv, interface, speed); }static void rk3228_integrated_phy_powerup (struct rk_priv_data *priv)
@@ -481,6 +453,7 @@ static const struct rk_gmac_ops rk3228_ops = { .clock_grf_reg = RK3228_GRF_MAC_CON1, .clock.gmii_clk_sel_mask = GENMASK_U16(9, 8), + .clock.rmii_clk_sel_mask = BIT_U16(7), .clock.mac_speed_mask = BIT_U16(2), };
@@ -490,8 +463,6 @@ static const struct rk_gmac_ops rk3228_ops = {/*RK3288_GRF_SOC_CON1*/ #define RK3288_GMAC_FLOW_CTRL GRF_BIT(9)#define RK3288_GMAC_FLOW_CTRL_CLR GRF_CLR_BIT(9) -#define RK3288_GMAC_RMII_CLK_25M GRF_BIT(11) -#define RK3288_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(11)/*RK3288_GRF_SOC_CON3*/ #define RK3288_GMAC_TXCLK_DLY_ENABLE GRF_BIT(14)
@@ -514,16 +485,10 @@ static void rk3288_set_to_rmii(struct rk_priv_data *bsp_priv) { } -static const struct rk_reg_speed_data rk3288_reg_speed_data = { - .rmii_10 =RK3288_GMAC_RMII_CLK_2_5M , - .rmii_100 =RK3288_GMAC_RMII_CLK_25M , -}; -static int rk3288_set_speed (struct rk_priv_data *bsp_priv,phy_interface_t interface,int speed) { -return rk_set_reg_speed (bsp_priv, &rk3288_reg_speed_data, - interface, speed); +return rk_set_reg_speed (bsp_priv, interface, speed); }static const struct rk_gmac_ops rk3288_ops = {
@@ -537,6 +502,7 @@ static const struct rk_gmac_ops rk3288_ops = { .clock_grf_reg = RK3288_GRF_SOC_CON1, .clock.gmii_clk_sel_mask = GENMASK_U16(13, 12), + .clock.rmii_clk_sel_mask = BIT_U16(11), .clock.mac_speed_mask = BIT_U16(10), };
@@ -550,14 +516,10 @@ static void rk3308_set_to_rmii(struct rk_priv_data *bsp_priv) { } -static const struct rk_reg_speed_data rk3308_reg_speed_data = { -}; -static int rk3308_set_speed (struct rk_priv_data *bsp_priv,phy_interface_t interface,int speed) { -return rk_set_reg_speed (bsp_priv, &rk3308_reg_speed_data, - interface, speed); +return rk_set_reg_speed (bsp_priv, interface, speed); }static const struct rk_gmac_ops rk3308_ops = {
@@ -583,8 +545,6 @@ static const struct rk_gmac_ops rk3308_ops = {/* RK3328_GRF_MAC_CON1 */ #define RK3328_GMAC_FLOW_CTRL GRF_BIT(3)#define RK3328_GMAC_FLOW_CTRL_CLR GRF_CLR_BIT(3) -#define RK3328_GMAC_RMII_CLK_25M GRF_BIT(7) -#define RK3328_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(7)#define RK3328_GMAC_TXCLK_DLY_ENABLE GRF_BIT(0)#define RK3328_GMAC_RXCLK_DLY_ENABLE GRF_BIT(1)
@@ -626,16 +586,10 @@ static void rk3328_set_to_rmii(struct rk_priv_data *bsp_priv) { } -static const struct rk_reg_speed_data rk3328_reg_speed_data = { - .rmii_10 =RK3328_GMAC_RMII_CLK_2_5M , - .rmii_100 =RK3328_GMAC_RMII_CLK_25M , -}; -static int rk3328_set_speed (struct rk_priv_data *bsp_priv,phy_interface_t interface,int speed) { -return rk_set_reg_speed (bsp_priv, &rk3328_reg_speed_data, - interface, speed); +return rk_set_reg_speed (bsp_priv, interface, speed); }static void rk3328_integrated_phy_powerup (struct rk_priv_data *priv)
@@ -657,6 +611,7 @@ static const struct rk_gmac_ops rk3328_ops = { .gmac_phy_intf_sel_mask = GENMASK_U16(6, 4), .gmac_rmii_mode_mask = BIT_U16(9), + .clock.rmii_clk_sel_mask = BIT_U16(7), .clock.mac_speed_mask = BIT_U16(2), .regs_valid = true,
@@ -673,8 +628,6 @@ static const struct rk_gmac_ops rk3328_ops = {/* RK3366_GRF_SOC_CON6 */ #define RK3366_GMAC_FLOW_CTRL GRF_BIT(8)#define RK3366_GMAC_FLOW_CTRL_CLR GRF_CLR_BIT(8) -#define RK3366_GMAC_RMII_CLK_25M GRF_BIT(3) -#define RK3366_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(3)/* RK3366_GRF_SOC_CON7 */ #define RK3366_GMAC_TXCLK_DLY_ENABLE GRF_BIT(7)
@@ -697,16 +650,10 @@ static void rk3366_set_to_rmii(struct rk_priv_data *bsp_priv) { } -static const struct rk_reg_speed_data rk3366_reg_speed_data = { - .rmii_10 =RK3366_GMAC_RMII_CLK_2_5M , - .rmii_100 =RK3366_GMAC_RMII_CLK_25M , -}; -static int rk3366_set_speed (struct rk_priv_data *bsp_priv,phy_interface_t interface,int speed) { -return rk_set_reg_speed (bsp_priv, &rk3366_reg_speed_data, - interface, speed); +return rk_set_reg_speed (bsp_priv, interface, speed); }static const struct rk_gmac_ops rk3366_ops = {
@@ -720,6 +667,7 @@ static const struct rk_gmac_ops rk3366_ops = { .clock_grf_reg = RK3366_GRF_SOC_CON6, .clock.gmii_clk_sel_mask = GENMASK_U16(5, 4), + .clock.rmii_clk_sel_mask = BIT_U16(3), .clock.mac_speed_mask = BIT_U16(7), };
@@ -729,8 +677,6 @@ static const struct rk_gmac_ops rk3366_ops = {/* RK3368_GRF_SOC_CON15 */ #define RK3368_GMAC_FLOW_CTRL GRF_BIT(8)#define RK3368_GMAC_FLOW_CTRL_CLR GRF_CLR_BIT(8) -#define RK3368_GMAC_RMII_CLK_25M GRF_BIT(3) -#define RK3368_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(3)/* RK3368_GRF_SOC_CON16 */ #define RK3368_GMAC_TXCLK_DLY_ENABLE GRF_BIT(7)
@@ -753,16 +699,10 @@ static void rk3368_set_to_rmii(struct rk_priv_data *bsp_priv) { } -static const struct rk_reg_speed_data rk3368_reg_speed_data = { - .rmii_10 =RK3368_GMAC_RMII_CLK_2_5M , - .rmii_100 =RK3368_GMAC_RMII_CLK_25M , -}; -static int rk3368_set_speed (struct rk_priv_data *bsp_priv,phy_interface_t interface,int speed) { -return rk_set_reg_speed (bsp_priv, &rk3368_reg_speed_data, - interface, speed); +return rk_set_reg_speed (bsp_priv, interface, speed); }static const struct rk_gmac_ops rk3368_ops = {
@@ -776,6 +716,7 @@ static const struct rk_gmac_ops rk3368_ops = { .clock_grf_reg = RK3368_GRF_SOC_CON15, .clock.gmii_clk_sel_mask = GENMASK_U16(5, 4), + .clock.rmii_clk_sel_mask = BIT_U16(3), .clock.mac_speed_mask = BIT_U16(7), };
@@ -785,8 +726,6 @@ static const struct rk_gmac_ops rk3368_ops = {/* RK3399_GRF_SOC_CON5 */ #define RK3399_GMAC_FLOW_CTRL GRF_BIT(8)#define RK3399_GMAC_FLOW_CTRL_CLR GRF_CLR_BIT(8) -#define RK3399_GMAC_RMII_CLK_25M GRF_BIT(3) -#define RK3399_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(3)/* RK3399_GRF_SOC_CON6 */ #define RK3399_GMAC_TXCLK_DLY_ENABLE GRF_BIT(7)
@@ -809,16 +748,10 @@ static void rk3399_set_to_rmii(struct rk_priv_data *bsp_priv) { } -static const struct rk_reg_speed_data rk3399_reg_speed_data = { - .rmii_10 =RK3399_GMAC_RMII_CLK_2_5M , - .rmii_100 =RK3399_GMAC_RMII_CLK_25M , -}; -static int rk3399_set_speed (struct rk_priv_data *bsp_priv,phy_interface_t interface,int speed) { -return rk_set_reg_speed (bsp_priv, &rk3399_reg_speed_data, - interface, speed); +return rk_set_reg_speed (bsp_priv, interface, speed); }static const struct rk_gmac_ops rk3399_ops = {
@@ -832,6 +765,7 @@ static const struct rk_gmac_ops rk3399_ops = { .clock_grf_reg = RK3399_GRF_SOC_CON5, .clock.gmii_clk_sel_mask = GENMASK_U16(5, 4), + .clock.rmii_clk_sel_mask = BIT_U16(3), .clock.mac_speed_mask = BIT_U16(7), };
@@ -840,9 +774,6 @@ static const struct rk_gmac_ops rk3399_ops = {#define RK3506_GMAC_RMII_MODE GRF_BIT(1) -#define RK3506_GMAC_CLK_RMII_DIV2 GRF_BIT(3) -#define RK3506_GMAC_CLK_RMII_DIV20 GRF_CLR_BIT(3) -#define RK3506_GMAC_CLK_SELECT_CRU GRF_CLR_BIT(5)#define RK3506_GMAC_CLK_SELECT_IO GRF_BIT(5)
@@ -873,16 +804,10 @@ static void rk3506_set_to_rmii(struct rk_priv_data *bsp_priv)regmap_write (bsp_priv->grf, offset,RK3506_GMAC_RMII_MODE ); } -static const struct rk_reg_speed_data rk3506_reg_speed_data = { - .rmii_10 =RK3506_GMAC_CLK_RMII_DIV20 , - .rmii_100 =RK3506_GMAC_CLK_RMII_DIV2 , -}; -static int rk3506_set_speed (struct rk_priv_data *bsp_priv,phy_interface_t interface,int speed) { -return rk_set_reg_speed (bsp_priv, &rk3506_reg_speed_data, - interface, speed); +return rk_set_reg_speed (bsp_priv, interface, speed); } static void rk3506_set_clock_selection(struct rk_priv_data *bsp_priv,
@@ -904,6 +829,9 @@ static const struct rk_gmac_ops rk3506_ops = { .set_to_rmii = rk3506_set_to_rmii, .set_speed = rk3506_set_speed, .set_clock_selection = rk3506_set_clock_selection, + + .clock.rmii_clk_sel_mask = BIT_U16(3), + .regs_valid = true, .regs = { 0xff4c8000, /* gmac0 */
@@ -933,11 +861,6 @@ static const struct rk_gmac_ops rk3506_ops = {#define RK3528_GMAC1_CLK_SELECT_CRU GRF_CLR_BIT(12)#define RK3528_GMAC1_CLK_SELECT_IO GRF_BIT(12) -#define RK3528_GMAC0_CLK_RMII_DIV2 GRF_BIT(3) -#define RK3528_GMAC0_CLK_RMII_DIV20 GRF_CLR_BIT(3) -#define RK3528_GMAC1_CLK_RMII_DIV2 GRF_BIT(10) -#define RK3528_GMAC1_CLK_RMII_DIV20 GRF_CLR_BIT(10) -#define RK3528_GMAC0_CLK_RMII_GATE GRF_BIT(2)#define RK3528_GMAC0_CLK_RMII_NOGATE GRF_CLR_BIT(2)#define RK3528_GMAC1_CLK_RMII_GATE GRF_BIT(9)
@@ -948,11 +871,13 @@ static int rk3528_init(struct rk_priv_data *bsp_priv)switch (bsp_priv->id) {case 0 : bsp_priv->clock_grf_reg =RK3528_VO_GRF_GMAC_CON ; + bsp_priv->clock.rmii_clk_sel_mask =BIT_U16 (3 );return 0 ;case 1 : bsp_priv->clock_grf_reg =RK3528_VPU_GRF_GMAC_CON5 ; bsp_priv->clock.gmii_clk_sel_mask =GENMASK_U16 (11 ,10 ); + bsp_priv->clock.rmii_clk_sel_mask =BIT_U16 (10 );return 0 ;default :
@@ -984,27 +909,10 @@ static void rk3528_set_to_rmii(struct rk_priv_data *bsp_priv) RK3528_GMAC0_PHY_INTF_SEL_RMII); } -static const struct rk_reg_speed_data rk3528_gmac0_reg_speed_data = { - .rmii_10 =RK3528_GMAC0_CLK_RMII_DIV20 , - .rmii_100 =RK3528_GMAC0_CLK_RMII_DIV2 , -}; - -static const struct rk_reg_speed_data rk3528_gmac1_reg_speed_data = { - .rmii_10 =RK3528_GMAC1_CLK_RMII_DIV20 , - .rmii_100 =RK3528_GMAC1_CLK_RMII_DIV2 , -}; -static int rk3528_set_speed (struct rk_priv_data *bsp_priv,phy_interface_t interface,int speed) { -const struct rk_reg_speed_data *rsd; - -if (bsp_priv->id ==1 ) - rsd = &rk3528_gmac1_reg_speed_data; -else - rsd = &rk3528_gmac0_reg_speed_data; - -return rk_set_reg_speed (bsp_priv, rsd, interface, speed); +return rk_set_reg_speed (bsp_priv, interface, speed); } static void rk3528_set_clock_selection(struct rk_priv_data *bsp_priv,
@@ -1144,9 +1052,6 @@ static const struct rk_gmac_ops rk3568_ops = {#define RK3576_GMAC_CLK_SELECT_IO GRF_BIT(7)#define RK3576_GMAC_CLK_SELECT_CRU GRF_CLR_BIT(7) -#define RK3576_GMAC_CLK_RMII_DIV2 GRF_BIT(5) -#define RK3576_GMAC_CLK_RMII_DIV20 GRF_CLR_BIT(5) -#define RK3576_GMAC_CLK_RMII_GATE GRF_BIT(4)#define RK3576_GMAC_CLK_RMII_NOGATE GRF_CLR_BIT(4)
@@ -1195,16 +1100,10 @@ static void rk3576_set_to_rmii(struct rk_priv_data *bsp_priv) { } -static const struct rk_reg_speed_data rk3578_reg_speed_data = { - .rmii_10 =RK3576_GMAC_CLK_RMII_DIV20 , - .rmii_100 =RK3576_GMAC_CLK_RMII_DIV2 , -}; -static int rk3576_set_gmac_speed (struct rk_priv_data *bsp_priv,phy_interface_t interface,int speed) { -return rk_set_reg_speed (bsp_priv, &rk3578_reg_speed_data, - interface, speed); +return rk_set_reg_speed (bsp_priv, interface, speed); } static void rk3576_set_clock_selection(struct rk_priv_data *bsp_priv, bool input,
@@ -1233,6 +1132,7 @@ static const struct rk_gmac_ops rk3576_ops = { .gmac_rmii_mode_mask = BIT_U16(3), .clock.gmii_clk_sel_mask = GENMASK_U16(6, 5), + .clock.rmii_clk_sel_mask = BIT_U16(5), .php_grf_required = true, .regs_valid = true,
@@ -1266,9 +1166,6 @@ static const struct rk_gmac_ops rk3576_ops = {#define RK3588_GMAC_CLK_SELECT_CRU (id) GRF_BIT(5 * (id) + 4)#define RK3588_GMAC_CLK_SELECT_IO (id) GRF_CLR_BIT(5 * (id) + 4) -#define RK3588_GMA_CLK_RMII_DIV2 (id) GRF_BIT(5 * (id) + 2) -#define RK3588_GMA_CLK_RMII_DIV20 (id) GRF_CLR_BIT(5 * (id) + 2) -#define RK3588_GMAC_CLK_RMII_GATE (id) GRF_BIT(5 * (id) + 1)#define RK3588_GMAC_CLK_RMII_NOGATE (id) GRF_CLR_BIT(5 * (id) + 1)
@@ -1278,11 +1175,13 @@ static int rk3588_init(struct rk_priv_data *bsp_priv)case 0 : bsp_priv->gmac_phy_intf_sel_mask =GENMASK_U16 (5 ,3 ); bsp_priv->clock.gmii_clk_sel_mask =GENMASK_U16 (3 ,2 ); + bsp_priv->clock.rmii_clk_sel_mask =BIT_U16 (2 );return 0 ;case 1 : bsp_priv->gmac_phy_intf_sel_mask =GENMASK_U16 (11 ,9 ); bsp_priv->clock.gmii_clk_sel_mask =GENMASK_U16 (8 ,7 ); + bsp_priv->clock.rmii_clk_sel_mask =BIT_U16 (7 );return 0 ;default :
@@ -1316,27 +1215,10 @@ static void rk3588_set_to_rmii(struct rk_priv_data *bsp_priv) RK3588_GMAC_CLK_RMII_MODE(bsp_priv->id)); } -static const struct rk_reg_speed_data rk3588_gmac0_speed_data = { - .rmii_10 =RK3588_GMA_CLK_RMII_DIV20 (0 ), - .rmii_100 =RK3588_GMA_CLK_RMII_DIV2 (0 ), -}; - -static const struct rk_reg_speed_data rk3588_gmac1_speed_data = { - .rmii_10 =RK3588_GMA_CLK_RMII_DIV20 (1 ), - .rmii_100 =RK3588_GMA_CLK_RMII_DIV2 (1 ), -}; -static int rk3588_set_gmac_speed (struct rk_priv_data *bsp_priv,phy_interface_t interface,int speed) { -const struct rk_reg_speed_data *rsd; - -if (bsp_priv->id ==0 ) - rsd = &rk3588_gmac0_speed_data; -else - rsd = &rk3588_gmac1_speed_data; - -return rk_set_reg_speed (bsp_priv, rsd, interface, speed); +return rk_set_reg_speed (bsp_priv, interface, speed); } static void rk3588_set_clock_selection(struct rk_priv_data *bsp_priv, bool input,
@@ -1378,23 +1260,15 @@ static const struct rk_gmac_ops rk3588_ops = {/* RV1108_GRF_GMAC_CON0 */ #define RV1108_GMAC_FLOW_CTRL GRF_BIT(3)#define RV1108_GMAC_FLOW_CTRL_CLR GRF_CLR_BIT(3) -#define RV1108_GMAC_RMII_CLK_25M GRF_BIT(7) -#define RV1108_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(7)static void rv1108_set_to_rmii (struct rk_priv_data *bsp_priv) { } -static const struct rk_reg_speed_data rv1108_reg_speed_data = { - .rmii_10 =RV1108_GMAC_RMII_CLK_2_5M , - .rmii_100 =RV1108_GMAC_RMII_CLK_25M , -}; -static int rv1108_set_speed (struct rk_priv_data *bsp_priv,phy_interface_t interface,int speed) { -return rk_set_reg_speed (bsp_priv, &rv1108_reg_speed_data, - interface, speed); +return rk_set_reg_speed (bsp_priv, interface, speed); }static const struct rk_gmac_ops rv1108_ops = {
@@ -1405,6 +1279,7 @@ static const struct rk_gmac_ops rv1108_ops = { .gmac_phy_intf_sel_mask = GENMASK_U16(6, 4), .clock_grf_reg = RV1108_GRF_GMAC_CON0, + .clock.rmii_clk_sel_mask = BIT_U16(7), .clock.mac_speed_mask = BIT_U16(2), };
Signature · 1 line
2.47.3
PATCH v2 15/22 net: stmmac: rk: remove need for ->set_speed() method
In reply to Russell King (Oracle)As we can detect whether the SoC provides the parameters necessary for rk_set_reg_speed(), we don't need to have explicit calls to this. Instead, we can move the contents of this function to rk_set_clk_tx_rate().
This remsoves all the .set_speed() implementations that merely go on to invoke rk_set_reg_speed().
--- .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 153 ++++-------------- 1 file changed, 28 insertions(+), 125 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +28 -125
@@ -167,37 +167,6 @@ static int rk_write_clock_grf_reg(struct rk_priv_data *bsp_priv, u32 val)return regmap_write (regmap, bsp_priv->clock_grf_reg, val); } -static int rk_set_reg_speed (struct rk_priv_data *bsp_priv, -phy_interface_t interface,int speed) -{ -unsigned int val; -int ret; - -if (phy_interface_mode_is_rgmii (interface)) { - ret =rk_gmac_rgmii_clk_div (speed); -if (ret <0 ) -return ret; - - val =rk_encode_wm16 (ret, bsp_priv->clock.gmii_clk_sel_mask); - }else if (interface ==PHY_INTERFACE_MODE_RMII ) { - val =rk_encode_wm16 (speed ==SPEED_100 , - bsp_priv->clock.mac_speed_mask) | -rk_encode_wm16 (speed ==SPEED_100 , - bsp_priv->clock.rmii_clk_sel_mask); - }else { -/* This should never happen, as .get_interfaces() limits -* the interface modes that are supported to RGMII and/or -* RMII. -*/ -return -EINVAL ; - } - -rk_write_clock_grf_reg (bsp_priv, val); - -return 0 ; - -} -static int rk_set_clk_mac_speed (struct rk_priv_data *bsp_priv,phy_interface_t interface,int speed) {
@@ -368,16 +337,9 @@ static void rk3128_set_to_rmii(struct rk_priv_data *bsp_priv) { } -static int rk3128_set_speed (struct rk_priv_data *bsp_priv, -phy_interface_t interface,int speed) -{ -return rk_set_reg_speed (bsp_priv, interface, speed); -} -static const struct rk_gmac_ops rk3128_ops = { .set_to_rgmii = rk3128_set_to_rgmii, .set_to_rmii = rk3128_set_to_rmii, - .set_speed = rk3128_set_speed, .gmac_grf_reg =RK3128_GRF_MAC_CON1 , .gmac_phy_intf_sel_mask =GENMASK_U16 (8 ,6 ),
@@ -426,12 +388,6 @@ static void rk3228_set_to_rmii(struct rk_priv_data *bsp_priv)regmap_write (bsp_priv->grf,RK3228_GRF_MAC_CON1 ,GRF_BIT (11 )); } -static int rk3228_set_speed (struct rk_priv_data *bsp_priv, -phy_interface_t interface,int speed) -{ -return rk_set_reg_speed (bsp_priv, interface, speed); -} -static void rk3228_integrated_phy_powerup (struct rk_priv_data *priv) { regmap_write(priv->grf, RK3228_GRF_CON_MUX,
@@ -443,7 +399,6 @@ static void rk3228_integrated_phy_powerup(struct rk_priv_data *priv)static const struct rk_gmac_ops rk3228_ops = { .set_to_rgmii = rk3228_set_to_rgmii, .set_to_rmii = rk3228_set_to_rmii, - .set_speed = rk3228_set_speed, .integrated_phy_powerup = rk3228_integrated_phy_powerup, .integrated_phy_powerdown = rk_gmac_integrated_ephy_powerdown,
@@ -485,16 +440,9 @@ static void rk3288_set_to_rmii(struct rk_priv_data *bsp_priv) { } -static int rk3288_set_speed (struct rk_priv_data *bsp_priv, -phy_interface_t interface,int speed) -{ -return rk_set_reg_speed (bsp_priv, interface, speed); -} -static const struct rk_gmac_ops rk3288_ops = { .set_to_rgmii = rk3288_set_to_rgmii, .set_to_rmii = rk3288_set_to_rmii, - .set_speed = rk3288_set_speed, .gmac_grf_reg =RK3288_GRF_SOC_CON1 , .gmac_phy_intf_sel_mask =GENMASK_U16 (8 ,6 ),
@@ -516,15 +464,8 @@ static void rk3308_set_to_rmii(struct rk_priv_data *bsp_priv) { } -static int rk3308_set_speed (struct rk_priv_data *bsp_priv, -phy_interface_t interface,int speed) -{ -return rk_set_reg_speed (bsp_priv, interface, speed); -} -static const struct rk_gmac_ops rk3308_ops = { .set_to_rmii = rk3308_set_to_rmii, - .set_speed = rk3308_set_speed, .gmac_grf_reg =RK3308_GRF_MAC_CON0 , .gmac_phy_intf_sel_mask =GENMASK_U16 (4 ,2 ),
@@ -586,12 +527,6 @@ static void rk3328_set_to_rmii(struct rk_priv_data *bsp_priv) { } -static int rk3328_set_speed (struct rk_priv_data *bsp_priv, -phy_interface_t interface,int speed) -{ -return rk_set_reg_speed (bsp_priv, interface, speed); -} -static void rk3328_integrated_phy_powerup (struct rk_priv_data *priv) { regmap_write(priv->grf, RK3328_GRF_MACPHY_CON1,
@@ -604,7 +539,6 @@ static const struct rk_gmac_ops rk3328_ops = { .init = rk3328_init, .set_to_rgmii = rk3328_set_to_rgmii, .set_to_rmii = rk3328_set_to_rmii, - .set_speed = rk3328_set_speed, .integrated_phy_powerup = rk3328_integrated_phy_powerup, .integrated_phy_powerdown = rk_gmac_integrated_ephy_powerdown,
@@ -650,16 +584,9 @@ static void rk3366_set_to_rmii(struct rk_priv_data *bsp_priv) { } -static int rk3366_set_speed (struct rk_priv_data *bsp_priv, -phy_interface_t interface,int speed) -{ -return rk_set_reg_speed (bsp_priv, interface, speed); -} -static const struct rk_gmac_ops rk3366_ops = { .set_to_rgmii = rk3366_set_to_rgmii, .set_to_rmii = rk3366_set_to_rmii, - .set_speed = rk3366_set_speed, .gmac_grf_reg =RK3366_GRF_SOC_CON6 , .gmac_phy_intf_sel_mask =GENMASK_U16 (11 ,9 ),
@@ -699,16 +626,9 @@ static void rk3368_set_to_rmii(struct rk_priv_data *bsp_priv) { } -static int rk3368_set_speed (struct rk_priv_data *bsp_priv, -phy_interface_t interface,int speed) -{ -return rk_set_reg_speed (bsp_priv, interface, speed); -} -static const struct rk_gmac_ops rk3368_ops = { .set_to_rgmii = rk3368_set_to_rgmii, .set_to_rmii = rk3368_set_to_rmii, - .set_speed = rk3368_set_speed, .gmac_grf_reg =RK3368_GRF_SOC_CON15 , .gmac_phy_intf_sel_mask =GENMASK_U16 (11 ,9 ),
@@ -748,16 +668,9 @@ static void rk3399_set_to_rmii(struct rk_priv_data *bsp_priv) { } -static int rk3399_set_speed (struct rk_priv_data *bsp_priv, -phy_interface_t interface,int speed) -{ -return rk_set_reg_speed (bsp_priv, interface, speed); -} -static const struct rk_gmac_ops rk3399_ops = { .set_to_rgmii = rk3399_set_to_rgmii, .set_to_rmii = rk3399_set_to_rmii, - .set_speed = rk3399_set_speed, .gmac_grf_reg =RK3399_GRF_SOC_CON5 , .gmac_phy_intf_sel_mask =GENMASK_U16 (11 ,9 ),
@@ -804,12 +717,6 @@ static void rk3506_set_to_rmii(struct rk_priv_data *bsp_priv)regmap_write (bsp_priv->grf, offset,RK3506_GMAC_RMII_MODE ); } -static int rk3506_set_speed (struct rk_priv_data *bsp_priv, -phy_interface_t interface,int speed) -{ -return rk_set_reg_speed (bsp_priv, interface, speed); -} -static void rk3506_set_clock_selection (struct rk_priv_data *bsp_priv,bool input,bool enable) {
@@ -827,7 +734,6 @@ static void rk3506_set_clock_selection(struct rk_priv_data *bsp_priv,static const struct rk_gmac_ops rk3506_ops = { .init = rk3506_init, .set_to_rmii = rk3506_set_to_rmii, - .set_speed = rk3506_set_speed, .set_clock_selection = rk3506_set_clock_selection, .clock.rmii_clk_sel_mask =BIT_U16 (3 ),
@@ -909,12 +815,6 @@ static void rk3528_set_to_rmii(struct rk_priv_data *bsp_priv) RK3528_GMAC0_PHY_INTF_SEL_RMII); } -static int rk3528_set_speed (struct rk_priv_data *bsp_priv, -phy_interface_t interface,int speed) -{ -return rk_set_reg_speed (bsp_priv, interface, speed); -} -static void rk3528_set_clock_selection (struct rk_priv_data *bsp_priv,bool input,bool enable) {
@@ -947,7 +847,6 @@ static const struct rk_gmac_ops rk3528_ops = { .init = rk3528_init, .set_to_rgmii = rk3528_set_to_rgmii, .set_to_rmii = rk3528_set_to_rmii, - .set_speed = rk3528_set_speed, .set_clock_selection = rk3528_set_clock_selection, .integrated_phy_powerup = rk3528_integrated_phy_powerup, .integrated_phy_powerdown = rk3528_integrated_phy_powerdown,
@@ -1100,12 +999,6 @@ static void rk3576_set_to_rmii(struct rk_priv_data *bsp_priv) { } -static int rk3576_set_gmac_speed (struct rk_priv_data *bsp_priv, -phy_interface_t interface,int speed) -{ -return rk_set_reg_speed (bsp_priv, interface, speed); -} -static void rk3576_set_clock_selection (struct rk_priv_data *bsp_priv,bool input,bool enable) {
@@ -1126,7 +1019,6 @@ static const struct rk_gmac_ops rk3576_ops = { .init = rk3576_init, .set_to_rgmii = rk3576_set_to_rgmii, .set_to_rmii = rk3576_set_to_rmii, - .set_speed = rk3576_set_gmac_speed, .set_clock_selection = rk3576_set_clock_selection, .gmac_rmii_mode_mask = BIT_U16(3),
@@ -1215,12 +1107,6 @@ static void rk3588_set_to_rmii(struct rk_priv_data *bsp_priv) RK3588_GMAC_CLK_RMII_MODE(bsp_priv->id)); } -static int rk3588_set_gmac_speed (struct rk_priv_data *bsp_priv, -phy_interface_t interface,int speed) -{ -return rk_set_reg_speed (bsp_priv, interface, speed); -} -static void rk3588_set_clock_selection (struct rk_priv_data *bsp_priv,bool input,bool enable) {
@@ -1237,7 +1123,6 @@ 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_in_php = true,
@@ -1265,15 +1150,8 @@ static void rv1108_set_to_rmii(struct rk_priv_data *bsp_priv) { } -static int rv1108_set_speed (struct rk_priv_data *bsp_priv, -phy_interface_t interface,int speed) -{ -return rk_set_reg_speed (bsp_priv, interface, speed); -} -static const struct rk_gmac_ops rv1108_ops = { .set_to_rmii = rv1108_set_to_rmii, - .set_speed = rv1108_set_speed, .gmac_grf_reg =RV1108_GRF_GMAC_CON0 , .gmac_phy_intf_sel_mask =GENMASK_U16 (6 ,4 ),
@@ -1702,11 +1580,36 @@ static int rk_set_clk_tx_rate(void *bsp_priv_, struct clk *clk_tx_i, phy_interface_t interface, int speed) {struct rk_priv_data *bsp_priv = bsp_priv_; +int ret = -EINVAL ; +bool is_100m; +u32 val; -if (bsp_priv->ops->set_speed) -return bsp_priv->ops->set_speed (bsp_priv, interface, speed); +if (bsp_priv->ops->set_speed) { + ret = bsp_priv->ops->set_speed (bsp_priv, interface, speed); +if (ret <0 ) +return ret; + } -return -EINVAL ; +if (phy_interface_mode_is_rgmii (interface) && + bsp_priv->clock.gmii_clk_sel_mask) { + ret =rk_gmac_rgmii_clk_div (speed); +if (ret <0 ) +return ret; + + val =rk_encode_wm16 (ret, bsp_priv->clock.gmii_clk_sel_mask); + + ret =rk_write_clock_grf_reg (bsp_priv, val); + }else if (interface ==PHY_INTERFACE_MODE_RMII && + (bsp_priv->clock.rmii_clk_sel_mask || + bsp_priv->clock.mac_speed_mask)) { + is_100m = speed ==SPEED_100 ; + val =rk_encode_wm16 (is_100m, bsp_priv->clock.mac_speed_mask) | +rk_encode_wm16 (is_100m, bsp_priv->clock.rmii_clk_sel_mask); + + ret =rk_write_clock_grf_reg (bsp_priv, val); + } + +return ret; }static int rk_gmac_suspend (struct device *dev,void *bsp_priv_)
Signature · 1 line
2.47.3
PATCH v2 16/22 net: stmmac: rk: convert px30
In reply to Russell King (Oracle)Use rk_set_clk_mac_speed() rather than px30 specific function for configuring RMII clock.
--- .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 38 ++----------------- 1 file changed, 4 insertions(+), 34 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +4 -34
@@ -264,49 +264,19 @@ static void rk_gmac_integrated_fephy_powerdown(struct rk_priv_data *priv,#define PX30_GRF_GMAC_CON1 0x0904 -/* PX30_GRF_GMAC_CON1 */ -#define PX30_GMAC_SPEED_10M GRF_CLR_BIT(2) -#define PX30_GMAC_SPEED_100M GRF_BIT(2) -static void px30_set_to_rmii (struct rk_priv_data *bsp_priv) { } -static int px30_set_speed (struct rk_priv_data *bsp_priv, -phy_interface_t interface,int speed) -{ -struct clk *clk_mac_speed = bsp_priv->clks[RK_CLK_MAC_SPEED ].clk; -struct device *dev = bsp_priv->dev; -unsigned int con1; -long rate; - -if (!clk_mac_speed) { -dev_err (dev,"%s: Missing clk_mac_speed clock\n" , __func__); -return -EINVAL ; - } - -if (speed ==10 ) { - con1 =PX30_GMAC_SPEED_10M ; - rate =2500000 ; - }else if (speed ==100 ) { - con1 =PX30_GMAC_SPEED_100M ; - rate =25000000 ; - }else { -dev_err (dev,"unknown speed value for RMII! speed=%d" , speed); -return -EINVAL ; - } - -regmap_write (bsp_priv->grf,PX30_GRF_GMAC_CON1 , con1); - -return clk_set_rate (clk_mac_speed, rate); -} -static const struct rk_gmac_ops px30_ops = { .set_to_rmii = px30_set_to_rmii, - .set_speed = px30_set_speed, + .set_speed = rk_set_clk_mac_speed, .gmac_grf_reg =PX30_GRF_GMAC_CON1 , .gmac_phy_intf_sel_mask =GENMASK_U16 (6 ,4 ), + + .clock_grf_reg =PX30_GRF_GMAC_CON1 , + .clock.mac_speed_mask =BIT_U16 (2 ), };#define RK3128_GRF_MAC_CON0 0x0168
Signature · 1 line
2.47.3
PATCH v2 17/22 net: stmmac: rk: introduce flags indicating support for RGMII/RMII
In reply to Russell King (Oracle)Introduce two boolean flags into struct rk_priv_data indicating whether RGMII and/or RMII is supported for this instance. Use these to configure the supported_interfaces mask for phylink, validate the interface mode. Initialise these from equivalent flags in the rk_gmac_ops or depending on the presence of the ops->set_to_rgmii and ops->set_to_mii methods. Finally, make ops->set_to_* optional.
This will allow us to get rid of empty set_to_rmii() methods.
--- .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 35 +++++++++++++------ 1 file changed, 25 insertions(+), 10 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +25 -10
@@ -53,6 +53,8 @@ struct rk_gmac_ops {bool gmac_grf_reg_in_php;bool clock_grf_reg_in_php; +bool supports_rgmii; +bool supports_rmii;bool php_grf_required;bool regs_valid;u32 regs[];
@@ -86,6 +88,8 @@ struct rk_priv_data {bool clk_enabled;bool clock_input;bool integrated_phy; +bool supports_rgmii; +bool supports_rmii;struct clk_bulk_data *clks;int num_clks;
@@ -1415,6 +1419,9 @@ static struct rk_priv_data *rk_gmac_setup(struct platform_device *pdev, bsp_priv->clock_grf_reg = ops->clock_grf_reg; bsp_priv->clock = ops->clock; + bsp_priv->supports_rgmii = ops->supports_rgmii || !!ops->set_to_rgmii; + bsp_priv->supports_rmii = ops->supports_rmii || !!ops->set_to_rmii; +if (ops->init) { ret = ops->init (bsp_priv);if (ret) {
@@ -1433,11 +1440,11 @@ static int rk_gmac_check_ops(struct rk_priv_data *bsp_priv)case PHY_INTERFACE_MODE_RGMII_ID :case PHY_INTERFACE_MODE_RGMII_RXID :case PHY_INTERFACE_MODE_RGMII_TXID : -if (!bsp_priv->ops->set_to_rgmii) +if (!bsp_priv->supports_rgmii)return -EINVAL ;break ;case PHY_INTERFACE_MODE_RMII : -if (!bsp_priv->ops->set_to_rmii) +if (!bsp_priv->supports_rmii)return -EINVAL ;break ;default :
@@ -1486,24 +1493,32 @@ static int rk_gmac_powerup(struct rk_priv_data *bsp_priv)switch (bsp_priv->phy_iface) {case PHY_INTERFACE_MODE_RGMII :dev_info (dev,"init for RGMII\n" ); - bsp_priv->ops->set_to_rgmii (bsp_priv, bsp_priv->tx_delay, - bsp_priv->rx_delay); +if (bsp_priv->ops->set_to_rgmii) + bsp_priv->ops->set_to_rgmii (bsp_priv, + bsp_priv->tx_delay, + bsp_priv->rx_delay);break ;case PHY_INTERFACE_MODE_RGMII_ID :dev_info (dev,"init for RGMII_ID\n" ); - bsp_priv->ops->set_to_rgmii (bsp_priv,0 ,0 ); +if (bsp_priv->ops->set_to_rgmii) + bsp_priv->ops->set_to_rgmii (bsp_priv,0 ,0 );break ;case PHY_INTERFACE_MODE_RGMII_RXID :dev_info (dev,"init for RGMII_RXID\n" ); - bsp_priv->ops->set_to_rgmii (bsp_priv, bsp_priv->tx_delay,0 ); +if (bsp_priv->ops->set_to_rgmii) + bsp_priv->ops->set_to_rgmii (bsp_priv, + bsp_priv->tx_delay,0 );break ;case PHY_INTERFACE_MODE_RGMII_TXID :dev_info (dev,"init for RGMII_TXID\n" ); - bsp_priv->ops->set_to_rgmii (bsp_priv,0 , bsp_priv->rx_delay); +if (bsp_priv->ops->set_to_rgmii) + bsp_priv->ops->set_to_rgmii (bsp_priv, +0 , bsp_priv->rx_delay);break ;case PHY_INTERFACE_MODE_RMII :dev_info (dev,"init for RMII\n" ); - bsp_priv->ops->set_to_rmii (bsp_priv); +if (bsp_priv->ops->set_to_rmii) + bsp_priv->ops->set_to_rmii (bsp_priv);break ;default :dev_err (dev,"NO interface defined!\n" );
@@ -1539,10 +1554,10 @@ static void rk_get_interfaces(struct stmmac_priv *priv, void *bsp_priv, {struct rk_priv_data *rk = bsp_priv; -if (rk->ops->set_to_rgmii) +if (rk->supports_rgmii)phy_interface_set_rgmii (interfaces); -if (rk->ops->set_to_rmii) +if (rk->supports_rmii)__set_bit (PHY_INTERFACE_MODE_RMII , interfaces); }
Signature · 1 line
2.47.3
PATCH v2 18/22 net: stmmac: rk: replace empty set_to_rmii() with supports_rmii
In reply to Russell King (Oracle)Rather than providing a now-empty set_to_rmii() method to indicate that RMII is supported, switch to setting ops->supports_rmii instead.
--- .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 86 ++++++------------- 1 file changed, 24 insertions(+), 62 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +24 -62
@@ -268,12 +268,7 @@ static void rk_gmac_integrated_fephy_powerdown(struct rk_priv_data *priv,#define PX30_GRF_GMAC_CON1 0x0904 -static void px30_set_to_rmii (struct rk_priv_data *bsp_priv) -{ -} -static const struct rk_gmac_ops px30_ops = { - .set_to_rmii = px30_set_to_rmii, .set_speed = rk_set_clk_mac_speed, .gmac_grf_reg =PX30_GRF_GMAC_CON1 ,
@@ -281,6 +276,8 @@ static const struct rk_gmac_ops px30_ops = { .clock_grf_reg = PX30_GRF_GMAC_CON1, .clock.mac_speed_mask = BIT_U16(2), + + .supports_rmii = true, };#define RK3128_GRF_MAC_CON0 0x0168
@@ -307,13 +304,8 @@ static void rk3128_set_to_rgmii(struct rk_priv_data *bsp_priv, RK3128_GMAC_CLK_TX_DL_CFG(tx_delay)); } -static void rk3128_set_to_rmii (struct rk_priv_data *bsp_priv) -{ -} -static const struct rk_gmac_ops rk3128_ops = { .set_to_rgmii = rk3128_set_to_rgmii, - .set_to_rmii = rk3128_set_to_rmii, .gmac_grf_reg =RK3128_GRF_MAC_CON1 , .gmac_phy_intf_sel_mask =GENMASK_U16 (8 ,6 ),
@@ -323,6 +315,8 @@ static const struct rk_gmac_ops rk3128_ops = { .clock.gmii_clk_sel_mask = GENMASK_U16(13, 12), .clock.rmii_clk_sel_mask = BIT_U16(11), .clock.mac_speed_mask = BIT_U16(10), + + .supports_rmii = true, };#define RK3228_GRF_MAC_CON0 0x0900
@@ -410,13 +404,8 @@ static void rk3288_set_to_rgmii(struct rk_priv_data *bsp_priv, RK3288_GMAC_CLK_TX_DL_CFG(tx_delay)); } -static void rk3288_set_to_rmii (struct rk_priv_data *bsp_priv) -{ -} -static const struct rk_gmac_ops rk3288_ops = { .set_to_rgmii = rk3288_set_to_rgmii, - .set_to_rmii = rk3288_set_to_rmii, .gmac_grf_reg =RK3288_GRF_SOC_CON1 , .gmac_phy_intf_sel_mask =GENMASK_U16 (8 ,6 ),
@@ -426,6 +415,8 @@ static const struct rk_gmac_ops rk3288_ops = { .clock.gmii_clk_sel_mask = GENMASK_U16(13, 12), .clock.rmii_clk_sel_mask = BIT_U16(11), .clock.mac_speed_mask = BIT_U16(10), + + .supports_rmii = true, };#define RK3308_GRF_MAC_CON0 0x04a0
@@ -434,18 +425,14 @@ static const struct rk_gmac_ops rk3288_ops = {#define RK3308_GMAC_FLOW_CTRL GRF_BIT(3)#define RK3308_GMAC_FLOW_CTRL_CLR GRF_CLR_BIT(3) -static void rk3308_set_to_rmii (struct rk_priv_data *bsp_priv) -{ -} -static const struct rk_gmac_ops rk3308_ops = { - .set_to_rmii = rk3308_set_to_rmii, - .gmac_grf_reg =RK3308_GRF_MAC_CON0 , .gmac_phy_intf_sel_mask =GENMASK_U16 (4 ,2 ), .clock_grf_reg =RK3308_GRF_MAC_CON0 , .clock.mac_speed_mask =BIT_U16 (0 ), + + .supports_rmii = true, };#define RK3328_GRF_MAC_CON0 0x0900
@@ -497,10 +484,6 @@ static void rk3328_set_to_rgmii(struct rk_priv_data *bsp_priv, RK3328_GMAC_CLK_TX_DL_CFG(tx_delay)); } -static void rk3328_set_to_rmii (struct rk_priv_data *bsp_priv) -{ -} -static void rk3328_integrated_phy_powerup (struct rk_priv_data *priv) { regmap_write(priv->grf, RK3328_GRF_MACPHY_CON1,
@@ -512,7 +495,6 @@ static void rk3328_integrated_phy_powerup(struct rk_priv_data *priv)static const struct rk_gmac_ops rk3328_ops = { .init = rk3328_init, .set_to_rgmii = rk3328_set_to_rgmii, - .set_to_rmii = rk3328_set_to_rmii, .integrated_phy_powerup = rk3328_integrated_phy_powerup, .integrated_phy_powerdown = rk_gmac_integrated_ephy_powerdown,
@@ -522,6 +504,8 @@ static const struct rk_gmac_ops rk3328_ops = { .clock.rmii_clk_sel_mask = BIT_U16(7), .clock.mac_speed_mask = BIT_U16(2), + .supports_rmii = true, + .regs_valid = true, .regs = { 0xff540000, /* gmac2io */
@@ -554,13 +538,8 @@ static void rk3366_set_to_rgmii(struct rk_priv_data *bsp_priv, RK3366_GMAC_CLK_TX_DL_CFG(tx_delay)); } -static void rk3366_set_to_rmii (struct rk_priv_data *bsp_priv) -{ -} -static const struct rk_gmac_ops rk3366_ops = { .set_to_rgmii = rk3366_set_to_rgmii, - .set_to_rmii = rk3366_set_to_rmii, .gmac_grf_reg =RK3366_GRF_SOC_CON6 , .gmac_phy_intf_sel_mask =GENMASK_U16 (11 ,9 ),
@@ -570,6 +549,8 @@ static const struct rk_gmac_ops rk3366_ops = { .clock.gmii_clk_sel_mask = GENMASK_U16(5, 4), .clock.rmii_clk_sel_mask = BIT_U16(3), .clock.mac_speed_mask = BIT_U16(7), + + .supports_rmii = true, };#define RK3368_GRF_SOC_CON15 0x043c
@@ -596,13 +577,8 @@ static void rk3368_set_to_rgmii(struct rk_priv_data *bsp_priv, RK3368_GMAC_CLK_TX_DL_CFG(tx_delay)); } -static void rk3368_set_to_rmii (struct rk_priv_data *bsp_priv) -{ -} -static const struct rk_gmac_ops rk3368_ops = { .set_to_rgmii = rk3368_set_to_rgmii, - .set_to_rmii = rk3368_set_to_rmii, .gmac_grf_reg =RK3368_GRF_SOC_CON15 , .gmac_phy_intf_sel_mask =GENMASK_U16 (11 ,9 ),
@@ -612,6 +588,8 @@ static const struct rk_gmac_ops rk3368_ops = { .clock.gmii_clk_sel_mask = GENMASK_U16(5, 4), .clock.rmii_clk_sel_mask = BIT_U16(3), .clock.mac_speed_mask = BIT_U16(7), + + .supports_rmii = true, };#define RK3399_GRF_SOC_CON5 0xc214
@@ -638,13 +616,8 @@ static void rk3399_set_to_rgmii(struct rk_priv_data *bsp_priv, RK3399_GMAC_CLK_TX_DL_CFG(tx_delay)); } -static void rk3399_set_to_rmii (struct rk_priv_data *bsp_priv) -{ -} -static const struct rk_gmac_ops rk3399_ops = { .set_to_rgmii = rk3399_set_to_rgmii, - .set_to_rmii = rk3399_set_to_rmii, .gmac_grf_reg =RK3399_GRF_SOC_CON5 , .gmac_phy_intf_sel_mask =GENMASK_U16 (11 ,9 ),
@@ -654,6 +627,8 @@ static const struct rk_gmac_ops rk3399_ops = { .clock.gmii_clk_sel_mask = GENMASK_U16(5, 4), .clock.rmii_clk_sel_mask = BIT_U16(3), .clock.mac_speed_mask = BIT_U16(7), + + .supports_rmii = true, };#define RK3506_GRF_SOC_CON8 0x0020
@@ -884,18 +859,15 @@ static void rk3568_set_to_rgmii(struct rk_priv_data *bsp_priv, RK3568_GMAC_TXCLK_DLY_ENABLE); } -static void rk3568_set_to_rmii (struct rk_priv_data *bsp_priv) -{ -} -static const struct rk_gmac_ops rk3568_ops = { .init = rk3568_init, .set_to_rgmii = rk3568_set_to_rgmii, - .set_to_rmii = rk3568_set_to_rmii, .set_speed = rk_set_clk_mac_speed, .gmac_phy_intf_sel_mask =GENMASK_U16 (6 ,4 ), + .supports_rmii = true, + .regs_valid = true, .regs = {0xfe2a0000 ,/* gmac0 */
@@ -969,10 +941,6 @@ static void rk3576_set_to_rgmii(struct rk_priv_data *bsp_priv, RK3576_GMAC_CLK_RX_DL_CFG(rx_delay)); } -static void rk3576_set_to_rmii (struct rk_priv_data *bsp_priv) -{ -} -static void rk3576_set_clock_selection (struct rk_priv_data *bsp_priv,bool input,bool enable) {
@@ -992,7 +960,6 @@ static void rk3576_set_clock_selection(struct rk_priv_data *bsp_priv, bool inputstatic const struct rk_gmac_ops rk3576_ops = { .init = rk3576_init, .set_to_rgmii = rk3576_set_to_rgmii, - .set_to_rmii = rk3576_set_to_rmii, .set_clock_selection = rk3576_set_clock_selection, .gmac_rmii_mode_mask =BIT_U16 (3 ),
@@ -1000,6 +967,8 @@ static const struct rk_gmac_ops rk3576_ops = { .clock.gmii_clk_sel_mask = GENMASK_U16(6, 5), .clock.rmii_clk_sel_mask = BIT_U16(5), + .supports_rmii = true, + .php_grf_required = true, .regs_valid = true, .regs = {
@@ -1120,19 +1089,15 @@ static const struct rk_gmac_ops rk3588_ops = {#define RV1108_GMAC_FLOW_CTRL GRF_BIT(3)#define RV1108_GMAC_FLOW_CTRL_CLR GRF_CLR_BIT(3) -static void rv1108_set_to_rmii (struct rk_priv_data *bsp_priv) -{ -} -static const struct rk_gmac_ops rv1108_ops = { - .set_to_rmii = rv1108_set_to_rmii, - .gmac_grf_reg =RV1108_GRF_GMAC_CON0 , .gmac_phy_intf_sel_mask =GENMASK_U16 (6 ,4 ), .clock_grf_reg =RV1108_GRF_GMAC_CON0 , .clock.rmii_clk_sel_mask =BIT_U16 (7 ), .clock.mac_speed_mask =BIT_U16 (2 ), + + .supports_rmii = true, };#define RV1126_GRF_GMAC_CON0 0X0070
@@ -1176,17 +1141,14 @@ static void rv1126_set_to_rgmii(struct rk_priv_data *bsp_priv, RV1126_GMAC_M1_CLK_TX_DL_CFG(tx_delay)); } -static void rv1126_set_to_rmii (struct rk_priv_data *bsp_priv) -{ -} -static const struct rk_gmac_ops rv1126_ops = { .set_to_rgmii = rv1126_set_to_rgmii, - .set_to_rmii = rv1126_set_to_rmii, .set_speed = rk_set_clk_mac_speed, .gmac_grf_reg =RV1126_GRF_GMAC_CON0 , .gmac_phy_intf_sel_mask =GENMASK_U16 (6 ,4 ), + + .supports_rmii = true, };static int rk_gmac_clk_init (struct plat_stmmacenet_data *plat)
Signature · 1 line
2.47.3
PATCH v2 19/22 net: stmmac: rk: rk3328: gmac2phy only supports RMII
In reply to Russell King (Oracle)As detailed in a previous commit ("net: stmmac: rk: convert rk3328 to use bsp_priv->id") rk3328 gmac2phy only supports RMII, whereas gmac2io supports both RMII and RGMII. Clear supports_rgmii for gmac2phy.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +1 -0
@@ -465,6 +465,7 @@ static int rk3328_init(struct rk_priv_data *bsp_priv)case 1 :/* gmac2phy */ bsp_priv->gmac_grf_reg =RK3328_GRF_MAC_CON2 ; bsp_priv->clock_grf_reg =RK3328_GRF_MAC_CON2 ; + bsp_priv->supports_rgmii = false;return 0 ;default :
Signature · 1 line
2.47.3
PATCH v2 20/22 net: stmmac: rk: rk3528: gmac0 only supports RMII
In reply to Russell King (Oracle)RK3528 gmac0 dtsi contains:
gmac0: ethernet@ffbd0000 {
phy-handle = <&rmii0_phy>;
phy-mode = "rmii";
mdio0: mdio {
rmii0_phy: ethernet-phy@2 {
phy-is-integrated;
};
};
};This follows the same pattern as rk3328, where this gmac instance only supports RMII. Disable RGMII in phylink's supported_interfaces mask for this gmac instance.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +1 -0
@@ -728,6 +728,7 @@ static int rk3528_init(struct rk_priv_data *bsp_priv)case 0 : bsp_priv->clock_grf_reg =RK3528_VO_GRF_GMAC_CON ; bsp_priv->clock.rmii_clk_sel_mask =BIT_U16 (3 ); + bsp_priv->supports_rgmii = false;return 0 ;case 1 :
Signature · 1 line
2.47.3
PATCH v2 21/22 net: stmmac: rk: use rk_encode_wm16() for clock selection
In reply to Russell King (Oracle)Use rk_encode_wm16() for RMII clock gating control, and also for the io_clksel bit used to select the transmit clock between CRU-derived and IO-derived clock sources.
Both of these were configured via the "set_clock_selection" method in the SoC specific operations, but there is no requirement to change the io_clksel except when enabling clocks.
It is also possible that we don't need to ungate the RMII clock if we are operating in RGMII mode, but this commit makes no change there.
Split up the configuration of these as separate functions, and remove the set_clock_selection() method. Since these clocking bits are in the same register that we call the "speed" register, move the logic for writing that register into rk_write_speed_grf_reg().
--- .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 174 ++++++++---------- 1 file changed, 75 insertions(+), 99 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +75 -99
@@ -27,8 +27,17 @@struct rk_priv_data ;struct rk_clock_fields { +/* io_clksel_cru_mask - io_clksel bit in clock GRF register which, +* when set, selects the tx clock from CRU. +*/ +u16 io_clksel_cru_mask; +/* io_clksel_io_mask - io_clksel bit in clock GRF register which, +* when set, selects the tx clock from IO. +*/ +u16 io_clksel_io_mask;u16 gmii_clk_sel_mask;u16 rmii_clk_sel_mask; +u16 rmii_gate_en_mask;u16 mac_speed_mask; };
@@ -39,8 +48,6 @@ struct rk_gmac_ops {void (*set_to_rmii)(struct rk_priv_data *bsp_priv);int (*set_speed)(struct rk_priv_data *bsp_priv,phy_interface_t interface,int speed); -void (*set_clock_selection)(struct rk_priv_data *bsp_priv,bool input, -bool enable);void (*integrated_phy_powerup)(struct rk_priv_data *bsp_priv);void (*integrated_phy_powerdown)(struct rk_priv_data *bsp_priv);
@@ -171,6 +178,54 @@ static int rk_write_clock_grf_reg(struct rk_priv_data *bsp_priv, u32 val)return regmap_write (regmap, bsp_priv->clock_grf_reg, val); } +static int rk_set_rmii_gate_en (struct rk_priv_data *bsp_priv,bool state) +{ +u32 val; + +if (!bsp_priv->clock.rmii_gate_en_mask) +return 0 ; + + val =rk_encode_wm16 (state, bsp_priv->clock.rmii_gate_en_mask); + +return rk_write_clock_grf_reg (bsp_priv, val); +} + +static int rk_ungate_rmii_clock (struct rk_priv_data *bsp_priv) +{ +return rk_set_rmii_gate_en (bsp_priv, false); +} + +static int rk_gate_rmii_clock (struct rk_priv_data *bsp_priv) +{ +return rk_set_rmii_gate_en (bsp_priv, true); +} + +static int rk_configure_io_clksel (struct rk_priv_data *bsp_priv) +{ +bool io, cru; +u32 val; + +if (!bsp_priv->clock.io_clksel_io_mask && + !bsp_priv->clock.io_clksel_cru_mask) +return 0 ; + + io = bsp_priv->clock_input; + cru = !io; + +/* The io_clksel configuration can be either: +* 0=CRU, 1=IO (rk3506, rk3520, rk3576) or +* 0=IO, 1=CRU (rk3588) +* where CRU means the transmit clock comes from the CRU and IO +* means the transmit clock comes from IO. +* +* Handle this by having two masks. +*/ + val =rk_encode_wm16 (io, bsp_priv->clock.io_clksel_io_mask) | +rk_encode_wm16 (cru, bsp_priv->clock.io_clksel_cru_mask); + +return rk_write_clock_grf_reg (bsp_priv, val); +} +static int rk_set_clk_mac_speed (struct rk_priv_data *bsp_priv,phy_interface_t interface,int speed) {
@@ -637,12 +692,6 @@ static const struct rk_gmac_ops rk3399_ops = {#define RK3506_GMAC_RMII_MODE GRF_BIT(1) -#define RK3506_GMAC_CLK_SELECT_CRU GRF_CLR_BIT(5) -#define RK3506_GMAC_CLK_SELECT_IO GRF_BIT(5) - -#define RK3506_GMAC_CLK_RMII_GATE GRF_BIT(2) -#define RK3506_GMAC_CLK_RMII_NOGATE GRF_CLR_BIT(2) -static int rk3506_init (struct rk_priv_data *bsp_priv) {switch (bsp_priv->id) {
@@ -667,26 +716,13 @@ static void rk3506_set_to_rmii(struct rk_priv_data *bsp_priv)regmap_write (bsp_priv->grf, offset,RK3506_GMAC_RMII_MODE ); } -static void rk3506_set_clock_selection (struct rk_priv_data *bsp_priv, -bool input,bool enable) -{ -unsigned int value, offset, id = bsp_priv->id; - - offset = (id ==1 ) ?RK3506_GRF_SOC_CON11 :RK3506_GRF_SOC_CON8 ; - - value = input ?RK3506_GMAC_CLK_SELECT_IO : -RK3506_GMAC_CLK_SELECT_CRU ; - value |= enable ?RK3506_GMAC_CLK_RMII_NOGATE : -RK3506_GMAC_CLK_RMII_GATE ; -regmap_write (bsp_priv->grf, offset, value); -} -static const struct rk_gmac_ops rk3506_ops = { .init = rk3506_init, .set_to_rmii = rk3506_set_to_rmii, - .set_clock_selection = rk3506_set_clock_selection, + .clock.io_clksel_io_mask =BIT_U16 (5 ), .clock.rmii_clk_sel_mask =BIT_U16 (3 ), + .clock.rmii_gate_en_mask =BIT_U16 (2 ), .regs_valid = true, .regs = {
@@ -714,27 +750,22 @@ static const struct rk_gmac_ops rk3506_ops = {#define RK3528_GMAC1_PHY_INTF_SEL_RGMII GRF_CLR_BIT(8)#define RK3528_GMAC1_PHY_INTF_SEL_RMII GRF_BIT(8) -#define RK3528_GMAC1_CLK_SELECT_CRU GRF_CLR_BIT(12) -#define RK3528_GMAC1_CLK_SELECT_IO GRF_BIT(12) - -#define RK3528_GMAC0_CLK_RMII_GATE GRF_BIT(2) -#define RK3528_GMAC0_CLK_RMII_NOGATE GRF_CLR_BIT(2) -#define RK3528_GMAC1_CLK_RMII_GATE GRF_BIT(9) -#define RK3528_GMAC1_CLK_RMII_NOGATE GRF_CLR_BIT(9) -static int rk3528_init (struct rk_priv_data *bsp_priv) {switch (bsp_priv->id) {case 0 : bsp_priv->clock_grf_reg =RK3528_VO_GRF_GMAC_CON ; bsp_priv->clock.rmii_clk_sel_mask =BIT_U16 (3 ); + bsp_priv->clock.rmii_gate_en_mask =BIT_U16 (2 ); bsp_priv->supports_rgmii = false;return 0 ;case 1 : bsp_priv->clock_grf_reg =RK3528_VPU_GRF_GMAC_CON5 ; + bsp_priv->clock.io_clksel_io_mask =BIT_U16 (12 ); bsp_priv->clock.gmii_clk_sel_mask =GENMASK_U16 (11 ,10 ); bsp_priv->clock.rmii_clk_sel_mask =BIT_U16 (10 ); + bsp_priv->clock.rmii_gate_en_mask =BIT_U16 (9 );return 0 ;default :
@@ -766,24 +797,6 @@ static void rk3528_set_to_rmii(struct rk_priv_data *bsp_priv) RK3528_GMAC0_PHY_INTF_SEL_RMII); } -static void rk3528_set_clock_selection (struct rk_priv_data *bsp_priv, -bool input,bool enable) -{ -unsigned int val; - -if (bsp_priv->id ==1 ) { - val = input ?RK3528_GMAC1_CLK_SELECT_IO : -RK3528_GMAC1_CLK_SELECT_CRU ; - val |= enable ?RK3528_GMAC1_CLK_RMII_NOGATE : -RK3528_GMAC1_CLK_RMII_GATE ; -regmap_write (bsp_priv->grf,RK3528_VPU_GRF_GMAC_CON5 , val); - }else { - val = enable ?RK3528_GMAC0_CLK_RMII_NOGATE : -RK3528_GMAC0_CLK_RMII_GATE ; -regmap_write (bsp_priv->grf,RK3528_VO_GRF_GMAC_CON , val); - } -} -static void rk3528_integrated_phy_powerup (struct rk_priv_data *bsp_priv) {rk_gmac_integrated_fephy_powerup (bsp_priv,RK3528_VO_GRF_MACPHY_CON0 );
@@ -798,7 +811,6 @@ static const struct rk_gmac_ops rk3528_ops = { .init = rk3528_init, .set_to_rgmii = rk3528_set_to_rgmii, .set_to_rmii = rk3528_set_to_rmii, - .set_clock_selection = rk3528_set_clock_selection, .integrated_phy_powerup = rk3528_integrated_phy_powerup, .integrated_phy_powerdown = rk3528_integrated_phy_powerdown, .regs_valid = true,
@@ -896,12 +908,6 @@ static const struct rk_gmac_ops rk3568_ops = {#define RK3576_GRF_GMAC_CON0 0X0020#define RK3576_GRF_GMAC_CON1 0X0024 -#define RK3576_GMAC_CLK_SELECT_IO GRF_BIT(7) -#define RK3576_GMAC_CLK_SELECT_CRU GRF_CLR_BIT(7) - -#define RK3576_GMAC_CLK_RMII_GATE GRF_BIT(4) -#define RK3576_GMAC_CLK_RMII_NOGATE GRF_CLR_BIT(4) -static int rk3576_init (struct rk_priv_data *bsp_priv) {switch (bsp_priv->id) {
@@ -943,31 +949,16 @@ static void rk3576_set_to_rgmii(struct rk_priv_data *bsp_priv, RK3576_GMAC_CLK_RX_DL_CFG(rx_delay)); } -static void rk3576_set_clock_selection (struct rk_priv_data *bsp_priv,bool input, -bool enable) -{ -unsigned int val = input ?RK3576_GMAC_CLK_SELECT_IO : -RK3576_GMAC_CLK_SELECT_CRU ; -unsigned int offset_con; - - val |= enable ?RK3576_GMAC_CLK_RMII_NOGATE : -RK3576_GMAC_CLK_RMII_GATE ; - - offset_con = bsp_priv->id ==1 ?RK3576_GRF_GMAC_CON1 : -RK3576_GRF_GMAC_CON0 ; - -regmap_write (bsp_priv->grf, offset_con, val); -} -static const struct rk_gmac_ops rk3576_ops = { .init = rk3576_init, .set_to_rgmii = rk3576_set_to_rgmii, - .set_clock_selection = rk3576_set_clock_selection, .gmac_rmii_mode_mask =BIT_U16 (3 ), + .clock.io_clksel_io_mask =BIT_U16 (7 ), .clock.gmii_clk_sel_mask =GENMASK_U16 (6 ,5 ), .clock.rmii_clk_sel_mask =BIT_U16 (5 ), + .clock.rmii_gate_en_mask =BIT_U16 (4 ), .supports_rmii = true,
@@ -1000,25 +991,23 @@ static const struct rk_gmac_ops rk3576_ops = {#define RK3588_GMAC_CLK_RMII_MODE (id) GRF_BIT(5 * (id))#define RK3588_GMAC_CLK_RGMII_MODE (id) GRF_CLR_BIT(5 * (id)) -#define RK3588_GMAC_CLK_SELECT_CRU (id) GRF_BIT(5 * (id) + 4) -#define RK3588_GMAC_CLK_SELECT_IO (id) GRF_CLR_BIT(5 * (id) + 4) - -#define RK3588_GMAC_CLK_RMII_GATE (id) GRF_BIT(5 * (id) + 1) -#define RK3588_GMAC_CLK_RMII_NOGATE (id) GRF_CLR_BIT(5 * (id) + 1) -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 ); + bsp_priv->clock.io_clksel_cru_mask =BIT_U16 (4 ); bsp_priv->clock.gmii_clk_sel_mask =GENMASK_U16 (3 ,2 ); bsp_priv->clock.rmii_clk_sel_mask =BIT_U16 (2 ); + bsp_priv->clock.rmii_gate_en_mask =BIT_U16 (1 );return 0 ;case 1 : bsp_priv->gmac_phy_intf_sel_mask =GENMASK_U16 (11 ,9 ); + bsp_priv->clock.io_clksel_cru_mask =BIT_U16 (10 ); bsp_priv->clock.gmii_clk_sel_mask =GENMASK_U16 (8 ,7 ); bsp_priv->clock.rmii_clk_sel_mask =BIT_U16 (7 ); + bsp_priv->clock.rmii_gate_en_mask =BIT_U16 (6 );return 0 ;default :
@@ -1052,23 +1041,10 @@ static void rk3588_set_to_rmii(struct rk_priv_data *bsp_priv) RK3588_GMAC_CLK_RMII_MODE(bsp_priv->id)); } -static void rk3588_set_clock_selection (struct rk_priv_data *bsp_priv,bool input, -bool enable) -{ -unsigned int val = input ?RK3588_GMAC_CLK_SELECT_IO (bsp_priv->id) : -RK3588_GMAC_CLK_SELECT_CRU (bsp_priv->id); - - val |= enable ?RK3588_GMAC_CLK_RMII_NOGATE (bsp_priv->id) : -RK3588_GMAC_CLK_RMII_GATE (bsp_priv->id); - -regmap_write (bsp_priv->php_grf,RK3588_GRF_CLK_CON1 , val); -} -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_clock_selection = rk3588_set_clock_selection, .gmac_grf_reg_in_php = true, .gmac_grf_reg =RK3588_GRF_GMAC_CON0 ,
@@ -1216,19 +1192,15 @@ static int gmac_clk_enable(struct rk_priv_data *bsp_priv, bool enable)if (ret)return ret; -if (bsp_priv->ops && bsp_priv->ops->set_clock_selection) - bsp_priv->ops->set_clock_selection (bsp_priv, - bsp_priv->clock_input, true); +rk_configure_io_clksel (bsp_priv); +rk_ungate_rmii_clock (bsp_priv);mdelay (5 ); bsp_priv->clk_enabled = true; } }else {if (bsp_priv->clk_enabled) { -if (bsp_priv->ops && bsp_priv->ops->set_clock_selection) { - bsp_priv->ops->set_clock_selection (bsp_priv, - bsp_priv->clock_input, false); - } +rk_gate_rmii_clock (bsp_priv);clk_bulk_disable_unprepare (bsp_priv->num_clks, bsp_priv->clks);
@@ -1394,6 +1366,10 @@ static struct rk_priv_data *rk_gmac_setup(struct platform_device *pdev, } } +if (bsp_priv->clock.io_clksel_cru_mask && + bsp_priv->clock.io_clksel_io_mask) +dev_warn (dev,"both CRU and IO io_clksel masks should not be populated - driver may malfunction\n" ); +return bsp_priv; }
Signature · 1 line
2.47.3
Jakub Kicinski
maintainerRe: [net-next,v2,21/22] net: stmmac: rk: use rk_encode_wm16() for clock selection
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: use rk_encode_wm16() for clock selection
This commit refactors the per-SoC set_clock_selection() method into unified helper functions using rk_encode_wm16(), with mask-based configuration stored in struct rk_clock_fields.
Quoted 4 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +0
-0
[ ... ]
Quoted 14 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +0
-6@@ -1000,25 +991,23 @@ static const struct rk_gmac_ops rk3576_ops = {#define RK3588_GMAC_CLK_RMII_MODE (id) GRF_BIT(5 * (id))#define RK3588_GMAC_CLK_RGMII_MODE (id) GRF_CLR_BIT(5 * (id)) -#define RK3588_GMAC_CLK_SELECT_CRU (id) GRF_BIT(5 * (id) + 4) -#define RK3588_GMAC_CLK_SELECT_IO (id) GRF_CLR_BIT(5 * (id) + 4) - -#define RK3588_GMAC_CLK_RMII_GATE (id) GRF_BIT(5 * (id) + 1) -#define RK3588_GMAC_CLK_RMII_NOGATE (id) GRF_CLR_BIT(5 * (id) + 1) -static int rk3588_init (struct rk_priv_data *bsp_priv) {switch (bsp_priv->id) {case 0 :
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c static const struct rk_gmac_ops rk3576_ops = { · line 1007
Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +3
-0bsp_priv->gmac_phy_intf_sel_mask =GENMASK_U16 (5 ,3 ); + bsp_priv->clock.io_clksel_cru_mask =BIT_U16 (4 ); bsp_priv->clock.gmii_clk_sel_mask =GENMASK_U16 (3 ,2 ); bsp_priv->clock.rmii_clk_sel_mask =BIT_U16 (2 ); + bsp_priv->clock.rmii_gate_en_mask =BIT_U16 (1 );return 0 ;case 1 : bsp_priv->gmac_phy_intf_sel_mask =GENMASK_U16 (11 ,9 ); + bsp_priv->clock.io_clksel_cru_mask =BIT_U16 (10 );
^^
Should this be BIT_U16(9) instead of BIT_U16(10)?
The removed macro RK3588_GMAC_CLK_SELECT_CRU(id) used the formula GRF_BIT(5 * (id) + 4), which for id=1 gives 5*1+4 = bit 9.
The other masks for id=1 follow the 5*(id) pattern correctly:
- rmii_gate_en_mask = BIT_U16(6) matches 5*1+1 = 6
- gmii_clk_sel_mask = GENMASK_U16(8, 7) matches 5*1+{2,3}
- rmii_clk_sel_mask = BIT_U16(7)
But io_clksel_cru_mask = BIT_U16(10) does not match 5*1+4 = 9.
Quoted 4 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +1
-0bsp_priv->clock.gmii_clk_sel_mask =GENMASK_U16 (8 ,7 ); bsp_priv->clock.rmii_clk_sel_mask =BIT_U16 (7 ); + bsp_priv->clock.rmii_gate_en_mask =BIT_U16 (6 );return 0 ;
[ ... ]
PATCH v2 22/22 net: stmmac: rk: rk3506, rk3528 and kk3588 have rmii_mode in clock register
In reply to Russell King (Oracle)rk3506, rk3528 and rk3588 have the rmii_mode bit in the clock GRF register rather than the gmac GRF register. Provide a mask for this field in the clock register, and convert these SoCs to use this. Add the necessary code in rk_gmac_powerup() to write this field.
This allows us to get rid of these SoCs set_to_rmii() function. As such, we need to mark these SoCs as supporting RMII mode.
--- .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 62 +++++++------------ 1 file changed, 22 insertions(+), 40 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +22 -40
@@ -38,6 +38,7 @@ struct rk_clock_fields {u16 gmii_clk_sel_mask;u16 rmii_clk_sel_mask;u16 rmii_gate_en_mask; +u16 rmii_mode_mask;u16 mac_speed_mask; };
@@ -708,21 +709,15 @@ static int rk3506_init(struct rk_priv_data *bsp_priv) } } -static void rk3506_set_to_rmii (struct rk_priv_data *bsp_priv) -{ -unsigned int id = bsp_priv->id, offset; - - offset = (id ==1 ) ?RK3506_GRF_SOC_CON11 :RK3506_GRF_SOC_CON8 ; -regmap_write (bsp_priv->grf, offset,RK3506_GMAC_RMII_MODE ); -} -static const struct rk_gmac_ops rk3506_ops = { .init = rk3506_init, - .set_to_rmii = rk3506_set_to_rmii, .clock.io_clksel_io_mask =BIT_U16 (5 ), .clock.rmii_clk_sel_mask =BIT_U16 (3 ), .clock.rmii_gate_en_mask =BIT_U16 (2 ), + .clock.rmii_mode_mask =BIT_U16 (1 ), + + .supports_rmii = true, .regs_valid = true, .regs = {
@@ -746,10 +741,6 @@ static const struct rk_gmac_ops rk3506_ops = {#define RK3528_GMAC_CLK_RX_DL_CFG (val) GRF_FIELD(15, 8, val)#define RK3528_GMAC_CLK_TX_DL_CFG (val) GRF_FIELD(7, 0, val) -#define RK3528_GMAC0_PHY_INTF_SEL_RMII GRF_BIT(1) -#define RK3528_GMAC1_PHY_INTF_SEL_RGMII GRF_CLR_BIT(8) -#define RK3528_GMAC1_PHY_INTF_SEL_RMII GRF_BIT(8) -static int rk3528_init (struct rk_priv_data *bsp_priv) {switch (bsp_priv->id) {
@@ -757,6 +748,7 @@ static int rk3528_init(struct rk_priv_data *bsp_priv) bsp_priv->clock_grf_reg =RK3528_VO_GRF_GMAC_CON ; bsp_priv->clock.rmii_clk_sel_mask =BIT_U16 (3 ); bsp_priv->clock.rmii_gate_en_mask =BIT_U16 (2 ); + bsp_priv->clock.rmii_mode_mask =BIT_U16 (1 ); bsp_priv->supports_rgmii = false;return 0 ;
@@ -766,6 +758,7 @@ static int rk3528_init(struct rk_priv_data *bsp_priv) bsp_priv->clock.gmii_clk_sel_mask =GENMASK_U16 (11 ,10 ); bsp_priv->clock.rmii_clk_sel_mask =BIT_U16 (10 ); bsp_priv->clock.rmii_gate_en_mask =BIT_U16 (9 ); + bsp_priv->clock.rmii_mode_mask =BIT_U16 (8 );return 0 ;default :
@@ -776,9 +769,6 @@ static int rk3528_init(struct rk_priv_data *bsp_priv)static void rk3528_set_to_rgmii (struct rk_priv_data *bsp_priv,int tx_delay,int rx_delay) { -regmap_write (bsp_priv->grf,RK3528_VPU_GRF_GMAC_CON5 , -RK3528_GMAC1_PHY_INTF_SEL_RGMII ); -regmap_write (bsp_priv->grf,RK3528_VPU_GRF_GMAC_CON5 ,DELAY_ENABLE (RK3528 , tx_delay, rx_delay));
@@ -787,16 +777,6 @@ static void rk3528_set_to_rgmii(struct rk_priv_data *bsp_priv, RK3528_GMAC_CLK_TX_DL_CFG(tx_delay)); } -static void rk3528_set_to_rmii (struct rk_priv_data *bsp_priv) -{ -if (bsp_priv->id ==1 ) -regmap_write (bsp_priv->grf,RK3528_VPU_GRF_GMAC_CON5 , -RK3528_GMAC1_PHY_INTF_SEL_RMII ); -else -regmap_write (bsp_priv->grf,RK3528_VO_GRF_GMAC_CON , -RK3528_GMAC0_PHY_INTF_SEL_RMII ); -} -static void rk3528_integrated_phy_powerup (struct rk_priv_data *bsp_priv) {rk_gmac_integrated_fephy_powerup (bsp_priv,RK3528_VO_GRF_MACPHY_CON0 );
@@ -810,9 +790,11 @@ static void rk3528_integrated_phy_powerdown(struct rk_priv_data *bsp_priv)static const struct rk_gmac_ops rk3528_ops = { .init = rk3528_init, .set_to_rgmii = rk3528_set_to_rgmii, - .set_to_rmii = rk3528_set_to_rmii, .integrated_phy_powerup = rk3528_integrated_phy_powerup, .integrated_phy_powerdown = rk3528_integrated_phy_powerdown, + + .supports_rmii = true, + .regs_valid = true, .regs = {0xffbd0000 ,/* gmac0 */
@@ -988,9 +970,6 @@ static const struct rk_gmac_ops rk3576_ops = {#define RK3588_GRF_GMAC_CON0 0X0008#define RK3588_GRF_CLK_CON1 0X0070 -#define RK3588_GMAC_CLK_RMII_MODE (id) GRF_BIT(5 * (id)) -#define RK3588_GMAC_CLK_RGMII_MODE (id) GRF_CLR_BIT(5 * (id)) -static int rk3588_init (struct rk_priv_data *bsp_priv) {switch (bsp_priv->id) {
@@ -1000,6 +979,7 @@ static int rk3588_init(struct rk_priv_data *bsp_priv) bsp_priv->clock.gmii_clk_sel_mask =GENMASK_U16 (3 ,2 ); bsp_priv->clock.rmii_clk_sel_mask =BIT_U16 (2 ); bsp_priv->clock.rmii_gate_en_mask =BIT_U16 (1 ); + bsp_priv->clock.rmii_mode_mask =BIT_U16 (0 );return 0 ;case 1 :
@@ -1008,6 +988,7 @@ static int rk3588_init(struct rk_priv_data *bsp_priv) bsp_priv->clock.gmii_clk_sel_mask =GENMASK_U16 (8 ,7 ); bsp_priv->clock.rmii_clk_sel_mask =BIT_U16 (7 ); bsp_priv->clock.rmii_gate_en_mask =BIT_U16 (6 ); + bsp_priv->clock.rmii_mode_mask =BIT_U16 (5 );return 0 ;default :
@@ -1023,9 +1004,6 @@ static void rk3588_set_to_rgmii(struct rk_priv_data *bsp_priv, offset_con = bsp_priv->id ==1 ?RK3588_GRF_GMAC_CON9 :RK3588_GRF_GMAC_CON8 ; -regmap_write (bsp_priv->php_grf,RK3588_GRF_CLK_CON1 , -RK3588_GMAC_CLK_RGMII_MODE (id)); -regmap_write (bsp_priv->grf,RK3588_GRF_GMAC_CON7 ,RK3588_GMAC_RXCLK_DLY_ENABLE (id) |RK3588_GMAC_TXCLK_DLY_ENABLE (id));
@@ -1035,16 +1013,9 @@ static void rk3588_set_to_rgmii(struct rk_priv_data *bsp_priv, RK3588_GMAC_CLK_TX_DL_CFG(tx_delay)); } -static void rk3588_set_to_rmii (struct rk_priv_data *bsp_priv) -{ -regmap_write (bsp_priv->php_grf,RK3588_GRF_CLK_CON1 , -RK3588_GMAC_CLK_RMII_MODE (bsp_priv->id)); -} -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, .gmac_grf_reg_in_php = true, .gmac_grf_reg =RK3588_GRF_GMAC_CON0 ,
@@ -1052,6 +1023,8 @@ static const struct rk_gmac_ops rk3588_ops = { .clock_grf_reg_in_php = true, .clock_grf_reg = RK3588_GRF_CLK_CON1, + .supports_rmii = true, + .php_grf_required = true, .regs_valid = true, .regs = {
@@ -1429,6 +1402,15 @@ static int rk_gmac_powerup(struct rk_priv_data *bsp_priv)return ret; } +if (bsp_priv->clock.rmii_mode_mask) { + val =rk_encode_wm16 (intf ==PHY_INTF_SEL_RMII , + bsp_priv->clock.rmii_mode_mask); + + ret =rk_write_clock_grf_reg (bsp_priv, val); +if (ret <0 ) +return ret; + } +/*rmii or rgmii*/ switch (bsp_priv->phy_iface) {case PHY_INTERFACE_MODE_RGMII :
Signature · 1 line
2.47.3
Jakub Kicinski
maintainerRe: [net-next,v2,22/22] net: stmmac: rk: rk3506, rk3528 and kk3588 have rmii_mode in clock register
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: rk3506, rk3528 and kk3588 have rmii_mode in clock register
This patch moves the rmii_mode bit configuration for rk3506, rk3528 and rk3588 from the SoC-specific set_to_rmii() functions to the common rk_gmac_powerup() path, using the new rmii_mode_mask field in the clock register configuration.
Quoted 1 line
net: stmmac: rk: rk3506, rk3528 and kk3588 have
rmii_modein clock register
^^^^^^
This isn't a bug, but the subject line has a typo: "kk3588" should be "rk3588". The commit body correctly refers to "rk3588" and the code changes reference rk3588_ops, rk3588_init, and RK3588_* macros.
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Mon, 26 Jan 2026 11:44:11 +0000 you wrote:
[Please note: due to google's spam filtering, I can no longer send patch series to @gmail.com addresses, and thus, to save being spammed with failed deliveries, I'm dropping such addresses from my patch series. Stop giving google so much power, use other email services.]
dwmac-rk has an excessive variability between each individual SoCs which makes this file extremely large.
[...]
Here is the summary with links:
- [net-next,v2,01/22] net: stmmac: rk: avoid phy_power_on()
https://git.kernel.org/netdev/net-next/c/a0094edaf492 - [net-next,v2,02/22] net: stmmac: rk: get rid of rk_phy_power_ctl() https://git.kernel.org/netdev/net-next/c/af6eaf701897 - [net-next,v2,03/22] net: stmmac: rk: convert rk3328 to use bsp_priv->id https://git.kernel.org/netdev/net-next/c/cdb5fdfcf396 - [net-next,v2,04/22] net: stmmac: rk: group MACPHY register offset and fields together https://git.kernel.org/netdev/net-next/c/a7ad67e9745d
- [net-next,v2,05/22] net: stmmac: rk: add GMAC_CLK_xx constants, simplify RGMII definitions (no matching commit)
- [net-next,v2,06/22] net: stmmac: rk: add SoC specific ->init() method
(no matching commit)
- [net-next,v2,07/22] net: stmmac: rk: convert to mask-based interface mode configuration (no matching commit)
- [net-next,v2,08/22] net: stmmac: rk: convert rk3588 to mask-based interface mode config (no matching commit)
- [net-next,v2,09/22] net: stmmac: rk: move speed GRF register offset to private data (no matching commit)
- [net-next,v2,10/22] net: stmmac: rk: convert rk3588 to rk_set_reg_speed()
(no matching commit)
- [net-next,v2,11/22] net: stmmac: rk: remove rk3528 RMII clock initialisation (no matching commit)
- [net-next,v2,12/22] net: stmmac: rk: use rk_encode_wm16() for RGMII clocks
(no matching commit)
- [net-next,v2,13/22] net: stmmac: rk: use rk_encode_wm16() for RMII speed
(no matching commit)
- [net-next,v2,14/22] net: stmmac: rk: use rk_encode_wm16() for RMII clock
(no matching commit)
- [net-next,v2,15/22] net: stmmac: rk: remove need for ->set_speed() method
(no matching commit)
- [net-next,v2,16/22] net: stmmac: rk: convert px30
(no matching commit)
- [net-next,v2,17/22] net: stmmac: rk: introduce flags indicating support for RGMII/RMII (no matching commit)
- [net-next,v2,18/22] net: stmmac: rk: replace empty set_to_rmii() with supports_rmii (no matching commit)
- [net-next,v2,19/22] net: stmmac: rk: rk3328: gmac2phy only supports RMII
(no matching commit)
- [net-next,v2,20/22] net: stmmac: rk: rk3528: gmac0 only supports RMII
(no matching commit)
- [net-next,v2,21/22] net: stmmac: rk: use rk_encode_wm16() for clock selection (no matching commit)
- [net-next,v2,22/22] net: stmmac: rk: rk3506, rk3528 and kk3588 have rmii_mode in clock register (no matching commit)
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html