| Message ID | 20190408105015.12506-1-stefan.bader@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [SRU,B/C] sky2: Increase D3 delay again | expand |
On 08/04/2019 11:50, Stefan Bader wrote: > From: Kai-Heng Feng <kai.heng.feng@canonical.com> > > BugLink: https://bugs.launchpad.net/bugs/1798921 > > Another platform requires even longer delay to make the device work > correctly after S3. > > So increase the delay to 300ms. > > BugLink: https://bugs.launchpad.net/bugs/1798921 > > Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> > Signed-off-by: David S. Miller <davem@davemloft.net> > > (cherry picked from commit 1765f5dcd00963e33f1b8a4e0f34061fbc0e2f7f) > Signed-off-by: Stefan Bader <stefan.bader@canonical.com> > --- > > Note: Was picked up by Xenial via upstream stable, proposing to get > into Bionic and Cosmic, too. > > -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 f3a5fa84860f..57727fe1501e 100644 > --- a/drivers/net/ethernet/marvell/sky2.c > +++ b/drivers/net/ethernet/marvell/sky2.c > @@ -5073,7 +5073,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 = 200; > + pdev->d3_delay = 300; > > return 0; > > Upstream fix that should be in Bionic + Cosmic; fix makes sense. Acked-by: Colin Ian King <colin.king@canonical.com>
On 08.04.19 12:50, Stefan Bader wrote: > From: Kai-Heng Feng <kai.heng.feng@canonical.com> > > BugLink: https://bugs.launchpad.net/bugs/1798921 For applying to the kernels ^this line can be dropped. I failed to notice that it is already present from the upstream commit (below). -Stefan > > Another platform requires even longer delay to make the device work > correctly after S3. > > So increase the delay to 300ms. > > BugLink: https://bugs.launchpad.net/bugs/1798921 > > Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> > Signed-off-by: David S. Miller <davem@davemloft.net> > > (cherry picked from commit 1765f5dcd00963e33f1b8a4e0f34061fbc0e2f7f) > Signed-off-by: Stefan Bader <stefan.bader@canonical.com> > --- > > Note: Was picked up by Xenial via upstream stable, proposing to get > into Bionic and Cosmic, too. > > -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 f3a5fa84860f..57727fe1501e 100644 > --- a/drivers/net/ethernet/marvell/sky2.c > +++ b/drivers/net/ethernet/marvell/sky2.c > @@ -5073,7 +5073,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 = 200; > + pdev->d3_delay = 300; > > return 0; > >
On 4/8/19 12:50 PM, Stefan Bader wrote: > From: Kai-Heng Feng <kai.heng.feng@canonical.com> > > BugLink: https://bugs.launchpad.net/bugs/1798921 > > Another platform requires even longer delay to make the device work > correctly after S3. > > So increase the delay to 300ms. > > BugLink: https://bugs.launchpad.net/bugs/1798921 > > Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> > Signed-off-by: David S. Miller <davem@davemloft.net> > > (cherry picked from commit 1765f5dcd00963e33f1b8a4e0f34061fbc0e2f7f) > Signed-off-by: Stefan Bader <stefan.bader@canonical.com> Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> > --- > > Note: Was picked up by Xenial via upstream stable, proposing to get > into Bionic and Cosmic, too. > > -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 f3a5fa84860f..57727fe1501e 100644 > --- a/drivers/net/ethernet/marvell/sky2.c > +++ b/drivers/net/ethernet/marvell/sky2.c > @@ -5073,7 +5073,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 = 200; > + pdev->d3_delay = 300; > > return 0; > >
On 4/8/19 12:50 PM, Stefan Bader wrote: > From: Kai-Heng Feng <kai.heng.feng@canonical.com> > > BugLink: https://bugs.launchpad.net/bugs/1798921 > > Another platform requires even longer delay to make the device work > correctly after S3. > > So increase the delay to 300ms. > > BugLink: https://bugs.launchpad.net/bugs/1798921 > > Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> > Signed-off-by: David S. Miller <davem@davemloft.net> > > (cherry picked from commit 1765f5dcd00963e33f1b8a4e0f34061fbc0e2f7f) > Signed-off-by: Stefan Bader <stefan.bader@canonical.com> > --- > > Note: Was picked up by Xenial via upstream stable, proposing to get > into Bionic and Cosmic, too. > > -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 f3a5fa84860f..57727fe1501e 100644 > --- a/drivers/net/ethernet/marvell/sky2.c > +++ b/drivers/net/ethernet/marvell/sky2.c > @@ -5073,7 +5073,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 = 200; > + pdev->d3_delay = 300; > > return 0; > > Applied to bionic/master-next and cosmic/master-next branches, removing the topmost BugLink reference. Thanks, Kleber
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c index f3a5fa84860f..57727fe1501e 100644 --- a/drivers/net/ethernet/marvell/sky2.c +++ b/drivers/net/ethernet/marvell/sky2.c @@ -5073,7 +5073,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 = 200; + pdev->d3_delay = 300; return 0;