Skip to content

Commit c344ef3

Browse files
ujfalusitiwai
authored andcommitted
ASoC: SOF: Intel: hda-codec: Delay the codec device registration
The current code flow is: 1. snd_hdac_device_register() 2. set parameters needed by the hdac driver 3. request_codec_module() the hdac driver is probed at this point During boot the codec drivers are not loaded when the hdac device is registered, it is going to be probed later when loading the codec module, which point the parameters are set. On module remove/insert rmmod snd_sof_pci_intel_tgl modprobe snd_sof_pci_intel_tgl The codec module remains loaded and the driver will be probed when the hdac device is created right away, before the parameters for the driver has been configured: 1. snd_hdac_device_register() the hdac driver is probed at this point 2. set parameters needed by the hdac driver 3. request_codec_module() will be a NOP as the module is already loaded Move the snd_hdac_device_register() later, to be done right before requesting the codec module to make sure that the parameters are all set before the device is created: 1. set parameters needed by the hdac driver 2. snd_hdac_device_register() 3. request_codec_module() This way at the hdac driver probe all parameters will be set in all cases. Link: thesofproject#4731 Fixes: a0575b4 ("ASoC: hdac_hda: Conditionally register dais for HDMI and Analog") Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20231207095425.19597-1-peter.ujfalusi@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org> Link: https://lore.kernel.org/r/ZYvUIxtrqBQZbNlC@shine.dominikbrodowski.net Link: https://bugzilla.kernel.org/show_bug.cgi?id=218304 Signed-off-by: Takashi Iwai <tiwai@suse.de>
1 parent 8c14dbf commit c344ef3

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,16 @@ static int request_codec_module(struct hda_codec *codec)
5454

5555
static int hda_codec_load_module(struct hda_codec *codec)
5656
{
57-
int ret = request_codec_module(codec);
57+
int ret;
58+
59+
ret = snd_hdac_device_register(&codec->core);
60+
if (ret) {
61+
dev_err(&codec->core.dev, "failed to register hdac device\n");
62+
put_device(&codec->core.dev);
63+
return ret;
64+
}
5865

66+
ret = request_codec_module(codec);
5967
if (ret <= 0) {
6068
codec->probe_id = HDA_CODEC_ID_GENERIC;
6169
ret = request_codec_module(codec);
@@ -116,7 +124,6 @@ EXPORT_SYMBOL_NS_GPL(hda_codec_jack_check, SND_SOC_SOF_HDA_AUDIO_CODEC);
116124
static struct hda_codec *hda_codec_device_init(struct hdac_bus *bus, int addr, int type)
117125
{
118126
struct hda_codec *codec;
119-
int ret;
120127

121128
codec = snd_hda_codec_device_init(to_hda_bus(bus), addr, "ehdaudio%dD%d", bus->idx, addr);
122129
if (IS_ERR(codec)) {
@@ -126,13 +133,6 @@ static struct hda_codec *hda_codec_device_init(struct hdac_bus *bus, int addr, i
126133

127134
codec->core.type = type;
128135

129-
ret = snd_hdac_device_register(&codec->core);
130-
if (ret) {
131-
dev_err(bus->dev, "failed to register hdac device\n");
132-
put_device(&codec->core.dev);
133-
return ERR_PTR(ret);
134-
}
135-
136136
return codec;
137137
}
138138

0 commit comments

Comments
 (0)