| Message ID | 20210915170255.30561-2-michael.riesch@wolfvision.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | net: stmmac: dwmac-rk: use stmmac helper functions and clean up | expand |
Hi, Am Mittwoch, 15. September 2021, 19:02:53 CEST schrieb Michael Riesch: > Make the stmmac core responsible for suspend, resume and remove by > providing callbacks and using helper functions. > > Signed-off-by: Michael Riesch <michael.riesch@wolfvision.net> this would likely loose wake-on-lan functionality? Right now the homebrew suspend/resume functions handle the device_may_wakeup()-case as well, where the ->init and ->exit functions seem to get called from stmmac_pltfr_suspend / stmmac_pltfr_resume unconditionally instead. While I've never tried wake-on-lan myself, this really looks like this patch would loose the functionality. Heiko > --- > .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 69 +++++-------------- > 1 file changed, 16 insertions(+), 53 deletions(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c > index ed817011a94a..0db8be543ee1 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c > @@ -40,7 +40,6 @@ struct rk_priv_data { > phy_interface_t phy_iface; > int id; > struct regulator *regulator; > - bool suspended; > const struct rk_gmac_ops *ops; > > bool clk_enabled; > @@ -1482,10 +1481,11 @@ static int rk_gmac_check_ops(struct rk_priv_data *bsp_priv) > return 0; > } > > -static int rk_gmac_powerup(struct rk_priv_data *bsp_priv) > +static int rk_gmac_init(struct platform_device *pdev, void *priv) > { > int ret; > - struct device *dev = &bsp_priv->pdev->dev; > + struct device *dev = &pdev->dev; > + struct rk_priv_data *bsp_priv = priv; > > ret = rk_gmac_check_ops(bsp_priv); > if (ret) > @@ -1534,13 +1534,15 @@ static int rk_gmac_powerup(struct rk_priv_data *bsp_priv) > return 0; > } > > -static void rk_gmac_powerdown(struct rk_priv_data *gmac) > +static void rk_gmac_exit(struct platform_device *pdev, void *priv) > { > - if (gmac->integrated_phy) > - rk_gmac_integrated_phy_powerdown(gmac); > + struct rk_priv_data *bsp_priv = priv; > > - phy_power_on(gmac, false); > - gmac_clk_enable(gmac, false); > + if (bsp_priv->integrated_phy) > + rk_gmac_integrated_phy_powerdown(bsp_priv); > + > + phy_power_on(bsp_priv, false); > + gmac_clk_enable(bsp_priv, false); > } > > static void rk_fix_speed(void *priv, unsigned int speed) > @@ -1591,6 +1593,8 @@ static int rk_gmac_probe(struct platform_device *pdev) > */ > if (!plat_dat->has_gmac4) > plat_dat->has_gmac = true; > + plat_dat->init = rk_gmac_init; > + plat_dat->exit = rk_gmac_exit; > plat_dat->fix_mac_speed = rk_fix_speed; > > plat_dat->bsp_priv = rk_gmac_setup(pdev, plat_dat, data); > @@ -1603,7 +1607,7 @@ static int rk_gmac_probe(struct platform_device *pdev) > if (ret) > goto err_remove_config_dt; > > - ret = rk_gmac_powerup(plat_dat->bsp_priv); > + ret = rk_gmac_init(pdev, plat_dat->bsp_priv); > if (ret) > goto err_remove_config_dt; > > @@ -1614,54 +1618,13 @@ static int rk_gmac_probe(struct platform_device *pdev) > return 0; > > err_gmac_powerdown: > - rk_gmac_powerdown(plat_dat->bsp_priv); > + rk_gmac_exit(pdev, plat_dat->bsp_priv); > err_remove_config_dt: > stmmac_remove_config_dt(pdev, plat_dat); > > return ret; > } > > -static int rk_gmac_remove(struct platform_device *pdev) > -{ > - struct rk_priv_data *bsp_priv = get_stmmac_bsp_priv(&pdev->dev); > - int ret = stmmac_dvr_remove(&pdev->dev); > - > - rk_gmac_powerdown(bsp_priv); > - > - return ret; > -} > - > -#ifdef CONFIG_PM_SLEEP > -static int rk_gmac_suspend(struct device *dev) > -{ > - struct rk_priv_data *bsp_priv = get_stmmac_bsp_priv(dev); > - int ret = stmmac_suspend(dev); > - > - /* Keep the PHY up if we use Wake-on-Lan. */ > - if (!device_may_wakeup(dev)) { > - rk_gmac_powerdown(bsp_priv); > - bsp_priv->suspended = true; > - } > - > - return ret; > -} > - > -static int rk_gmac_resume(struct device *dev) > -{ > - struct rk_priv_data *bsp_priv = get_stmmac_bsp_priv(dev); > - > - /* The PHY was up for Wake-on-Lan. */ > - if (bsp_priv->suspended) { > - rk_gmac_powerup(bsp_priv); > - bsp_priv->suspended = false; > - } > - > - return stmmac_resume(dev); > -} > -#endif /* CONFIG_PM_SLEEP */ > - > -static SIMPLE_DEV_PM_OPS(rk_gmac_pm_ops, rk_gmac_suspend, rk_gmac_resume); > - > static const struct of_device_id rk_gmac_dwmac_match[] = { > { .compatible = "rockchip,px30-gmac", .data = &px30_ops }, > { .compatible = "rockchip,rk3128-gmac", .data = &rk3128_ops }, > @@ -1680,10 +1643,10 @@ MODULE_DEVICE_TABLE(of, rk_gmac_dwmac_match); > > static struct platform_driver rk_gmac_dwmac_driver = { > .probe = rk_gmac_probe, > - .remove = rk_gmac_remove, > + .remove = stmmac_pltfr_remove, > .driver = { > .name = "rk_gmac-dwmac", > - .pm = &rk_gmac_pm_ops, > + .pm = &stmmac_pltfr_pm_ops, > .of_match_table = rk_gmac_dwmac_match, > }, > }; >
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c index ed817011a94a..0db8be543ee1 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -40,7 +40,6 @@ struct rk_priv_data { phy_interface_t phy_iface; int id; struct regulator *regulator; - bool suspended; const struct rk_gmac_ops *ops; bool clk_enabled; @@ -1482,10 +1481,11 @@ static int rk_gmac_check_ops(struct rk_priv_data *bsp_priv) return 0; } -static int rk_gmac_powerup(struct rk_priv_data *bsp_priv) +static int rk_gmac_init(struct platform_device *pdev, void *priv) { int ret; - struct device *dev = &bsp_priv->pdev->dev; + struct device *dev = &pdev->dev; + struct rk_priv_data *bsp_priv = priv; ret = rk_gmac_check_ops(bsp_priv); if (ret) @@ -1534,13 +1534,15 @@ static int rk_gmac_powerup(struct rk_priv_data *bsp_priv) return 0; } -static void rk_gmac_powerdown(struct rk_priv_data *gmac) +static void rk_gmac_exit(struct platform_device *pdev, void *priv) { - if (gmac->integrated_phy) - rk_gmac_integrated_phy_powerdown(gmac); + struct rk_priv_data *bsp_priv = priv; - phy_power_on(gmac, false); - gmac_clk_enable(gmac, false); + if (bsp_priv->integrated_phy) + rk_gmac_integrated_phy_powerdown(bsp_priv); + + phy_power_on(bsp_priv, false); + gmac_clk_enable(bsp_priv, false); } static void rk_fix_speed(void *priv, unsigned int speed) @@ -1591,6 +1593,8 @@ static int rk_gmac_probe(struct platform_device *pdev) */ if (!plat_dat->has_gmac4) plat_dat->has_gmac = true; + plat_dat->init = rk_gmac_init; + plat_dat->exit = rk_gmac_exit; plat_dat->fix_mac_speed = rk_fix_speed; plat_dat->bsp_priv = rk_gmac_setup(pdev, plat_dat, data); @@ -1603,7 +1607,7 @@ static int rk_gmac_probe(struct platform_device *pdev) if (ret) goto err_remove_config_dt; - ret = rk_gmac_powerup(plat_dat->bsp_priv); + ret = rk_gmac_init(pdev, plat_dat->bsp_priv); if (ret) goto err_remove_config_dt; @@ -1614,54 +1618,13 @@ static int rk_gmac_probe(struct platform_device *pdev) return 0; err_gmac_powerdown: - rk_gmac_powerdown(plat_dat->bsp_priv); + rk_gmac_exit(pdev, plat_dat->bsp_priv); err_remove_config_dt: stmmac_remove_config_dt(pdev, plat_dat); return ret; } -static int rk_gmac_remove(struct platform_device *pdev) -{ - struct rk_priv_data *bsp_priv = get_stmmac_bsp_priv(&pdev->dev); - int ret = stmmac_dvr_remove(&pdev->dev); - - rk_gmac_powerdown(bsp_priv); - - return ret; -} - -#ifdef CONFIG_PM_SLEEP -static int rk_gmac_suspend(struct device *dev) -{ - struct rk_priv_data *bsp_priv = get_stmmac_bsp_priv(dev); - int ret = stmmac_suspend(dev); - - /* Keep the PHY up if we use Wake-on-Lan. */ - if (!device_may_wakeup(dev)) { - rk_gmac_powerdown(bsp_priv); - bsp_priv->suspended = true; - } - - return ret; -} - -static int rk_gmac_resume(struct device *dev) -{ - struct rk_priv_data *bsp_priv = get_stmmac_bsp_priv(dev); - - /* The PHY was up for Wake-on-Lan. */ - if (bsp_priv->suspended) { - rk_gmac_powerup(bsp_priv); - bsp_priv->suspended = false; - } - - return stmmac_resume(dev); -} -#endif /* CONFIG_PM_SLEEP */ - -static SIMPLE_DEV_PM_OPS(rk_gmac_pm_ops, rk_gmac_suspend, rk_gmac_resume); - static const struct of_device_id rk_gmac_dwmac_match[] = { { .compatible = "rockchip,px30-gmac", .data = &px30_ops }, { .compatible = "rockchip,rk3128-gmac", .data = &rk3128_ops }, @@ -1680,10 +1643,10 @@ MODULE_DEVICE_TABLE(of, rk_gmac_dwmac_match); static struct platform_driver rk_gmac_dwmac_driver = { .probe = rk_gmac_probe, - .remove = rk_gmac_remove, + .remove = stmmac_pltfr_remove, .driver = { .name = "rk_gmac-dwmac", - .pm = &rk_gmac_pm_ops, + .pm = &stmmac_pltfr_pm_ops, .of_match_table = rk_gmac_dwmac_match, }, };
Make the stmmac core responsible for suspend, resume and remove by providing callbacks and using helper functions. Signed-off-by: Michael Riesch <michael.riesch@wolfvision.net> --- .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 69 +++++-------------- 1 file changed, 16 insertions(+), 53 deletions(-)