At Wed, 12 Dec 2012 00:44:33 +0100, Rafael J. Wysocki wrote: > > On Tuesday, December 11, 2012 06:55:08 PM Borislav Petkov wrote: > > On Tue, Dec 11, 2012 at 06:48:23PM +0100, Rafael J. Wysocki wrote: > > > Boris, please send the output of "lspci -vvv' from that box. > > > > Attached. > > So the audio is a Root Complex Integrated Endpoind and there shouldn't be > any problems with it related to PCIe ports power management. > > It looks like azx_runtime_suspend() is new in 3.7 and it returns -EAGAIN > to indicate that it actually can't be suspended (if my understanding the > code is correct). However, it shouldn't do that, because that causes > the runtime PM core to repeat the attempts. It rather should implement > a .runtime_idle() callback returning an error code instead.
Borislav, could you test the patch below? thanks, Takashi --- From: Takashi Iwai <[email protected]> Subject: [PATCH] ALSA: hda - Move runtime PM check to runtime_idle callback The runtime_idle callback is the right place to check the suspend capability, but currently we do it wrongly in the runtime_suspend callback. This leads to a kernel error message like: pci_pm_runtime_suspend(): azx_runtime_suspend+0x0/0x50 [snd_hda_intel] returns -11 and the runtime PM core would even repeat the attempts. Reported-by: Borislav Petkov <[email protected]> Cc: <[email protected]> [v3.7] Signed-off-by: Takashi Iwai <[email protected]> --- sound/pci/hda/hda_intel.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 1da8a5c..0f3d3db 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2691,10 +2691,6 @@ static int azx_runtime_suspend(struct device *dev) struct snd_card *card = dev_get_drvdata(dev); struct azx *chip = card->private_data; - if (!power_save_controller || - !(chip->driver_caps & AZX_DCAPS_PM_RUNTIME)) - return -EAGAIN; - azx_stop_chip(chip); azx_clear_irq_pending(chip); return 0; @@ -2709,12 +2705,25 @@ static int azx_runtime_resume(struct device *dev) azx_init_chip(chip, 1); return 0; } + +static int azx_runtime_idle(struct device *dev) +{ + struct snd_card *card = dev_get_drvdata(dev); + struct azx *chip = card->private_data; + + if (!power_save_controller || + !(chip->driver_caps & AZX_DCAPS_PM_RUNTIME)) + return -EBUSY; + + return 0; +} + #endif /* CONFIG_PM_RUNTIME */ #ifdef CONFIG_PM static const struct dev_pm_ops azx_pm = { SET_SYSTEM_SLEEP_PM_OPS(azx_suspend, azx_resume) - SET_RUNTIME_PM_OPS(azx_runtime_suspend, azx_runtime_resume, NULL) + SET_RUNTIME_PM_OPS(azx_runtime_suspend, azx_runtime_resume, azx_runtime_idle) }; #define AZX_PM_OPS &azx_pm -- 1.8.0.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
