net: ethernet: ti/cpsw: do not crash on single-MAC machines during resume
Subsystems (3)
PATCH v2 1/1 net: ethernet: ti/cpsw: do not crash on single-MAC machines during resume
During resume, use for_each_slave to walk the slaves of the cpsw, and soft-reset each of them. This prevents oopses if there is only one slave configured.
Signed-off-by Daniel Mack <[email protected]>
--- drivers/net/ethernet/ti/cpsw.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/net/ethernet/ti/cpsw.c +12 -6
@@ -967,14 +967,19 @@ static inline void cpsw_add_dual_emac_def_ale_entries( priv->host_port, ALE_VLAN, slave->port_vlan); } -static void cpsw_slave_open (struct cpsw_slave *slave,struct cpsw_priv *priv) +static void soft_reset_slave (struct cpsw_slave *slave) {char name[32 ]; -u32 slave_port; - -sprintf (name,"slave-%d" , slave->slave_num); +snprintf (name,sizeof (name),"slave-%d" , slave->slave_num);soft_reset (name, &slave->sliver->soft_reset); +} + +static void cpsw_slave_open (struct cpsw_slave *slave,struct cpsw_priv *priv) +{ +u32 slave_port; + +soft_reset_slave (slave);/* setup priority mapping */ __raw_writel (RX_PRIORITY_MAPPING , &slave->sliver->rx_pri_map);
@@ -2173,8 +2178,9 @@ static int cpsw_suspend(struct device *dev)if (netif_running (ndev))cpsw_ndo_stop (ndev); -soft_reset ("sliver 0" , &priv->slaves[0 ].sliver->soft_reset); -soft_reset ("sliver 1" , &priv->slaves[1 ].sliver->soft_reset); + +for_each_slave (priv, soft_reset_slave); +pm_runtime_put_sync (&pdev->dev);/* Select sleep pin state */
Signature · 1 line
1.8.4.2
Quoted 5 lines · Daniel Mack
During resume, use
for_each_slaveto walk the slaves of the cpsw, and soft-reset each of them. This prevents oopses if there is only one slave configured.Signed-off-by Daniel Mack <[email protected]>
Acked-by Mugunthan V N <[email protected]>
Regards
Mugunthan V N