ASoC: Intel: skl_hda_dsp_generic: Allocate snd_soc_card dynamically

The static hda_soc_card might be modified during runtime which might cause
issues on next time when the card is created.
For example if the dmic_num was set with module parameter then removed for
the next module loading then the card's components will still going to
point to the previous boot's cfg-dmics:X string.

There might be other places where devm allocated memory have been freed but
the hda_soc_card still pointing to the now unallocated memory (the memory
is freed when the platform device is removed).

Fix this issue by moving the snd_soc_card into skl_hda_private and use it
for the card registration to ensure that it is correctly initialized every
time.

Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20240426152123.36284-2-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/skl_hda_dsp_common.h b/sound/soc/intel/boards/skl_hda_dsp_common.h
index 4b0b3959182e5532c7049e1410132a7e0ebb5b5e..19b814dee4ad6d5b1eac81b666b6cd7e0a271de5 100644 (file)
--- a/sound/soc/intel/boards/skl_hda_dsp_common.h
+++ b/sound/soc/intel/boards/skl_hda_dsp_common.h
@@ -28,6 +28,7 @@ struct skl_hda_hdmi_pcm {
 };
 
 struct skl_hda_private {
+       struct snd_soc_card card;
        struct list_head hdmi_pcm_list;
        int pcm_count;
        int dai_index;

diff --git a/sound/soc/intel/boards/skl_hda_dsp_generic.c b/sound/soc/intel/boards/skl_hda_dsp_generic.c
index 4aa7fd2a05e466d3f9ff2ad52e0d1cc4be780443..208395872d8b21f7e14745df8388949f8338b97b 100644 (file)
--- a/sound/soc/intel/boards/skl_hda_dsp_generic.c
+++ b/sound/soc/intel/boards/skl_hda_dsp_generic.c
@@ -92,17 +92,6 @@ skl_hda_add_dai_link(struct snd_soc_card *card, struct snd_soc_dai_link *link)
        return ret;
 }
 
-static struct snd_soc_card hda_soc_card = {
-       .name = "hda-dsp",
-       .owner = THIS_MODULE,
-       .dai_link = skl_hda_be_dai_links,
-       .dapm_widgets = skl_hda_widgets,
-       .dapm_routes = skl_hda_map,
-       .add_dai_link = skl_hda_add_dai_link,
-       .fully_routed = true,
-       .late_probe = skl_hda_card_late_probe,
-};
-
 static char hda_soc_components[30];
 
 #define IDISP_DAI_COUNT                3
@@ -115,9 +104,9 @@ static char hda_soc_components[30];
 
 #define HDA_CODEC_AUTOSUSPEND_DELAY_MS 1000
 
-static int skl_hda_fill_card_info(struct snd_soc_acpi_mach_params *mach_params)
+static int skl_hda_fill_card_info(struct snd_soc_card *card,
+                                 struct snd_soc_acpi_mach_params *mach_params)
 {
-       struct snd_soc_card *card = &hda_soc_card;
        struct skl_hda_private *ctx = snd_soc_card_get_drvdata(card);
        struct snd_soc_dai_link *dai_link;
        u32 codec_count, codec_mask;
@@ -199,6 +188,7 @@ static int skl_hda_audio_probe(struct platform_device *pdev)
 {
        struct snd_soc_acpi_mach *mach;
        struct skl_hda_private *ctx;
+       struct snd_soc_card *card;
        int ret;
 
        dev_dbg(&pdev->dev, "entry\n");
@@ -213,32 +203,42 @@ static int skl_hda_audio_probe(struct platform_device *pdev)
        if (!mach)
                return -EINVAL;
 
-       snd_soc_card_set_drvdata(&hda_soc_card, ctx);
+       card = &ctx->card;
+       card->name = "hda-dsp",
+       card->owner = THIS_MODULE,
+       card->dai_link = skl_hda_be_dai_links,
+       card->dapm_widgets = skl_hda_widgets,
+       card->dapm_routes = skl_hda_map,
+       card->add_dai_link = skl_hda_add_dai_link,
+       card->fully_routed = true,
+       card->late_probe = skl_hda_card_late_probe,
+
+       snd_soc_card_set_drvdata(card, ctx);
 
-       ret = skl_hda_fill_card_info(&mach->mach_params);
+       ret = skl_hda_fill_card_info(card, &mach->mach_params);
        if (ret < 0) {
                dev_err(&pdev->dev, "Unsupported HDAudio/iDisp configuration found\n");
                return ret;
        }
 
-       ctx->pcm_count = hda_soc_card.num_links;
+       ctx->pcm_count = card->num_links;
        ctx->dai_index = 1; /* hdmi codec dai name starts from index 1 */
        ctx->platform_name = mach->mach_params.platform;
        ctx->common_hdmi_codec_drv = mach->mach_params.common_hdmi_codec_drv;
 
-       hda_soc_card.dev = &pdev->dev;
+       card->dev = &pdev->dev;
        if (!snd_soc_acpi_sof_parent(&pdev->dev))
-               hda_soc_card.disable_route_checks = true;
+               card->disable_route_checks = true;
 
        if (mach->mach_params.dmic_num > 0) {
                snprintf(hda_soc_components, sizeof(hda_soc_components),
                                "cfg-dmics:%d", mach->mach_params.dmic_num);
-               hda_soc_card.components = hda_soc_components;
+               card->components = hda_soc_components;
        }
 
-       ret = devm_snd_soc_register_card(&pdev->dev, &hda_soc_card);
+       ret = devm_snd_soc_register_card(&pdev->dev, card);
        if (!ret)
-               skl_set_hda_codec_autosuspend_delay(&hda_soc_card);
+               skl_set_hda_codec_autosuspend_delay(card);
 
        return ret;
 }