]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
sky2: Increase D3 delay to sky2 stops working after suspend
authorKai-Heng Feng <kai.heng.feng@canonical.com>
Sat, 31 Mar 2018 15:42:03 +0000 (23:42 +0800)
committerSasha Levin <alexander.levin@microsoft.com>
Wed, 23 May 2018 01:36:30 +0000 (21:36 -0400)
[ Upstream commit afb133637071be6deeb8b3d0e55593ffbf63c527 ]

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>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
drivers/net/ethernet/marvell/sky2.c

index d9f4498832a10b400e31b461e3b821d1fe56f714..bc39fd5e22ad75874a7c0d002c19f580cc505706 100644 (file)
@@ -5067,7 +5067,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;