Unverified Commit 89d73cca authored by Kai Vehmanen's avatar Kai Vehmanen Committed by Mark Brown
Browse files

ASoC: SOF: Intel: hda: fix generic hda codec support 



Add support for using generic codec driver with SOF. Generic driver
is used if:
 - snd_sof_intel_hda_common.hda_model="generic" is set, or
 - fallback if no other codec driver is found

The implementation is aligned with snd-hda-intel driver, and fixes audio
support for systems like Acer Swift 3 SF314-57G, on which this issue was
originally reported.

Signed-off-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: default avatarHui Wang <hui.wang@canonical.com>
Reviewed-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
BugLink: https://github.com/thesofproject/linux/issues/1807
BugLink: https://bugs.launchpad.net/bugs/1877757
Link: https://lore.kernel.org/r/20200529160358.12134-1-kai.vehmanen@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent af89e7da

sound/soc/sof/intel/hda-codec.c

+45 −6
Original line number Diff line number Diff line
@@ -24,19 +24,44 @@ 
#define IDISP_VID_INTEL	0x80860000



/* load the legacy HDA codec driver */

static int hda_codec_load_module(struct hda_codec *codec)

static int request_codec_module(struct hda_codec *codec)

{

#ifdef MODULE

	char alias[MODULE_NAME_LEN];

	const char *module = alias;

	const char *mod = NULL;



	snd_hdac_codec_modalias(&codec->core, alias, sizeof(alias));

	dev_dbg(&codec->core.dev, "loading codec module: %s\n", module);

	request_module(module);

	switch (codec->probe_id) {

	case HDA_CODEC_ID_GENERIC:

#if IS_MODULE(CONFIG_SND_HDA_GENERIC)

		mod = "snd-hda-codec-generic";

#endif

		break;

	default:

		snd_hdac_codec_modalias(&codec->core, alias, sizeof(alias));

		mod = alias;

		break;

	}



	if (mod) {

		dev_dbg(&codec->core.dev, "loading codec module: %s\n", mod);

		request_module(mod);

	}

#endif /* MODULE */

	return device_attach(hda_codec_dev(codec));

}



static int hda_codec_load_module(struct hda_codec *codec)

{

	int ret = request_codec_module(codec);



	if (ret <= 0) {

		codec->probe_id = HDA_CODEC_ID_GENERIC;

		ret = request_codec_module(codec);

	}



	return ret;

}



/* enable controller wake up event for all codecs with jack connectors */

void hda_codec_jack_wake_enable(struct snd_sof_dev *sdev)

{
@@ -78,6 +103,13 @@ void hda_codec_jack_check(struct snd_sof_dev *sdev) {} 
EXPORT_SYMBOL_NS(hda_codec_jack_wake_enable, SND_SOC_SOF_HDA_AUDIO_CODEC);

EXPORT_SYMBOL_NS(hda_codec_jack_check, SND_SOC_SOF_HDA_AUDIO_CODEC);



#if IS_ENABLED(CONFIG_SND_HDA_GENERIC)

#define is_generic_config(bus) \

	((bus)->modelname && !strcmp((bus)->modelname, "generic"))

#else

#define is_generic_config(x)	0

#endif



/* probe individual codec */

static int hda_codec_probe(struct snd_sof_dev *sdev, int address,

			   bool hda_codec_use_common_hdmi)
@@ -87,6 +119,7 @@ static int hda_codec_probe(struct snd_sof_dev *sdev, int address, 
#endif

	struct hda_bus *hbus = sof_to_hbus(sdev);

	struct hdac_device *hdev;

	struct hda_codec *codec;

	u32 hda_cmd = (address << 28) | (AC_NODE_ROOT << 20) |

		(AC_VERB_PARAMETERS << 8) | AC_PAR_VENDOR_ID;

	u32 resp = -1;
@@ -108,6 +141,7 @@ static int hda_codec_probe(struct snd_sof_dev *sdev, int address, 


	hda_priv->codec.bus = hbus;

	hdev = &hda_priv->codec.core;

	codec = &hda_priv->codec;



	ret = snd_hdac_ext_bus_device_init(&hbus->core, address, hdev);

	if (ret < 0)
@@ -122,6 +156,11 @@ static int hda_codec_probe(struct snd_sof_dev *sdev, int address, 
		hda_priv->need_display_power = true;

	}



	if (is_generic_config(hbus))

		codec->probe_id = HDA_CODEC_ID_GENERIC;

	else

		codec->probe_id = 0;



	/*

	 * if common HDMI codec driver is not used, codec load

	 * is skipped here and hdac_hdmi is used instead
@@ -129,7 +168,7 @@ static int hda_codec_probe(struct snd_sof_dev *sdev, int address, 
	if (hda_codec_use_common_hdmi ||

	    (resp & 0xFFFF0000) != IDISP_VID_INTEL) {

		hdev->type = HDA_DEV_LEGACY;

		ret = hda_codec_load_module(&hda_priv->codec);

		ret = hda_codec_load_module(codec);

		/*

		 * handle ret==0 (no driver bound) as an error, but pass

		 * other return codes without modification