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 AA35416F0E2; Tue, 7 May 2024 23:11:25 +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=1715123485; cv=none; b=fBNEP1WOWl7QO9iRXYxA2lkYZtAw6itE387NqN8mxdUrzfAPGNmggvo1LHNdoMR1Br7Gn/qFCOnBNpUKzJwGyUX4xQjJ5Wv80VdSK2HIgM05RqhjUJ+p91lnwdDh6AuLreIyg+mzvYYTRSprfw1D2dO6/uaQZqmb8h+zjytmwp8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715123485; c=relaxed/simple; bh=n62GchpgHmjR40eE42PIoLqi1koZrXaqgEhx3LCtJdE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ZBpDO+iV8zD7lGQlk9euAlbszrSpQl3ANF5wM/74I3jE11D2i7QnbmHcLROOKm6BWU1AzTZxGMrURW48lklQZrarg/2Yo4+HCYAjOZezR7kUZLjXFGCRWYEE4tMkZLDFEwN6rqZlqn1cJqJksCsfyPb/7l2bZsyADphF4xUpYPM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iS6evk2K; 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="iS6evk2K" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EDED3C2BBFC; Tue, 7 May 2024 23:11:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1715123485; bh=n62GchpgHmjR40eE42PIoLqi1koZrXaqgEhx3LCtJdE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iS6evk2K3MN2dpwyXxUFvFe7Mecc8O9ydbp9tyyCW9WK9GLjTUzsDnkzqxJA2tpYq Ui6j7JHka4ixpC+iC4OZCrqb3oVPUlDli5khWAvLdcy9i2zalHmEAsi67xHBc1xgDF ScRc5FZnZKszglZHa9p9Fm7gDfb9WNioyp/kbqDkgf2BHH3jyVD9//LoQ9lUQoUzpX jGdhSQGYYbr+f5xLi6g+Zvyjm2S+pFXCPC7JQlpocBQ9TrEXBRXknOmBI4XfIeQKpa VwQffmKw8B/yQHlB6CCjjLCTx/L7TpSdT+YSLSu8zVuta3Q27mkGXiht6Eo+FQfn8V xi7bQWiZnSjQg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Pierre-Louis Bossart , Mauro Carvalho Chehab , Bard Liao , =?UTF-8?q?P=C3=A9ter=20Ujfalusi?= , Takashi Iwai , Sasha Levin , perex@perex.cz, tiwai@suse.com, broonie@kernel.org, amadeuszx.slawinski@linux.intel.com, markhas@chromium.org, bradynorander@gmail.com, linux-sound@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 27/43] ALSA: hda: intel-dsp-config: harden I2C/I2S codec detection Date: Tue, 7 May 2024 19:09:48 -0400 Message-ID: <20240507231033.393285-27-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240507231033.393285-1-sashal@kernel.org> References: <20240507231033.393285-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.30 Content-Transfer-Encoding: 8bit From: Pierre-Louis Bossart [ Upstream commit 79ac4c1443eaec0d09355307043a9149287f23c1 ] The SOF driver is selected whenever specific I2C/I2S HIDs are reported as 'present' in the ACPI DSDT. In some cases, an HID is reported but the hardware does not actually rely on I2C/I2S. This false positive leads to an invalid selection of the SOF driver and as a result an invalid topology is loaded. This patch hardens the detection with a check that the NHLT table is consistent with the report of an I2S-based codec in DSDT. This table should expose at least one SSP endpoint configured for an I2S-codec connection. Tested on Huawei Matebook D14 (NBLB-WAX9N) using an HDaudio codec with an invalid ES8336 ACPI HID reported: [ 7.858249] snd_hda_intel 0000:00:1f.3: DSP detected with PCI class/subclass/prog-if info 0x040380 [ 7.858312] snd_hda_intel 0000:00:1f.3: snd_intel_dsp_find_config: no valid SSP found for HID ESSX8336, skipped Reported-by: Mauro Carvalho Chehab Tested-by: Mauro Carvalho Chehab Closes: https://github.com/thesofproject/linux/issues/4934 Signed-off-by: Pierre-Louis Bossart Reviewed-by: Bard Liao Reviewed-by: Péter Ujfalusi Message-ID: <20240426152818.38443-1-pierre-louis.bossart@linux.intel.com> Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/hda/intel-dsp-config.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c index 6a384b922e4fa..d1f6cdcf1866e 100644 --- a/sound/hda/intel-dsp-config.c +++ b/sound/hda/intel-dsp-config.c @@ -557,9 +557,32 @@ static const struct config_entry *snd_intel_dsp_find_config if (table->codec_hid) { int i; - for (i = 0; i < table->codec_hid->num_codecs; i++) - if (acpi_dev_present(table->codec_hid->codecs[i], NULL, -1)) + for (i = 0; i < table->codec_hid->num_codecs; i++) { + struct nhlt_acpi_table *nhlt; + bool ssp_found = false; + + if (!acpi_dev_present(table->codec_hid->codecs[i], NULL, -1)) + continue; + + nhlt = intel_nhlt_init(&pci->dev); + if (!nhlt) { + dev_warn(&pci->dev, "%s: NHLT table not found, skipped HID %s\n", + __func__, table->codec_hid->codecs[i]); + continue; + } + + if (intel_nhlt_has_endpoint_type(nhlt, NHLT_LINK_SSP) && + intel_nhlt_ssp_endpoint_mask(nhlt, NHLT_DEVICE_I2S)) + ssp_found = true; + + intel_nhlt_free(nhlt); + + if (ssp_found) break; + + dev_warn(&pci->dev, "%s: no valid SSP found for HID %s, skipped\n", + __func__, table->codec_hid->codecs[i]); + } if (i == table->codec_hid->num_codecs) continue; } -- 2.43.0