From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8CD4F24BC17; Mon, 31 Mar 2025 14:56:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743433015; cv=none; b=T9bbfGMYrrrK3o7U/tj1pbdZSzGFZlrwORbtV+1XGbCfCvvuzXXZsn7B/YFepVNd/ArYVg2cj9XkfEAWKkmHKKEAbGND2kZfMKln16ld1ee4g76ohTA0zTcG20YnOJgVNyI0OrxO2Tw4EDz4QBNjBX2zRlljRASuVupC2LYY57w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743433015; c=relaxed/simple; bh=b1/V+LJb7wWO0l16q6z83IF+yad3bbJyQR2CjZm2tHE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=t7adUKSUtu6v8LusGEfWULGVR/hhZRS4+VTgnzye7AFFC1HTsih4KCufro1b2KK1oVtsANiyuUps3Go9znXb1AJ021kLrkaxh7k+Rm4t20ker/jxWjhr0iywWZDGl7vsBNKlWcRkPxYYF5rB2GyCbBcy/QcuUfgDeBb10es27tc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QpneH1Yz; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="QpneH1Yz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CCC1CC4CEE3; Mon, 31 Mar 2025 14:56:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743433015; bh=b1/V+LJb7wWO0l16q6z83IF+yad3bbJyQR2CjZm2tHE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QpneH1Yz2q4Nnq3zD03+7AYkvK1I96RltmrKPmTtYqAs2c7HPKWZzLlGE4vwdHuRy LRQLO1PYcJe520snSpgGZARtXdazl/EVpkJO+o7BCMJMRFD+NkqR53M2w6Jd8uqrfK JJvhhWs6wu2BYhRMQNooul6YQxBeFALvEpBgEz6HX3/hTIxyOtHDRTEO+J/vrE+avM 0pZHRWd5iYEx+qnxrgpVyofOJmcgYXvdRUfnTzaEgJUytEn+byeM/F+moy0BPPB6ni 2CEDw1AVYRn1eagIkqqgpZ0aTgbSiXvPggKNEGWAIuT3KVumkK2KHqssYZ5N0qTQDt eOMUHAraUBJvw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Maxim Mikityanskiy , Takashi Iwai , Sasha Levin , perex@perex.cz, tiwai@suse.com, pierre-louis.bossart@linux.dev, yung-chuan.liao@linux.intel.com, peter.ujfalusi@linux.intel.com, hkallweit1@gmail.com, linux-sound@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 5/9] ALSA: hda: intel: Add Lenovo IdeaPad Z570 to probe denylist Date: Mon, 31 Mar 2025 10:56:38 -0400 Message-Id: <20250331145642.1706037-5-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250331145642.1706037-1-sashal@kernel.org> References: <20250331145642.1706037-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.132 Content-Transfer-Encoding: 8bit From: Maxim Mikityanskiy [ Upstream commit becc794c5e46f4dfca59f2385f78d83fc9e84700 ] Lenovo IdeaPad Z570 with NVIDIA GeForce Ge 540M doesn't have sound on the discrete GPU. The HDA controller in DGPU is disabled by BIOS, but then reenabled by quirk_nvidia_hda(). The probe fails and ends up with the "GPU sound probed, but not operational" error. Add this laptop to DMI-based denylist to prevent probe early. DMI is used, because the audio device has zero subsystem IDs, and this entry would be too much, blocking all 540M chips: PCI_DEVICE_SUB(0x10de, 0x0bea, 0x0000, 0x0000) Also, this laptop comes in a variety of modifications with different NVIDIA GPUs, so the DMI check will cover them all. Signed-off-by: Maxim Mikityanskiy Link: https://patch.msgid.link/20250208214602.39607-3-maxtram95@gmail.com Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- 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 7d0b12aab886f..5eeea9a4d201f 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -37,6 +37,7 @@ #include #include #include +#include #ifdef CONFIG_X86 /* for snoop control */ @@ -2087,6 +2088,27 @@ static const struct pci_device_id driver_denylist[] = { {} }; +static struct pci_device_id driver_denylist_ideapad_z570[] = { + { PCI_DEVICE_SUB(0x10de, 0x0bea, 0x0000, 0x0000) }, /* NVIDIA GF108 HDA */ + {} +}; + +/* DMI-based denylist, to be used when: + * - PCI subsystem IDs are zero, impossible to distinguish from valid sound cards. + * - Different modifications of the same laptop use different GPU models. + */ +static const struct dmi_system_id driver_denylist_dmi[] = { + { + /* No HDA in NVIDIA DGPU. BIOS disables it, but quirk_nvidia_hda() reenables. */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_VERSION, "Ideapad Z570"), + }, + .driver_data = &driver_denylist_ideapad_z570, + }, + {} +}; + static const struct hda_controller_ops pci_hda_ops = { .disable_msi_reset_irq = disable_msi_reset_irq, .position_check = azx_position_check, @@ -2097,6 +2119,7 @@ static DECLARE_BITMAP(probed_devs, SNDRV_CARDS); static int azx_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) { + const struct dmi_system_id *dmi; struct snd_card *card; struct hda_intel *hda; struct azx *chip; @@ -2109,6 +2132,12 @@ static int azx_probe(struct pci_dev *pci, return -ENODEV; } + dmi = dmi_first_match(driver_denylist_dmi); + if (dmi && pci_match_id(dmi->driver_data, pci)) { + dev_info(&pci->dev, "Skipping the device on the DMI denylist\n"); + return -ENODEV; + } + dev = find_first_zero_bit(probed_devs, SNDRV_CARDS); if (dev >= SNDRV_CARDS) return -ENODEV; -- 2.39.5