net: stmmac: sunxi cleanups
Subsystems (5)
cover net: stmmac: sunxi cleanups
Hi,
This series cleans up the sunxi (sun7i) code in two ways:
1. it converts to use the new set_clk_tx_rate() method, even though we don't use clk_tx_i. In doing so, I reformat the function to read better, but with no changes to the code.
2. convert from stmmac_dvr_probe() to stmmac_pltfr_probe(), and then to its devm variant, which allows code simplification.
drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 58 +++++++++-------------- 1 file changed, 22 insertions(+), 36 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/3 net: stmmac: sunxi: convert to set_clk_tx_rate()
Convert sunxi to use the set_clk_tx_rate() callback rather than the fix_mac_speed() callback.
--- .../net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c +21 -21
@@ -72,28 +72,28 @@ static void sun7i_gmac_exit(struct platform_device *pdev, void *priv)regulator_disable (gmac->regulator); } -static void sun7i_fix_speed (void *priv,int speed,unsigned int mode) +static int sun7i_set_clk_tx_rate (void *bsp_priv,struct clk *clk_tx_i, +phy_interface_t interface,int speed) { -struct sunxi_priv_data *gmac = priv; - -/* only GMII mode requires us to reconfigure the clock lines */ -if (gmac->interface !=PHY_INTERFACE_MODE_GMII ) -return ; - -if (gmac->clk_enabled) { -clk_disable (gmac->tx_clk); - gmac->clk_enabled =0 ; - } -clk_unprepare (gmac->tx_clk); - -if (speed ==1000 ) { -clk_set_rate (gmac->tx_clk,SUN7I_GMAC_GMII_RGMII_RATE ); -clk_prepare_enable (gmac->tx_clk); - gmac->clk_enabled =1 ; - }else { -clk_set_rate (gmac->tx_clk,SUN7I_GMAC_MII_RATE ); -clk_prepare (gmac->tx_clk); +struct sunxi_priv_data *gmac = bsp_priv; + +if (interface ==PHY_INTERFACE_MODE_GMII ) { +if (gmac->clk_enabled) { +clk_disable (gmac->tx_clk); + gmac->clk_enabled =0 ; + } +clk_unprepare (gmac->tx_clk); + +if (speed ==1000 ) { +clk_set_rate (gmac->tx_clk,SUN7I_GMAC_GMII_RGMII_RATE ); +clk_prepare_enable (gmac->tx_clk); + gmac->clk_enabled =1 ; + }else { +clk_set_rate (gmac->tx_clk,SUN7I_GMAC_MII_RATE ); +clk_prepare (gmac->tx_clk); + } } +return 0 ; }static int sun7i_gmac_probe (struct platform_device *pdev)
@@ -140,7 +140,7 @@ static int sun7i_gmac_probe(struct platform_device *pdev) plat_dat->bsp_priv = gmac; plat_dat->init = sun7i_gmac_init; plat_dat->exit = sun7i_gmac_exit; - plat_dat->fix_mac_speed = sun7i_fix_speed; + plat_dat->set_clk_tx_rate = sun7i_set_clk_tx_rate; plat_dat->tx_fifo_size =4096 ; plat_dat->rx_fifo_size =16384 ;
Signature · 1 line
2.30.2
PATCH 2/3 net: stmmac: sunxi: use stmmac_pltfr_probe()
In reply to Russell King (Oracle)Rather than open-coding the calls to sun7i_gmac_init() and sun7i_gmac_exit() in the probe function, use stmmac_pltfr_probe() which will automatically call the plat_dat->init() and plat_dat->exit() methods appropriately. This simplifies the code.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c +1 -14
@@ -144,20 +144,7 @@ static int sun7i_gmac_probe(struct platform_device *pdev) plat_dat->tx_fifo_size =4096 ; plat_dat->rx_fifo_size =16384 ; - ret =sun7i_gmac_init (pdev, plat_dat->bsp_priv); -if (ret) -return ret; - - ret =stmmac_dvr_probe (&pdev->dev, plat_dat, &stmmac_res); -if (ret) - goto err_gmac_exit; - -return 0 ; - -err_gmac_exit: -sun7i_gmac_exit (pdev, plat_dat->bsp_priv); - -return ret; +return stmmac_pltfr_probe (pdev, plat_dat, &stmmac_res); }static const struct of_device_id sun7i_dwmac_match[] = {
Signature · 1 line
2.30.2
PATCH 3/3 net: stmmac: sunxi: use devm_stmmac_pltfr_probe()
In reply to Russell King (Oracle)Using devm_stmmac_pltfr_probe() simplifies the probe function. This will not only call plat_dat->init (sun7i_dwmac_init), but also plat_dat->exit (sun7i_dwmac_exit) appropriately if stmmac_dvr_probe() fails. This results in an overall simplification of the glue driver.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c +1 -2
@@ -144,7 +144,7 @@ static int sun7i_gmac_probe(struct platform_device *pdev) plat_dat->tx_fifo_size =4096 ; plat_dat->rx_fifo_size =16384 ; -return stmmac_pltfr_probe (pdev, plat_dat, &stmmac_res); +return devm_stmmac_pltfr_probe (pdev, plat_dat, &stmmac_res); }static const struct of_device_id sun7i_dwmac_match[] = {
@@ -155,7 +155,6 @@ MODULE_DEVICE_TABLE(of, sun7i_dwmac_match);static struct platform_driver sun7i_dwmac_driver = { .probe = sun7i_gmac_probe, - .remove = stmmac_pltfr_remove, .driver = { .name ="sun7i-dwmac" , .pm = &stmmac_pltfr_pm_ops,
Signature · 1 line
2.30.2
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 Tue, 15 Apr 2025 13:51:27 +0100 you wrote:
Hi,
This series cleans up the sunxi (sun7i) code in two ways:
1. it converts to use the new
set_clk_tx_rate()method, even though we don't useclk_tx_i. In doing so, I reformat the function to read better, but with no changes to the code.[...]
Here is the summary with links:
- [net-next,1/3] net: stmmac: sunxi: convert to set_clk_tx_rate()
https://git.kernel.org/netdev/net-next/c/a27d798fd83c - [net-next,2/3] net: stmmac: sunxi: use stmmac_pltfr_probe() https://git.kernel.org/netdev/net-next/c/dd2cdba4709f - [net-next,3/3] net: stmmac: sunxi: use devm_stmmac_pltfr_probe() https://git.kernel.org/netdev/net-next/c/69b3e38e2fb5
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html