Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29ABEC55191 for ; Fri, 24 Apr 2020 12:25:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F02FB2087E for ; Fri, 24 Apr 2020 12:25:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587731148; bh=OHarCE3z2KwdDvsY2ukKKecY1NjLvv7Vo6kyrUUarDw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kDCxxIgeHr7CwdiLeVL5OAOJCz/Kv1qDb6W0n+6vvApIa/M0KESk1EEY/A6346ItF 78pr/HWXrUGtqc/ahxv2ZXtg8Z32gqkSigKwbz6wKR+gl0bHz8rb83OO3VIzVTEurD wF64wPOUleT2s9zxaupqCsL3OcMua1p9s3/dPDdM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727798AbgDXMZp (ORCPT ); Fri, 24 Apr 2020 08:25:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:56144 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728628AbgDXMZH (ORCPT ); Fri, 24 Apr 2020 08:25:07 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B020921473; Fri, 24 Apr 2020 12:25:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587731106; bh=OHarCE3z2KwdDvsY2ukKKecY1NjLvv7Vo6kyrUUarDw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kklnnEjH3JhgBl3A0amsTVWK08SORJbp3OkTqQ5HDmW9VA+Fqd6zsTwwDt5Sr/Pkb SzDCKwjzaYOb6leUN1pWM7cb8lU6dU4yzsKetpJt9X2hdziPwYmTg5cM0+OLW5qHK1 y3Zr1JE1uDJZrRIeGNG4s/BUVU6bMej+Kd+O0W+M= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Takashi Iwai , Roy Spliet , Sasha Levin , alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 4.4 2/8] ALSA: hda: Keep the controller initialization even if no codecs found Date: Fri, 24 Apr 2020 08:24:57 -0400 Message-Id: <20200424122503.11046-2-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200424122503.11046-1-sashal@kernel.org> References: <20200424122503.11046-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Takashi Iwai [ Upstream commit 9479e75fca370a5220784f7596bf598c4dad0b9b ] Currently, when the HD-audio controller driver doesn't detect any codecs, it tries to abort the probe. But this abort happens at the delayed probe, i.e. the primary probe call already returned success, hence the driver is never unbound until user does so explicitly. As a result, it may leave the HD-audio device in the running state without the runtime PM. More badly, if the device is a HD-audio bus that is tied with a GPU, GPU cannot reach to the full power down and consumes unnecessarily much power. This patch changes the logic after no-codec situation; it continues probing without the further codec initialization but keep the controller driver running normally. BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=207043 Tested-by: Roy Spliet Link: https://lore.kernel.org/r/20200413082034.25166-5-tiwai@suse.de Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/pci/hda/hda_intel.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 0fa0c33660087..8bcf67fe84eb5 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1817,7 +1817,7 @@ static int azx_first_init(struct azx *chip) /* codec detection */ if (!azx_bus(chip)->codec_mask) { dev_err(card->dev, "no codecs found!\n"); - return -ENODEV; + /* keep running the rest for the runtime PM */ } if (azx_acquire_irq(chip, 0) < 0) @@ -2140,9 +2140,11 @@ static int azx_probe_continue(struct azx *chip) #endif /* create codec instances */ - err = azx_probe_codecs(chip, azx_max_codecs[chip->driver_type]); - if (err < 0) - goto out_free; + if (bus->codec_mask) { + err = azx_probe_codecs(chip, azx_max_codecs[chip->driver_type]); + if (err < 0) + goto out_free; + } #ifdef CONFIG_SND_HDA_PATCH_LOADER if (chip->fw) { @@ -2156,7 +2158,7 @@ static int azx_probe_continue(struct azx *chip) #endif } #endif - if ((probe_only[dev] & 1) == 0) { + if (bus->codec_mask && !(probe_only[dev] & 1)) { err = azx_codec_configure(chip); if (err < 0) goto out_free; -- 2.20.1