Re: [PATCH] net: ethernet: ti/cpsw: do not crash on single-MAC machines during resume

[Daniel Mack <zonque@gmail.com>]

On 11/14/2013 02:09 PM, Mugunthan V N wrote:
> On Thursday 14 November 2013 06:26 PM, Daniel Mack wrote:
>> On 11/14/2013 01:45 PM, Mugunthan V N wrote:
>>> On Wednesday 13 November 2013 06:23 PM, Daniel Mack wrote:
>>>> To prevent Oopses, cpsw_suspend() should only soft-reset sliver 1
>>>> on dual MAC enabled machines.
>>>>
>>>> Signed-off-by: Daniel Mack <zonque@gmail.com>
>>>> ---
>>>>  drivers/net/ethernet/ti/cpsw.c | 5 ++++-
>>>>  1 file changed, 4 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
>>>> index edd3e79..702b063 100644
>>>> --- a/drivers/net/ethernet/ti/cpsw.c
>>>> +++ b/drivers/net/ethernet/ti/cpsw.c
>>>> @@ -2173,8 +2173,11 @@ 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);
>>>> +	if (priv->data.dual_emac)
>>>> +		soft_reset("sliver 1", &priv->slaves[1].sliver->soft_reset);
>>> Is this tested on a system with both ports in switch mode?
>> Nope. I got an Ooops when I tried to suspend a machine that has only one
>> slave configured in DTS.
> 
> But the changes above will fail with system with two ports and in switch
> mode.
> 
>>
>>> I don't think this will not work with both ports in switch mode.
>> Why? Isn't priv->data.dual_emac in that case? The same condition is
>> checked for in cpsw_remove().
> In cpsw_remove that check is used to unregister the second network
> interface registered for same device for port 2. Now I got the issue,
> this has to be done via for_each_slave().

Aah, right, thanks :) Will repost.


Daniel