[SRU,Artful,1/1] sky2: Increase D3 delay to sky2 stops working after suspend

Message ID 20180412062827.2818-2-kai.heng.feng@canonical.com
State New
Headers show
Series
  • Fix sky2 ethernet stops working after system resume
Related show

Commit Message

Kai Heng Feng April 12, 2018, 6:28 a.m.
The sky2 ethernet stops working after system resume from suspend:
[ 582.852065] sky2 0000:04:00.0: Refused to change power state, currently in D3

The current 150ms delay is not enough, change it to 200ms can solve the
issue.

BugLink: https://bugs.launchpad.net/bugs/1758507
Cc: Stable <stable@vger.kernel.org>
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit afb133637071be6deeb8b3d0e55593ffbf63c527)
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
---
 drivers/net/ethernet/marvell/sky2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Kleber Sacilotto de Souza April 18, 2018, 7:29 a.m. | #1
On 04/12/18 08:28, Kai-Heng Feng wrote:
> The sky2 ethernet stops working after system resume from suspend:
> [ 582.852065] sky2 0000:04:00.0: Refused to change power state, currently in D3
> 
> The current 150ms delay is not enough, change it to 200ms can solve the
> issue.
> 
> BugLink: https://bugs.launchpad.net/bugs/1758507
> Cc: Stable <stable@vger.kernel.org>
> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
> Signed-off-by: David S. Miller <davem@davemloft.net>
> (cherry picked from commit afb133637071be6deeb8b3d0e55593ffbf63c527)
> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>

Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

> ---
>  drivers/net/ethernet/marvell/sky2.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
> index 1145cde2274a..b12e3a4f9439 100644
> --- a/drivers/net/ethernet/marvell/sky2.c
> +++ b/drivers/net/ethernet/marvell/sky2.c
> @@ -5087,7 +5087,7 @@ static int sky2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>  	INIT_WORK(&hw->restart_work, sky2_restart);
>  
>  	pci_set_drvdata(pdev, hw);
> -	pdev->d3_delay = 150;
> +	pdev->d3_delay = 200;
>  
>  	return 0;
>  
>
Stefan Bader April 20, 2018, 8:16 a.m. | #2
On 12.04.2018 08:28, Kai-Heng Feng wrote:
> The sky2 ethernet stops working after system resume from suspend:
> [ 582.852065] sky2 0000:04:00.0: Refused to change power state, currently in D3
> 
> The current 150ms delay is not enough, change it to 200ms can solve the
> issue.
> 
> BugLink: https://bugs.launchpad.net/bugs/1758507
> Cc: Stable <stable@vger.kernel.org>
> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
> Signed-off-by: David S. Miller <davem@davemloft.net>
> (cherry picked from commit afb133637071be6deeb8b3d0e55593ffbf63c527)
> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>

> ---

Just to be sure because there was no Artful task/nomination, this really is
meant to go into Artful?

-Stefan

>  drivers/net/ethernet/marvell/sky2.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
> index 1145cde2274a..b12e3a4f9439 100644
> --- a/drivers/net/ethernet/marvell/sky2.c
> +++ b/drivers/net/ethernet/marvell/sky2.c
> @@ -5087,7 +5087,7 @@ static int sky2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>  	INIT_WORK(&hw->restart_work, sky2_restart);
>  
>  	pci_set_drvdata(pdev, hw);
> -	pdev->d3_delay = 150;
> +	pdev->d3_delay = 200;
>  
>  	return 0;
>  
>
Kai Heng Feng April 20, 2018, 8:19 a.m. | #3
> On Apr 20, 2018, at 4:16 PM, Stefan Bader <stefan.bader@canonical.com>  
> wrote:
>
> On 12.04.2018 08:28, Kai-Heng Feng wrote:
>> The sky2 ethernet stops working after system resume from suspend:
>> [ 582.852065] sky2 0000:04:00.0: Refused to change power state,  
>> currently in D3
>>
>> The current 150ms delay is not enough, change it to 200ms can solve the
>> issue.
>>
>> BugLink: https://bugs.launchpad.net/bugs/1758507
>> Cc: Stable <stable@vger.kernel.org>
>> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
>> Signed-off-by: David S. Miller <davem@davemloft.net>
>> (cherry picked from commit afb133637071be6deeb8b3d0e55593ffbf63c527)
>> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
> Acked-by: Stefan Bader <stefan.bader@canonical.com>
>
>> ---
>
> Just to be sure because there was no Artful task/nomination, this really is
> meant to go into Artful?

Yes. Let me do the nomination now...

Kai-Heng

>
> -Stefan
>
>> drivers/net/ethernet/marvell/sky2.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/ethernet/marvell/sky2.c  
>> b/drivers/net/ethernet/marvell/sky2.c
>> index 1145cde2274a..b12e3a4f9439 100644
>> --- a/drivers/net/ethernet/marvell/sky2.c
>> +++ b/drivers/net/ethernet/marvell/sky2.c
>> @@ -5087,7 +5087,7 @@ static int sky2_probe(struct pci_dev *pdev, const  
>> struct pci_device_id *ent)
>>  	INIT_WORK(&hw->restart_work, sky2_restart);
>>
>>  	pci_set_drvdata(pdev, hw);
>> -	pdev->d3_delay = 150;
>> +	pdev->d3_delay = 200;
>>
>>  	return 0;
Stefan Bader April 20, 2018, 11:51 a.m. | #4
On 12.04.2018 08:28, Kai-Heng Feng wrote:
> The sky2 ethernet stops working after system resume from suspend:
> [ 582.852065] sky2 0000:04:00.0: Refused to change power state, currently in D3
> 
> The current 150ms delay is not enough, change it to 200ms can solve the
> issue.
> 
> BugLink: https://bugs.launchpad.net/bugs/1758507
> Cc: Stable <stable@vger.kernel.org>
> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
> Signed-off-by: David S. Miller <davem@davemloft.net>
> (cherry picked from commit afb133637071be6deeb8b3d0e55593ffbf63c527)
> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
> ---

Applied to artful/master-next

>  drivers/net/ethernet/marvell/sky2.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
> index 1145cde2274a..b12e3a4f9439 100644
> --- a/drivers/net/ethernet/marvell/sky2.c
> +++ b/drivers/net/ethernet/marvell/sky2.c
> @@ -5087,7 +5087,7 @@ static int sky2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>  	INIT_WORK(&hw->restart_work, sky2_restart);
>  
>  	pci_set_drvdata(pdev, hw);
> -	pdev->d3_delay = 150;
> +	pdev->d3_delay = 200;
>  
>  	return 0;
>  
>

Patch

diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index 1145cde2274a..b12e3a4f9439 100644
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -5087,7 +5087,7 @@  static int sky2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	INIT_WORK(&hw->restart_work, sky2_restart);
 
 	pci_set_drvdata(pdev, hw);
-	pdev->d3_delay = 150;
+	pdev->d3_delay = 200;
 
 	return 0;