-----Original Message----- From: Eoff, Ullysses A Sent: Tuesday, July 28, 2015 5:35 AM To: alsa-devel@alsa-project.org; tiwai@suse.de Cc: Lee, Zhuo-hao; Yang, Libin; Eoff, Ullysses A Subject: [PATCH 2/2] ALSA: hda - Fix race condition between HDA driver and runtime PM
Don't execute runtime suspend if HDA is not finished initializing. Otherwise, the following errors can occur in hda:
snd_hda_intel 0000:00:1b.0: CORB reset timeout#2, CORBRP = 65535 snd_hda_intel 0000:00:1b.0: no codecs initialized
Debugged and root-cause found by zhuo-hao.lee@intel.com
Signed-off-by: U. Artie Eoff ullysses.a.eoff@intel.com
sound/pci/hda/hda_intel.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index b729b25a6ad6..062f2400dbc7 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1017,17 +1017,20 @@ static int azx_runtime_idle(struct device *dev) struct snd_card *card = dev_get_drvdata(dev); struct azx *chip; struct hda_intel *hda;
struct hdac_bus *bus;
if (!card) return 0;
chip = card->private_data; hda = container_of(chip, struct hda_intel, chip);
- if (chip->disabled || hda->init_failed || !chip->running)
- bus = azx_bus(chip);
- if (chip->disabled || hda->init_failed ||
(bus->chip_init && !chip->running))
If you only want not to execute runtime suspend when HDA is not finished initializing, (bus->chip_init && !chip->running) is not necessary here.
if (!power_save_controller || !azx_has_pm_runtime(chip) ||
azx_bus(chip)->codec_powered)
bus->codec_powered || !bus->chip_init)return -EBUSY;
return 0;
-- 1.9.3