Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: SOF: Intel: Retry codec probing if it fails

On the latest Lenovo Thinkstation laptops, we often experience the
speaker failure after rebooting, check the dmesg, we could see:
sof-audio-pci-intel-tgl 0000:00:1f.3: codec #0 probe error, ret: -5

The analogue codec on the machine is ALC287, then we designed a
testcase to reboot and check the codec probing result repeatedly, we
found the analogue codec probing always failed at least once within
several minutes to several hours (roughly 1 reboot per min). This
issue happens on all laptops of this Thinkstation model, but with
legacy HDA driver, we couldn't reproduce this issue on those laptops.
And so far, this issue is not reproduced on machines which don't
belong to this model.

We tried to make the hda_dsp_ctrl_init_chip() same as
hda_intel_init_chip() which is the controller init routine in the
legacy HDA driver, but it didn't help.

We found when issue happens, the resp is -1, and if we let driver
re-run send_cmd() and get_response(), it will get the correct response
10ec0287, then driver continues the rest work, finally boot to the
desktop and all audio function work well.

Here adding codec probing retries to 3 times, it could fix the issue
on this Thinkstation model, and it doesn't bring impact to other
machines.

Reviewed-by: Bard Liao <bard.liao@intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Hui Wang <hui.wang@canonical.com>
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20211130090606.529348-1-kai.vehmanen@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Hui Wang and committed by
Mark Brown
046aede2 d5c137f4

+9 -5
+9 -5
sound/soc/sof/intel/hda-codec.c
··· 22 22 23 23 #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC) 24 24 #define IDISP_VID_INTEL 0x80860000 25 + #define CODEC_PROBE_RETRIES 3 25 26 26 27 /* load the legacy HDA codec driver */ 27 28 static int request_codec_module(struct hda_codec *codec) ··· 122 121 u32 hda_cmd = (address << 28) | (AC_NODE_ROOT << 20) | 123 122 (AC_VERB_PARAMETERS << 8) | AC_PAR_VENDOR_ID; 124 123 u32 resp = -1; 125 - int ret; 124 + int ret, retry = 0; 126 125 127 - mutex_lock(&hbus->core.cmd_mutex); 128 - snd_hdac_bus_send_cmd(&hbus->core, hda_cmd); 129 - snd_hdac_bus_get_response(&hbus->core, address, &resp); 130 - mutex_unlock(&hbus->core.cmd_mutex); 126 + do { 127 + mutex_lock(&hbus->core.cmd_mutex); 128 + snd_hdac_bus_send_cmd(&hbus->core, hda_cmd); 129 + snd_hdac_bus_get_response(&hbus->core, address, &resp); 130 + mutex_unlock(&hbus->core.cmd_mutex); 131 + } while (resp == -1 && retry++ < CODEC_PROBE_RETRIES); 132 + 131 133 if (resp == -1) 132 134 return -EIO; 133 135 dev_dbg(sdev->dev, "HDA codec #%d probed OK: response: %x\n",