net: ethernet: ti: cpsw: Fix suspend/resume break
Subsystems (3)
PATCH v2 1/1 net: ethernet: ti: cpsw: Fix suspend/resume break
Commit bfe59032bd6127ee190edb30be9381a01765b958 ("net: ethernet:
ti: cpsw: use cpsw as drv data")changes
the driver data to struct cpsw_common *cpsw. This is done only in probe/remove but the suspend/resume functions are still left with struct net_device *ndev. Hence fix both suspend & resume also to fetch the updated driver data.
---
Change in v2:
* Added NULL Checks for cpsw->slaves[i].ndev in suspend/resume functions.
drivers/net/ethernet/ti/cpsw.c | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-)
drivers/net/ethernet/ti/cpsw.c +9 -21
@@ -2590,20 +2590,13 @@ static int cpsw_remove(struct platform_device *pdev)#ifdef CONFIG_PM_SLEEP static int cpsw_suspend (struct device *dev) { -struct net_device *ndev =dev_get_drvdata (dev); -struct cpsw_common *cpsw =ndev_to_cpsw (ndev); - -if (cpsw->data.dual_emac) { -int i; +struct cpsw_common *cpsw =dev_get_drvdata (dev); +int i; -for (i =0 ; i < cpsw->data.slaves; i++) { +for (i =0 ; i < cpsw->data.slaves; i++) +if (cpsw->slaves[i].ndev)if (netif_running (cpsw->slaves[i].ndev))cpsw_ndo_stop (cpsw->slaves[i].ndev); - } - }else { -if (netif_running (ndev)) -cpsw_ndo_stop (ndev); - }/* Select sleep pin state */ pinctrl_pm_select_sleep_state (dev);
@@ -2613,25 +2606,20 @@ static int cpsw_suspend(struct device *dev)static int cpsw_resume (struct device *dev) { -struct net_device *ndev =dev_get_drvdata (dev); -struct cpsw_common *cpsw =ndev_to_cpsw (ndev); +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 (); -if (cpsw->data.dual_emac) { -int i; -for (i =0 ; i < cpsw->data.slaves; i++) { +for (i =0 ; i < cpsw->data.slaves; i++) +if (cpsw->slaves[i].ndev)if (netif_running (cpsw->slaves[i].ndev))cpsw_ndo_open (cpsw->slaves[i].ndev); - } - }else { -if (netif_running (ndev)) -cpsw_ndo_open (ndev); - } +rtnl_unlock ();return 0 ;
Signature · 1 line
2.17.1
David Miller
maintainerFrom: Keerthy <[email protected]>
Date: Mon, 24 Jun 2019 10:46:19 +0530
Quoted 9 lines
Commit
bfe59032bd6127ee190edb30be9381a01765b958("net: ethernet:
ti: cpsw: use cpsw as drv data")changes
the driver data to structcpsw_common*cpsw. This is done only in probe/remove but the suspend/resume functions are still left with structnet_device*ndev. Hence fix both suspend & resume also to fetch the updated driver data.Fixes bfe59032bd6127ee1 ("net: ethernet: ti: cpsw: use cpsw as drv data")Signed-off-by Keerthy <[email protected]>
Applied but please make it clear that changes are targetting net-next in the future by saying "[PATCH net-next v2] ...." in your Subject line.
Thank you.
Quoted 10 lines · David Miller
From: Keerthy <[email protected]>
Date: Mon, 24 Jun 2019 10:46:19 +0530Quoted 7 lines
Commit
bfe59032bd6127ee190edb30be9381a01765b958("net: ethernet:
ti: cpsw: use cpsw as drv data")changes
the driver data to structcpsw_common*cpsw. This is done only in probe/remove but the suspend/resume functions are still left with structnet_device*ndev. Hence fix both suspend & resume also to fetch the updated driver data.
Quoted 5 lines
Quoted 2 lines
Fixes bfe59032bd6127ee1 ("net: ethernet: ti: cpsw: use cpsw as drv data")Signed-off-by Keerthy <[email protected]>Applied but please make it clear that changes are targetting net-next in the future by saying "[PATCH net-next v2] ...." in your Subject line.
Sure will do that. Thanks.
Quoted 3 lines
Thank you.