| Message ID | 1450416558-27381-1-git-send-email-xiong.y.zhang@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, 18 Dec 2015 06:29:18 +0100, Xiong Zhang wrote: > > It takes three minutes to enter into hibernation on some OEM SKL > machines and we see many codec spurious response after thaw() opertion. > This is because HDA is still in D0 state after freeze() call and > pci_pm_freeze/pci_pm_freeze_noirq() don't set D3 hot in pci_bus driver. > It seems bios still access HDA when system enter into freeze state, > HDA will receive codec response interrupt immediately after thaw() call. > Because of this unexpected interrupt, HDA enter into a abnormal > state and slow down the system enter into hibernation. > > In this patch, we put HDA into D3 hot state in azx_freeze_noirq() and > put HDA into D0 state in azx_thaw_noirq(). > > V2: Only apply this fix to SKL+ > Fix compile error when CONFIG_PM_SLEEP isn't defined > > Signed-off-by: Xiong Zhang <xiong.y.zhang@intel.com> Thanks, applied now with a few more fixes. I moved azx_freeze_noirq() and azx_thaw_noirq() in another ifdef CONFIG_PM_SLEEP, as the place you added isn't only for CONFIG_PM_SLEEP and it may lead to compile warnings via randconfig. Also, I added a comment as a brief explanation in the code. Takashi > --- > sound/pci/hda/hda_intel.c | 29 +++++++++++++++++++++++++++++ > 1 file changed, 29 insertions(+) > > diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c > index c38c68f..03d3cef 100644 > --- a/sound/pci/hda/hda_intel.c > +++ b/sound/pci/hda/hda_intel.c > @@ -890,6 +890,21 @@ static int azx_suspend(struct device *dev) > return 0; > } > > +#define IS_SKL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa170) > +#define IS_SKL_LP(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x9d70) > +#define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98) > +#define IS_SKL_PLUS(pci) (IS_SKL(pci) || IS_SKL_LP(pci) || IS_BXT(pci)) > + > +static int azx_freeze_noirq(struct device *dev) > +{ > + struct pci_dev *pci = to_pci_dev(dev); > + > + if (IS_SKL_PLUS(pci)) > + pci_set_power_state(pci, PCI_D3hot); > + > + return 0; > +} > + > static int azx_resume(struct device *dev) > { > struct pci_dev *pci = to_pci_dev(dev); > @@ -924,6 +939,16 @@ static int azx_resume(struct device *dev) > trace_azx_resume(chip); > return 0; > } > + > +static int azx_thaw_noirq(struct device *dev) > +{ > + struct pci_dev *pci = to_pci_dev(dev); > + > + if (IS_SKL_PLUS(pci)) > + pci_set_power_state(pci, PCI_D0); > + > + return 0; > +} > #endif /* CONFIG_PM_SLEEP || SUPPORT_VGA_SWITCHEROO */ > > #ifdef CONFIG_PM > @@ -1035,6 +1060,10 @@ static int azx_runtime_idle(struct device *dev) > > static const struct dev_pm_ops azx_pm = { > SET_SYSTEM_SLEEP_PM_OPS(azx_suspend, azx_resume) > +#if defined(CONFIG_PM_SLEEP) > + .freeze_noirq = azx_freeze_noirq, > + .thaw_noirq = azx_thaw_noirq, > +#endif > SET_RUNTIME_PM_OPS(azx_runtime_suspend, azx_runtime_resume, azx_runtime_idle) > }; > > -- > 1.8.2.1 > > _______________________________________________ > Alsa-devel mailing list > Alsa-devel@alsa-project.org > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel >
On Fri, 18 Dec 2015 09:39:45 +0100, Takashi Iwai wrote: > > On Fri, 18 Dec 2015 06:29:18 +0100, > Xiong Zhang wrote: > > > > It takes three minutes to enter into hibernation on some OEM SKL > > machines and we see many codec spurious response after thaw() opertion. > > This is because HDA is still in D0 state after freeze() call and > > pci_pm_freeze/pci_pm_freeze_noirq() don't set D3 hot in pci_bus driver. > > It seems bios still access HDA when system enter into freeze state, > > HDA will receive codec response interrupt immediately after thaw() call. > > Because of this unexpected interrupt, HDA enter into a abnormal > > state and slow down the system enter into hibernation. > > > > In this patch, we put HDA into D3 hot state in azx_freeze_noirq() and > > put HDA into D0 state in azx_thaw_noirq(). > > > > V2: Only apply this fix to SKL+ > > Fix compile error when CONFIG_PM_SLEEP isn't defined > > > > Signed-off-by: Xiong Zhang <xiong.y.zhang@intel.com> > > Thanks, applied now with a few more fixes. I moved azx_freeze_noirq() > and azx_thaw_noirq() in another ifdef CONFIG_PM_SLEEP, as the place > you added isn't only for CONFIG_PM_SLEEP and it may lead to compile > warnings via randconfig. Also, I added a comment as a brief > explanation in the code. Oh, also I added stable to Cc. Takashi
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index c38c68f..03d3cef 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -890,6 +890,21 @@ static int azx_suspend(struct device *dev) return 0; } +#define IS_SKL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa170) +#define IS_SKL_LP(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x9d70) +#define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98) +#define IS_SKL_PLUS(pci) (IS_SKL(pci) || IS_SKL_LP(pci) || IS_BXT(pci)) + +static int azx_freeze_noirq(struct device *dev) +{ + struct pci_dev *pci = to_pci_dev(dev); + + if (IS_SKL_PLUS(pci)) + pci_set_power_state(pci, PCI_D3hot); + + return 0; +} + static int azx_resume(struct device *dev) { struct pci_dev *pci = to_pci_dev(dev); @@ -924,6 +939,16 @@ static int azx_resume(struct device *dev) trace_azx_resume(chip); return 0; } + +static int azx_thaw_noirq(struct device *dev) +{ + struct pci_dev *pci = to_pci_dev(dev); + + if (IS_SKL_PLUS(pci)) + pci_set_power_state(pci, PCI_D0); + + return 0; +} #endif /* CONFIG_PM_SLEEP || SUPPORT_VGA_SWITCHEROO */ #ifdef CONFIG_PM @@ -1035,6 +1060,10 @@ static int azx_runtime_idle(struct device *dev) static const struct dev_pm_ops azx_pm = { SET_SYSTEM_SLEEP_PM_OPS(azx_suspend, azx_resume) +#if defined(CONFIG_PM_SLEEP) + .freeze_noirq = azx_freeze_noirq, + .thaw_noirq = azx_thaw_noirq, +#endif SET_RUNTIME_PM_OPS(azx_runtime_suspend, azx_runtime_resume, azx_runtime_idle) };
It takes three minutes to enter into hibernation on some OEM SKL machines and we see many codec spurious response after thaw() opertion. This is because HDA is still in D0 state after freeze() call and pci_pm_freeze/pci_pm_freeze_noirq() don't set D3 hot in pci_bus driver. It seems bios still access HDA when system enter into freeze state, HDA will receive codec response interrupt immediately after thaw() call. Because of this unexpected interrupt, HDA enter into a abnormal state and slow down the system enter into hibernation. In this patch, we put HDA into D3 hot state in azx_freeze_noirq() and put HDA into D0 state in azx_thaw_noirq(). V2: Only apply this fix to SKL+ Fix compile error when CONFIG_PM_SLEEP isn't defined Signed-off-by: Xiong Zhang <xiong.y.zhang@intel.com> --- sound/pci/hda/hda_intel.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)