Commit c0f1886d authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda: intel: Allow repeatedly probing on codec configuration errors 

It seems that a few recent AMD systems show the codec configuration
errors at the early boot, while loading the driver at a later stage
works magically.  Although the root cause of the error isn't clear,
it's certainly not bad to allow retrying the codec probe in such a
case if that helps.

This patch adds the capability for retrying the probe upon codec probe
errors on the certain AMD platforms.  The probe_work is changed to a
delayed work, and at the secondary call, it'll jump to the codec
probing.

Note that, not only adding the re-probing, this includes the behavior
changes in the codec configuration function.  Namely,
snd_hda_codec_configure() won't unregister the codec at errors any
longer.  Instead, its caller, azx_codec_configure() unregisters the
codecs with the probe failures *if* any codec has been successfully
configured.  If all codec probe failed, it doesn't unregister but let
it re-probed -- which is the most case we're seeing and this patch
tries to improve.

Even if the driver doesn't re-probe or give up, it will go to the
"free-all" error path, hence the leftover codecs shall be disabled /
deleted in anyway.

BugLink: https://bugzilla.suse.com/show_bug.cgi?id=1190801
Link: https://lore.kernel.org/r/20211006141940.2897-1-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent dd6dd6e3

include/sound/hda_codec.h

+1 −0
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ struct hda_codec { 
#endif



	/* misc flags */

	unsigned int configured:1; /* codec was configured */

	unsigned int in_freeing:1; /* being released */

	unsigned int registered:1; /* codec was registered */

	unsigned int display_power_control:1; /* needs display power */

sound/pci/hda/hda_bind.c

+11 −9
Original line number Diff line number Diff line
@@ -298,29 +298,31 @@ int snd_hda_codec_configure(struct hda_codec *codec) 
{

	int err;



	if (codec->configured)

		return 0;



	if (is_generic_config(codec))

		codec->probe_id = HDA_CODEC_ID_GENERIC;

	else

		codec->probe_id = 0;



	if (!device_is_registered(&codec->core.dev)) {

		err = snd_hdac_device_register(&codec->core);

		if (err < 0)

			return err;

	}



	if (!codec->preset)

		codec_bind_module(codec);

	if (!codec->preset) {

		err = codec_bind_generic(codec);

		if (err < 0) {

			codec_err(codec, "Unable to bind the codec\n");

			goto error;

			codec_dbg(codec, "Unable to bind the codec\n");

			return err;

		}

	}



	codec->configured = 1;

	return 0;



 error:

	snd_hdac_device_unregister(&codec->core);

	return err;

}

EXPORT_SYMBOL_GPL(snd_hda_codec_configure);

sound/pci/hda/hda_codec.c

+1 −0
Original line number Diff line number Diff line
@@ -791,6 +791,7 @@ void snd_hda_codec_cleanup_for_unbind(struct hda_codec *codec) 
	snd_array_free(&codec->nids);

	remove_conn_list(codec);

	snd_hdac_regmap_exit(&codec->core);

	codec->configured = 0;

}

EXPORT_SYMBOL_GPL(snd_hda_codec_cleanup_for_unbind);

sound/pci/hda/hda_controller.c

+16 −8
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <sound/core.h>

#include <sound/initval.h>

#include "hda_controller.h"

#include "hda_local.h"



#define CREATE_TRACE_POINTS

#include "hda_controller_trace.h"
@@ -1248,17 +1249,24 @@ EXPORT_SYMBOL_GPL(azx_probe_codecs); 
int azx_codec_configure(struct azx *chip)

{

	struct hda_codec *codec, *next;

	int success = 0;



	/* use _safe version here since snd_hda_codec_configure() deregisters

	 * the device upon error and deletes itself from the bus list.

	 */

	list_for_each_codec(codec, &chip->bus) {

		if (!snd_hda_codec_configure(codec))

			success++;

	}



	if (success) {

		/* unregister failed codecs if any codec has been probed */

		list_for_each_codec_safe(codec, next, &chip->bus) {

		snd_hda_codec_configure(codec);

			if (!codec->configured) {

				codec_err(codec, "Unable to configure, disabling\n");

				snd_hdac_device_unregister(&codec->core);

			}

		}

	}



	if (!azx_bus(chip)->num_codecs)

		return -ENODEV;

	return 0;

	return success ? 0 : -ENODEV;

}

EXPORT_SYMBOL_GPL(azx_codec_configure);

sound/pci/hda/hda_controller.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
/* 24 unused */

#define AZX_DCAPS_COUNT_LPIB_DELAY  (1 << 25)	/* Take LPIB as delay */

#define AZX_DCAPS_PM_RUNTIME	(1 << 26)	/* runtime PM support */

/* 27 unused */

#define AZX_DCAPS_RETRY_PROBE	(1 << 27)	/* retry probe if no codec is configured */

#define AZX_DCAPS_CORBRP_SELF_CLEAR (1 << 28)	/* CORBRP clears itself after reset */

#define AZX_DCAPS_NO_MSI64      (1 << 29)	/* Stick to 32-bit MSIs */

#define AZX_DCAPS_SEPARATE_STREAM_TAG	(1 << 30) /* capture and playback use separate stream tag */