From patchwork Mon Jul 27 21:34:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "U. Artie Eoff" X-Patchwork-Id: 6876861 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0F0E59F358 for ; Mon, 27 Jul 2015 21:39:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 333CD20719 for ; Mon, 27 Jul 2015 21:39:49 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 00EBA206EB for ; Mon, 27 Jul 2015 21:39:48 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 235082606DA; Mon, 27 Jul 2015 23:39:47 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 6923D265176; Mon, 27 Jul 2015 23:39:23 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 853AF26517A; Mon, 27 Jul 2015 23:39:22 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by alsa0.perex.cz (Postfix) with ESMTP id 756302650C5 for ; Mon, 27 Jul 2015 23:39:02 +0200 (CEST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP; 27 Jul 2015 14:35:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,557,1432623600"; d="scan'208";a="772356499" Received: from uartie-ird.jf.intel.com (HELO localhost.localdomain) ([10.7.199.67]) by orsmga002.jf.intel.com with ESMTP; 27 Jul 2015 14:35:34 -0700 From: "U. Artie Eoff" To: alsa-devel@alsa-project.org, tiwai@suse.de Date: Mon, 27 Jul 2015 14:34:54 -0700 Message-Id: <1438032894-8472-2-git-send-email-ullysses.a.eoff@intel.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1438032894-8472-1-git-send-email-ullysses.a.eoff@intel.com> References: <1438032894-8472-1-git-send-email-ullysses.a.eoff@intel.com> Cc: libin.yang@intel.com, zhuo-hao.lee@intel.com, "U. Artie Eoff" Subject: [alsa-devel] [PATCH 2/2] ALSA: hda - Fix race condition between HDA driver and runtime PM X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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)) return 0; if (!power_save_controller || !azx_has_pm_runtime(chip) || - azx_bus(chip)->codec_powered) + bus->codec_powered || !bus->chip_init) return -EBUSY; return 0;