| Message ID | 20240426152818.38443-1-pierre-louis.bossart@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ALSA: hda: intel-dsp-config: harden I2C/I2S codec detection | expand |
On Fri, 26 Apr 2024 17:28:18 +0200, Pierre-Louis Bossart wrote: > > 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 <mchehab@kernel.org> > Tested-by: Mauro Carvalho Chehab <mchehab@kernel.org> > Closes: https://github.com/thesofproject/linux/issues/4934 > Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com> > Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com> Applied now. Thanks. Takashi
diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c index 6a384b922e4f..d1f6cdcf1866 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; }