nte: stmmac: visconti: cleanups
Subsystems (5)
cover nte: stmmac: visconti: cleanups
Hi,
A short series of cleanups to the visconti dwmac glue.
.../net/ethernet/stmicro/stmmac/dwmac-visconti.c | 129 ++++++++++++--------- 1 file changed, 74 insertions(+), 55 deletions(-)
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 1/4 net: stmmac: visconti: re-arrange speed decode
Re-arrange the speed decode in visconti_eth_set_clk_tx_rate() to be more readable by first checking to see if we're using RGMII or RMII and then decoding the speed, rather than decoding the speed and then testing the interface mode.
--- .../ethernet/stmicro/stmmac/dwmac-visconti.c | 44 +++++++++++-------- 1 file changed, 26 insertions(+), 18 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c +26 -18
@@ -57,30 +57,38 @@ static int visconti_eth_set_clk_tx_rate(void *bsp_priv, struct clk *clk_tx_i, phy_interface_t interface, int speed) {struct visconti_eth *dwmac = bsp_priv; -struct net_device *netdev =dev_get_drvdata (dwmac->dev);unsigned int val, clk_sel_val =0 ; -switch (speed) { -case SPEED_1000 : -if (dwmac->phy_intf_sel ==ETHER_CONFIG_INTF_RGMII ) +if (dwmac->phy_intf_sel ==ETHER_CONFIG_INTF_RGMII ) { +switch (speed) { +case SPEED_1000 : clk_sel_val =ETHER_CLK_SEL_FREQ_SEL_125M ; -break ; -case SPEED_100 : -if (dwmac->phy_intf_sel ==ETHER_CONFIG_INTF_RGMII ) +break ; + +case SPEED_100 : clk_sel_val =ETHER_CLK_SEL_FREQ_SEL_25M ; -if (dwmac->phy_intf_sel ==ETHER_CONFIG_INTF_RMII ) - clk_sel_val =ETHER_CLK_SEL_DIV_SEL_2 ; -break ; -case SPEED_10 : -if (dwmac->phy_intf_sel ==ETHER_CONFIG_INTF_RGMII ) +break ; + +case SPEED_10 : clk_sel_val =ETHER_CLK_SEL_FREQ_SEL_2P5M ; -if (dwmac->phy_intf_sel ==ETHER_CONFIG_INTF_RMII ) +break ; + +default : +return -EINVAL ; + } + }else if (dwmac->phy_intf_sel ==ETHER_CONFIG_INTF_RMII ) { +switch (speed) { +case SPEED_100 : + clk_sel_val =ETHER_CLK_SEL_DIV_SEL_2 ; +break ; + +case SPEED_10 : clk_sel_val =ETHER_CLK_SEL_DIV_SEL_20 ; -break ; -default : -/* No bit control */ -netdev_err (netdev,"Unsupported speed request (%d)" , speed); -return -EINVAL ; +break ; + +default : +return -EINVAL ; + } }/* Stop internal clock */
Signature · 1 line
2.30.2
PATCH 2/4 net: stmmac: visconti: reorganise visconti_eth_set_clk_tx_rate()
In reply to Russell King (Oracle)Rather than testing dwmac->phy_intf_sel several times for the same values in this function, group the code together. The only part which was common was stopping the internal clock before programming the clock setting.
This further improves the readability of this function.
--- .../ethernet/stmicro/stmmac/dwmac-visconti.c | 51 +++++++++++-------- 1 file changed, 29 insertions(+), 22 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c +29 -22
@@ -76,6 +76,22 @@ static int visconti_eth_set_clk_tx_rate(void *bsp_priv, struct clk *clk_tx_i,default :return -EINVAL ; } + +/* Stop internal clock */ + val =readl (dwmac->reg +REG_ETHER_CLOCK_SEL ); + val &= ~(ETHER_CLK_SEL_RMII_CLK_EN |ETHER_CLK_SEL_RX_TX_CLK_EN ); + val |=ETHER_CLK_SEL_TX_O_E_N_IN ; +writel (val, dwmac->reg +REG_ETHER_CLOCK_SEL ); + +/* Set Clock-Mux, Start clock, Set TX_O direction */ + val = clk_sel_val |ETHER_CLK_SEL_RX_CLK_EXT_SEL_RXC ; +writel (val, dwmac->reg +REG_ETHER_CLOCK_SEL ); + + val |=ETHER_CLK_SEL_RX_TX_CLK_EN ; +writel (val, dwmac->reg +REG_ETHER_CLOCK_SEL ); + + val &= ~ETHER_CLK_SEL_TX_O_E_N_IN ; +writel (val, dwmac->reg +REG_ETHER_CLOCK_SEL ); }else if (dwmac->phy_intf_sel ==ETHER_CONFIG_INTF_RMII ) {switch (speed) {case SPEED_100 :
@@ -89,27 +105,14 @@ static int visconti_eth_set_clk_tx_rate(void *bsp_priv, struct clk *clk_tx_i,default :return -EINVAL ; } - } - -/* Stop internal clock */ - val =readl (dwmac->reg +REG_ETHER_CLOCK_SEL ); - val &= ~(ETHER_CLK_SEL_RMII_CLK_EN |ETHER_CLK_SEL_RX_TX_CLK_EN ); - val |=ETHER_CLK_SEL_TX_O_E_N_IN ; -writel (val, dwmac->reg +REG_ETHER_CLOCK_SEL ); -/* Set Clock-Mux, Start clock, Set TX_O direction */ -switch (dwmac->phy_intf_sel) { -case ETHER_CONFIG_INTF_RGMII : - val = clk_sel_val |ETHER_CLK_SEL_RX_CLK_EXT_SEL_RXC ; -writel (val, dwmac->reg +REG_ETHER_CLOCK_SEL ); - - val |=ETHER_CLK_SEL_RX_TX_CLK_EN ; +/* Stop internal clock */ + val =readl (dwmac->reg +REG_ETHER_CLOCK_SEL ); + val &= ~(ETHER_CLK_SEL_RMII_CLK_EN |ETHER_CLK_SEL_RX_TX_CLK_EN ); + val |=ETHER_CLK_SEL_TX_O_E_N_IN ;writel (val, dwmac->reg +REG_ETHER_CLOCK_SEL ); - val &= ~ETHER_CLK_SEL_TX_O_E_N_IN ; -writel (val, dwmac->reg +REG_ETHER_CLOCK_SEL ); -break ; -case ETHER_CONFIG_INTF_RMII : +/* Set Clock-Mux, Start clock, Set TX_O direction */ val = clk_sel_val |ETHER_CLK_SEL_RX_CLK_EXT_SEL_DIV |ETHER_CLK_SEL_TX_CLK_EXT_SEL_DIV |ETHER_CLK_SEL_TX_O_E_N_IN |ETHER_CLK_SEL_RMII_CLK_SEL_RX_C ;
@@ -120,16 +123,20 @@ static int visconti_eth_set_clk_tx_rate(void *bsp_priv, struct clk *clk_tx_i, val |=ETHER_CLK_SEL_RMII_CLK_EN |ETHER_CLK_SEL_RX_TX_CLK_EN ;writel (val, dwmac->reg +REG_ETHER_CLOCK_SEL ); -break ; -case ETHER_CONFIG_INTF_MII : -default : + }else { +/* Stop internal clock */ + val =readl (dwmac->reg +REG_ETHER_CLOCK_SEL ); + val &= ~(ETHER_CLK_SEL_RMII_CLK_EN |ETHER_CLK_SEL_RX_TX_CLK_EN ); + val |=ETHER_CLK_SEL_TX_O_E_N_IN ; +writel (val, dwmac->reg +REG_ETHER_CLOCK_SEL ); + +/* Set Clock-Mux, Start clock, Set TX_O direction */ val = clk_sel_val |ETHER_CLK_SEL_RX_CLK_EXT_SEL_RXC |ETHER_CLK_SEL_TX_CLK_EXT_SEL_TXC |ETHER_CLK_SEL_TX_O_E_N_IN ;writel (val, dwmac->reg +REG_ETHER_CLOCK_SEL ); val |=ETHER_CLK_SEL_RX_TX_CLK_EN ;writel (val, dwmac->reg +REG_ETHER_CLOCK_SEL ); -break ; }return 0 ;
Signature · 1 line
2.30.2
PATCH 3/4 net: stmmac: visconti: clean up code formatting
In reply to Russell King (Oracle)Ensure that code is wrapped prior to column 80, and shorten the needlessly long "clk_sel_val" to just "clk_sel".
--- .../ethernet/stmicro/stmmac/dwmac-visconti.c | 35 +++++++++++-------- 1 file changed, 20 insertions(+), 15 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c +20 -15
@@ -57,20 +57,20 @@ static int visconti_eth_set_clk_tx_rate(void *bsp_priv, struct clk *clk_tx_i, phy_interface_t interface, int speed) {struct visconti_eth *dwmac = bsp_priv; -unsigned int val, clk_sel_val =0 ; +unsigned int val, clk_sel =0 ;if (dwmac->phy_intf_sel ==ETHER_CONFIG_INTF_RGMII ) {switch (speed) {case SPEED_1000 : - clk_sel_val =ETHER_CLK_SEL_FREQ_SEL_125M ; + clk_sel =ETHER_CLK_SEL_FREQ_SEL_125M ;break ;case SPEED_100 : - clk_sel_val =ETHER_CLK_SEL_FREQ_SEL_25M ; + clk_sel =ETHER_CLK_SEL_FREQ_SEL_25M ;break ;case SPEED_10 : - clk_sel_val =ETHER_CLK_SEL_FREQ_SEL_2P5M ; + clk_sel =ETHER_CLK_SEL_FREQ_SEL_2P5M ;break ;default :
@@ -79,12 +79,13 @@ static int visconti_eth_set_clk_tx_rate(void *bsp_priv, struct clk *clk_tx_i,/* Stop internal clock */ val =readl (dwmac->reg +REG_ETHER_CLOCK_SEL ); - val &= ~(ETHER_CLK_SEL_RMII_CLK_EN |ETHER_CLK_SEL_RX_TX_CLK_EN ); + val &= ~(ETHER_CLK_SEL_RMII_CLK_EN | +ETHER_CLK_SEL_RX_TX_CLK_EN ); val |=ETHER_CLK_SEL_TX_O_E_N_IN ;writel (val, dwmac->reg +REG_ETHER_CLOCK_SEL );/* Set Clock-Mux, Start clock, Set TX_O direction */ - val = clk_sel_val |ETHER_CLK_SEL_RX_CLK_EXT_SEL_RXC ; + val = clk_sel |ETHER_CLK_SEL_RX_CLK_EXT_SEL_RXC ;writel (val, dwmac->reg +REG_ETHER_CLOCK_SEL ); val |=ETHER_CLK_SEL_RX_TX_CLK_EN ;
@@ -95,11 +96,11 @@ static int visconti_eth_set_clk_tx_rate(void *bsp_priv, struct clk *clk_tx_i, }else if (dwmac->phy_intf_sel ==ETHER_CONFIG_INTF_RMII ) {switch (speed) {case SPEED_100 : - clk_sel_val =ETHER_CLK_SEL_DIV_SEL_2 ; + clk_sel =ETHER_CLK_SEL_DIV_SEL_2 ;break ;case SPEED_10 : - clk_sel_val =ETHER_CLK_SEL_DIV_SEL_20 ; + clk_sel =ETHER_CLK_SEL_DIV_SEL_20 ;break ;default :
@@ -108,14 +109,16 @@ static int visconti_eth_set_clk_tx_rate(void *bsp_priv, struct clk *clk_tx_i,/* Stop internal clock */ val =readl (dwmac->reg +REG_ETHER_CLOCK_SEL ); - val &= ~(ETHER_CLK_SEL_RMII_CLK_EN |ETHER_CLK_SEL_RX_TX_CLK_EN ); + val &= ~(ETHER_CLK_SEL_RMII_CLK_EN | +ETHER_CLK_SEL_RX_TX_CLK_EN ); val |=ETHER_CLK_SEL_TX_O_E_N_IN ;writel (val, dwmac->reg +REG_ETHER_CLOCK_SEL );/* Set Clock-Mux, Start clock, Set TX_O direction */ - val = clk_sel_val |ETHER_CLK_SEL_RX_CLK_EXT_SEL_DIV | -ETHER_CLK_SEL_TX_CLK_EXT_SEL_DIV |ETHER_CLK_SEL_TX_O_E_N_IN | -ETHER_CLK_SEL_RMII_CLK_SEL_RX_C ; + val = clk_sel |ETHER_CLK_SEL_RX_CLK_EXT_SEL_DIV | +ETHER_CLK_SEL_TX_CLK_EXT_SEL_DIV | +ETHER_CLK_SEL_TX_O_E_N_IN | +ETHER_CLK_SEL_RMII_CLK_SEL_RX_C ;writel (val, dwmac->reg +REG_ETHER_CLOCK_SEL ); val |=ETHER_CLK_SEL_RMII_CLK_RST ;
@@ -126,13 +129,15 @@ static int visconti_eth_set_clk_tx_rate(void *bsp_priv, struct clk *clk_tx_i, }else {/* Stop internal clock */ val =readl (dwmac->reg +REG_ETHER_CLOCK_SEL ); - val &= ~(ETHER_CLK_SEL_RMII_CLK_EN |ETHER_CLK_SEL_RX_TX_CLK_EN ); + val &= ~(ETHER_CLK_SEL_RMII_CLK_EN | +ETHER_CLK_SEL_RX_TX_CLK_EN ); val |=ETHER_CLK_SEL_TX_O_E_N_IN ;writel (val, dwmac->reg +REG_ETHER_CLOCK_SEL );/* Set Clock-Mux, Start clock, Set TX_O direction */ - val = clk_sel_val |ETHER_CLK_SEL_RX_CLK_EXT_SEL_RXC | -ETHER_CLK_SEL_TX_CLK_EXT_SEL_TXC |ETHER_CLK_SEL_TX_O_E_N_IN ; + val =ETHER_CLK_SEL_RX_CLK_EXT_SEL_RXC | +ETHER_CLK_SEL_TX_CLK_EXT_SEL_TXC | +ETHER_CLK_SEL_TX_O_E_N_IN ;writel (val, dwmac->reg +REG_ETHER_CLOCK_SEL ); val |=ETHER_CLK_SEL_RX_TX_CLK_EN ;
Signature · 1 line
2.30.2
PATCH 4/4 net: stmmac: visconti: make phy_intf_sel local
In reply to Russell King (Oracle)There is little need to have phy_intf_sel as a member of struct visconti_eth when we have the PHY interface mode available from phylink in visconti_eth_set_clk_tx_rate(). Without multiple interface support, phylink is fixed to supporting only plat->phy_interface, so we can be sure that "interface" passed into this function is the same as plat->phy_interface.
Make phy_intf_sel local to visconti_eth_init_hw() and clean up.
--- .../ethernet/stmicro/stmmac/dwmac-visconti.c | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c +11 -12
@@ -48,7 +48,6 @@struct visconti_eth {void __iomem *reg; -u32 phy_intf_sel;struct clk *phy_ref_clk;struct device *dev; };
@@ -57,9 +56,9 @@ static int visconti_eth_set_clk_tx_rate(void *bsp_priv, struct clk *clk_tx_i, phy_interface_t interface, int speed) {struct visconti_eth *dwmac = bsp_priv; -unsigned int val, clk_sel =0 ; +unsigned long clk_sel, val; -if (dwmac->phy_intf_sel ==ETHER_CONFIG_INTF_RGMII ) { +if (phy_interface_mode_is_rgmii (interface)) {switch (speed) {case SPEED_1000 : clk_sel =ETHER_CLK_SEL_FREQ_SEL_125M ;
@@ -93,7 +92,7 @@ static int visconti_eth_set_clk_tx_rate(void *bsp_priv, struct clk *clk_tx_i, val &= ~ETHER_CLK_SEL_TX_O_E_N_IN ;writel (val, dwmac->reg +REG_ETHER_CLOCK_SEL ); - }else if (dwmac->phy_intf_sel ==ETHER_CONFIG_INTF_RMII ) { + }else if (interface ==PHY_INTERFACE_MODE_RMII ) {switch (speed) {case SPEED_100 : clk_sel =ETHER_CLK_SEL_DIV_SEL_2 ;
@@ -150,28 +149,28 @@ static int visconti_eth_set_clk_tx_rate(void *bsp_priv, struct clk *clk_tx_i,static int visconti_eth_init_hw (struct platform_device *pdev,struct plat_stmmacenet_data *plat_dat) {struct visconti_eth *dwmac = plat_dat->bsp_priv; -unsigned int reg_val, clk_sel_val; +unsigned int clk_sel_val; +u32 phy_intf_sel;switch (plat_dat->phy_interface) {case PHY_INTERFACE_MODE_RGMII :case PHY_INTERFACE_MODE_RGMII_ID :case PHY_INTERFACE_MODE_RGMII_RXID :case PHY_INTERFACE_MODE_RGMII_TXID : - dwmac->phy_intf_sel =ETHER_CONFIG_INTF_RGMII ; + phy_intf_sel =ETHER_CONFIG_INTF_RGMII ;break ;case PHY_INTERFACE_MODE_MII : - dwmac->phy_intf_sel =ETHER_CONFIG_INTF_MII ; + phy_intf_sel =ETHER_CONFIG_INTF_MII ;break ;case PHY_INTERFACE_MODE_RMII : - dwmac->phy_intf_sel =ETHER_CONFIG_INTF_RMII ; + phy_intf_sel =ETHER_CONFIG_INTF_RMII ;break ;default :dev_err (&pdev->dev,"Unsupported phy-mode (%d)\n" , plat_dat->phy_interface);return -EOPNOTSUPP ; } - reg_val = dwmac->phy_intf_sel; -writel (reg_val, dwmac->reg +REG_ETHER_CONTROL ); +writel (phy_intf_sel, dwmac->reg +REG_ETHER_CONTROL );/* Enable TX/RX clock */ clk_sel_val =ETHER_CLK_SEL_FREQ_SEL_125M ;
@@ -181,8 +180,8 @@ static int visconti_eth_init_hw(struct platform_device *pdev, struct plat_stmmac dwmac->reg + REG_ETHER_CLOCK_SEL);/* release internal-reset */ - reg_val |=ETHER_ETH_CONTROL_RESET ; -writel (reg_val, dwmac->reg +REG_ETHER_CONTROL ); + phy_intf_sel |=ETHER_ETH_CONTROL_RESET ; +writel (phy_intf_sel, dwmac->reg +REG_ETHER_CONTROL );return 0 ; }
Signature · 1 line
2.30.2
Re: [PATCH net-next 1/4] net: stmmac: visconti: re-arrange speed decode
In reply to Russell King (Oracle)Quoted 6 lines · Russell King (Oracle)
Re-arrange the speed decode in
visconti_eth_set_clk_tx_rate()to be more readable by first checking to see if we're using RGMII or RMII and then decoding the speed, rather than decoding the speed and then testing the interface mode.Signed-off-by Russell King (Oracle) <[email protected]>
Andrew
Re: [PATCH net-next 2/4] net: stmmac: visconti: reorganise visconti_eth_set_clk_tx_rate()
In reply to Russell King (Oracle)Quoted 8 lines · Russell King (Oracle)
Rather than testing
dwmac->phy_intf_selseveral times for the same values in this function, group the code together. The only part which was common was stopping the internal clock before programming the clock setting.This further improves the readability of this function.
Signed-off-by Russell King (Oracle) <[email protected]>
Andrew
Re: [PATCH net-next 3/4] net: stmmac: visconti: clean up code formatting
In reply to Russell King (Oracle)Quoted 4 lines · Russell King (Oracle)
Ensure that code is wrapped prior to column 80, and shorten the needlessly long "
clk_sel_val" to just "clk_sel".Signed-off-by Russell King (Oracle) <[email protected]>
Andrew
Re: [PATCH net-next 4/4] net: stmmac: visconti: make phy_intf_sel local
In reply to Russell King (Oracle)Quoted 10 lines · Russell King (Oracle)
There is little need to have
phy_intf_selas a member of structvisconti_ethwhen we have the PHY interface mode available from phylink invisconti_eth_set_clk_tx_rate(). Without multiple interface support, phylink is fixed to supporting onlyplat->phy_interface, so we can be sure that "interface" passed into this function is the same asplat->phy_interface.Make
phy_intf_sellocal tovisconti_eth_init_hw()and clean up.Signed-off-by Russell King (Oracle) <[email protected]>
Andrew
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 6 lines · On Mon, 16 Jun 2025 22:05:41 +0100 you wrote:
Hi,
A short series of cleanups to the visconti dwmac glue.
.../net/ethernet/stmicro/stmmac/dwmac-visconti.c | 129 ++++++++++++--------- 1 file changed, 74 insertions(+), 55 deletions(-)
Here is the summary with links:
- [net-next,1/4] net: stmmac: visconti: re-arrange speed decode
https://git.kernel.org/netdev/net-next/c/7d7525876b5a - [net-next,2/4] net: stmmac: visconti: reorganise visconti_eth_set_clk_tx_rate() https://git.kernel.org/netdev/net-next/c/1923c6c3a8b7 - [net-next,3/4] net: stmmac: visconti: clean up code formatting https://git.kernel.org/netdev/net-next/c/1a3a638d2d23 - [net-next,4/4] net: stmmac: visconti: make phy_intf_sel local https://git.kernel.org/netdev/net-next/c/d54d42a41b65
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html