Re: [PATCH v1] net: phy: resume phydev when going to RESUMING

[zhangfei <zhangfei.gao@linaro.org>]

On 05/14/2014 09:57 AM, Joe Perches wrote:
> On Wed, 2014-05-14 at 09:40 +0800, Zhangfei Gao wrote:
>> With commit be9dad1f9f26604fb ("net: phy: suspend phydev when going
>> to HALTED"), an unused PHY device will be put in a low-power mode
>> using BMCR_PDOWN. Some Ethernet drivers might be calling phy_start()
>> and phy_stop() from ndo_open and ndo_close() respectively, while
>> calling phy_connect() and phy_disconnect() from probe and remove.
>> In such a case, the PHY will be powered down during the phy_stop()
>> call, but will fail to be powered up in phy_start().
>> This patch fixes this scenario.
>
> trivial notes:
>
>> diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
> []
>> @@ -715,7 +715,7 @@ void phy_state_machine(struct work_struct *work)
>>   	struct delayed_work *dwork = to_delayed_work(work);
>>   	struct phy_device *phydev =
>>   			container_of(dwork, struct phy_device, state_queue);
>> -	int needs_aneg = 0, do_suspend = 0;
>> +	int needs_aneg = 0, do_suspend = 0, do_resume = 0;
>
> Perhaps these 3 vars should bool
Yes, agree.
>
>> @@ -876,6 +878,9 @@ void phy_state_machine(struct work_struct *work)
>>   	if (do_suspend)
>>   		phy_suspend(phydev);
>>
>> +	if (do_resume)
>> +		phy_resume(phydev);
>> +
>
> and these should be else if
>
> 	if (needs_aneg)
> 		...
> 	else if (do_suspend)
> 		...
> 	else if (do_resume)
> 		...
Ok, since needs_aneg can not happen simultaneously with suspend/resume.

Thanks