net: ethernet: ti: cpsw_new: fix suspend/resume
Subsystems (3)
PATCH 1/1 net: ethernet: ti: cpsw_new: fix suspend/resume
Add missed suspend/resume callbacks to properly restore networking after suspend/resume cycle.
Fixes ed3525eda4c4 ("net: ethernet: ti: introduce cpsw switchdev based driver part 1 - dual-emac")
Signed-off-by Grygorii Strashko <[email protected]>
--- drivers/net/ethernet/ti/cpsw_new.c | 53 ++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+)
drivers/net/ethernet/ti/cpsw_new.c +53 -0
@@ -17,6 +17,7 @@#include <linux/phy.h> #include <linux/phy/phy.h> #include <linux/delay.h> +#include <linux/pinctrl/consumer.h> #include <linux/pm_runtime.h> #include <linux/gpio/consumer.h> #include <linux/of.h>
@@ -2070,9 +2071,61 @@ static int cpsw_remove(struct platform_device *pdev)return 0 ; } +static int __maybe_unused cpsw_suspend (struct device *dev) +{ +struct cpsw_common *cpsw =dev_get_drvdata (dev); +int i; + +rtnl_lock (); + +for (i =0 ; i < cpsw->data.slaves; i++) { +struct net_device *ndev = cpsw->slaves[i].ndev; + +if (!(ndev &&netif_running (ndev))) +continue ; + +cpsw_ndo_stop (ndev); + } + +rtnl_unlock (); + +/* Select sleep pin state */ +pinctrl_pm_select_sleep_state (dev); + +return 0 ; +} + +static int __maybe_unused cpsw_resume (struct device *dev) +{ +struct cpsw_common *cpsw =dev_get_drvdata (dev); +int i; + +/* Select default pin state */ +pinctrl_pm_select_default_state (dev); + +/* shut up ASSERT_RTNL() warning in netif_set_real_num_tx/rx_queues */ +rtnl_lock (); + +for (i =0 ; i < cpsw->data.slaves; i++) { +struct net_device *ndev = cpsw->slaves[i].ndev; + +if (!(ndev &&netif_running (ndev))) +continue ; + +cpsw_ndo_open (ndev); + } + +rtnl_unlock (); + +return 0 ; +} + +static SIMPLE_DEV_PM_OPS(cpsw_pm_ops, cpsw_suspend, cpsw_resume); +static struct platform_driver cpsw_driver = { .driver = { .name ="cpsw-switch" , + .pm = &cpsw_pm_ops, .of_match_table = cpsw_of_mtable, }, .probe = cpsw_probe,
Signature · 1 line
2.17.1
David Miller
maintainerFrom: Grygorii Strashko <[email protected]>
Date: Thu, 10 Sep 2020 23:52:29 +0300
Quoted 5 lines
Add missed suspend/resume callbacks to properly restore networking after suspend/resume cycle.
Fixes ed3525eda4c4 ("net: ethernet: ti: introduce cpsw switchdev based driver part 1 - dual-emac")Signed-off-by Grygorii Strashko <[email protected]>
Applied and queued up for -stable, thanks.