| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Mon, 7 Jun 2021 08:32:35 -0500
From: Pierre-Louis Bossart <pierre-louis.bossart@...ux.intel.com>
To: Brent Lu <brent.lu@...el.com>, alsa-devel@...a-project.org
Cc: Cezary Rojewski <cezary.rojewski@...el.com>,
Liam Girdwood <liam.r.girdwood@...ux.intel.com>,
Jie Yang <yang.jie@...ux.intel.com>,
Mark Brown <broonie@...nel.org>,
Jaroslav Kysela <perex@...ex.cz>,
Takashi Iwai <tiwai@...e.com>,
Rander Wang <rander.wang@...el.com>,
Guennadi Liakhovetski <guennadi.liakhovetski@...ux.intel.com>,
linux-kernel@...r.kernel.org,
Ranjani Sridharan <ranjani.sridharan@...ux.intel.com>,
Kai Vehmanen <kai.vehmanen@...ux.intel.com>,
Dharageswari R <dharageswari.r@...el.com>,
Sathyanarayana Nujella <sathyanarayana.nujella@...el.com>,
Bard Liao <yung-chuan.liao@...ux.intel.com>,
Kuninori Morimoto <kuninori.morimoto.gx@...esas.com>,
Naveen Manohar <naveen.m@...el.com>,
Yong Zhi <yong.zhi@...el.com>,
Vamshi Krishna Gopal <vamshi.krishna.gopal@...el.com>,
Fred Oh <fred.oh@...ux.intel.com>,
Tzung-Bi Shih <tzungbi@...gle.com>
Subject: Re: [PATCH 1/4] ASoC: Intel: sof_cs42l42: support JSL DAI link
sequence
On 6/5/21 7:40 PM, Brent Lu wrote:
> The backend DAI link sequence of GLK platform is different from the
> sequence of other platforms. We refactor the sof_card_dai_links_create()
> function to support both style.
>
> GLK: SPK - HP - DMIC - HDMI
> Other: HP - DMIC - HDMI - SPK
I am really confused here.
The dailink sequence is whatever we want it to be. What matters is that
the dailink ID matches what is in the topology.
Is this saying that the GLK and JSL topologies did not follow any sort
of convention? Can you elaborate more on what is the issue?
Put differently, why can't we fix the topology instead with a reorder of
the dailinks?
>
> Signed-off-by: Brent Lu <brent.lu@...el.com>
> ---
> sound/soc/intel/boards/sof_cs42l42.c | 318 ++++++++++++++++++---------
> 1 file changed, 208 insertions(+), 110 deletions(-)
>
> diff --git a/sound/soc/intel/boards/sof_cs42l42.c b/sound/soc/intel/boards/sof_cs42l42.c
> index 8919d3ba3c89..e3171242f612 100644
> --- a/sound/soc/intel/boards/sof_cs42l42.c
> +++ b/sound/soc/intel/boards/sof_cs42l42.c
> @@ -259,133 +259,166 @@ static struct snd_soc_dai_link_component dmic_component[] = {
> }
> };
>
> -static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
> - int ssp_codec,
> - int ssp_amp,
> - int dmic_be_num,
> - int hdmi_num)
> +static int create_spk_amp_dai_links(struct device *dev,
> + struct snd_soc_dai_link *links,
> + struct snd_soc_dai_link_component *cpus,
> + int *id, int ssp_amp)
> {
> - struct snd_soc_dai_link_component *idisp_components;
> - struct snd_soc_dai_link_component *cpus;
> - struct snd_soc_dai_link *links;
> - int i, id = 0;
> -
> - links = devm_kzalloc(dev, sizeof(struct snd_soc_dai_link) *
> - sof_audio_card_cs42l42.num_links, GFP_KERNEL);
> - cpus = devm_kzalloc(dev, sizeof(struct snd_soc_dai_link_component) *
> - sof_audio_card_cs42l42.num_links, GFP_KERNEL);
> - if (!links || !cpus)
> - goto devm_err;
> + int ret = 0;
>
> /* speaker amp */
> - if (sof_cs42l42_quirk & SOF_SPEAKER_AMP_PRESENT) {
> - links[id].name = devm_kasprintf(dev, GFP_KERNEL,
> - "SSP%d-Codec", ssp_amp);
> - if (!links[id].name)
> - goto devm_err;
> + if (!(sof_cs42l42_quirk & SOF_SPEAKER_AMP_PRESENT))
> + return 0;
>
> - links[id].id = id;
> + links[*id].name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d-Codec",
> + ssp_amp);
> + if (!links[*id].name) {
> + ret = -ENOMEM;
> + goto devm_err;
> + }
>
> - if (sof_cs42l42_quirk & SOF_MAX98357A_SPEAKER_AMP_PRESENT) {
> - max_98357a_dai_link(&links[id]);
> - } else {
> - dev_err(dev, "no amp defined\n");
> - goto devm_err;
> - }
> + links[*id].id = *id;
>
> - links[id].platforms = platform_component;
> - links[id].num_platforms = ARRAY_SIZE(platform_component);
> - links[id].dpcm_playback = 1;
> - links[id].no_pcm = 1;
> - links[id].cpus = &cpus[id];
> - links[id].num_cpus = 1;
> -
> - links[id].cpus->dai_name = devm_kasprintf(dev, GFP_KERNEL,
> - "SSP%d Pin",
> - ssp_amp);
> - if (!links[id].cpus->dai_name)
> - goto devm_err;
> + if (sof_cs42l42_quirk & SOF_MAX98357A_SPEAKER_AMP_PRESENT) {
> + max_98357a_dai_link(&links[*id]);
> + } else {
> + dev_err(dev, "no amp defined\n");
> + ret = -EINVAL;
> + goto devm_err;
> + }
>
> - id++;
> + links[*id].platforms = platform_component;
> + links[*id].num_platforms = ARRAY_SIZE(platform_component);
> + links[*id].dpcm_playback = 1;
> + links[*id].no_pcm = 1;
> + links[*id].cpus = &cpus[*id];
> + links[*id].num_cpus = 1;
> +
> + links[*id].cpus->dai_name = devm_kasprintf(dev, GFP_KERNEL,
> + "SSP%d Pin", ssp_amp);
> + if (!links[*id].cpus->dai_name) {
> + ret = -ENOMEM;
> + goto devm_err;
> }
>
> + (*id)++;
> +
> +devm_err:
> + return ret;
> +}
> +
> +static int create_hp_codec_dai_links(struct device *dev,
> + struct snd_soc_dai_link *links,
> + struct snd_soc_dai_link_component *cpus,
> + int *id, int ssp_codec)
> +{
> /* codec SSP */
> - links[id].name = devm_kasprintf(dev, GFP_KERNEL,
> - "SSP%d-Codec", ssp_codec);
> - if (!links[id].name)
> + links[*id].name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d-Codec",
> + ssp_codec);
> + if (!links[*id].name)
> goto devm_err;
>
> - links[id].id = id;
> - links[id].codecs = cs42l42_component;
> - links[id].num_codecs = ARRAY_SIZE(cs42l42_component);
> - links[id].platforms = platform_component;
> - links[id].num_platforms = ARRAY_SIZE(platform_component);
> - links[id].init = sof_cs42l42_init;
> - links[id].exit = sof_cs42l42_exit;
> - links[id].ops = &sof_cs42l42_ops;
> - links[id].dpcm_playback = 1;
> - links[id].dpcm_capture = 1;
> - links[id].no_pcm = 1;
> - links[id].cpus = &cpus[id];
> - links[id].num_cpus = 1;
> -
> - links[id].cpus->dai_name = devm_kasprintf(dev, GFP_KERNEL,
> - "SSP%d Pin",
> - ssp_codec);
> - if (!links[id].cpus->dai_name)
> + links[*id].id = *id;
> + links[*id].codecs = cs42l42_component;
> + links[*id].num_codecs = ARRAY_SIZE(cs42l42_component);
> + links[*id].platforms = platform_component;
> + links[*id].num_platforms = ARRAY_SIZE(platform_component);
> + links[*id].init = sof_cs42l42_init;
> + links[*id].exit = sof_cs42l42_exit;
> + links[*id].ops = &sof_cs42l42_ops;
> + links[*id].dpcm_playback = 1;
> + links[*id].dpcm_capture = 1;
> + links[*id].no_pcm = 1;
> + links[*id].cpus = &cpus[*id];
> + links[*id].num_cpus = 1;
> +
> + links[*id].cpus->dai_name = devm_kasprintf(dev, GFP_KERNEL,
> + "SSP%d Pin",
> + ssp_codec);
> + if (!links[*id].cpus->dai_name)
> goto devm_err;
>
> - id++;
> + (*id)++;
> +
> + return 0;
> +
> +devm_err:
> + return -ENOMEM;
> +}
> +
> +static int create_dmic_dai_links(struct device *dev,
> + struct snd_soc_dai_link *links,
> + struct snd_soc_dai_link_component *cpus,
> + int *id, int dmic_be_num)
> +{
> + int i;
>
> /* dmic */
> - if (dmic_be_num > 0) {
> - /* at least we have dmic01 */
> - links[id].name = "dmic01";
> - links[id].cpus = &cpus[id];
> - links[id].cpus->dai_name = "DMIC01 Pin";
> - links[id].init = dmic_init;
> - if (dmic_be_num > 1) {
> - /* set up 2 BE links at most */
> - links[id + 1].name = "dmic16k";
> - links[id + 1].cpus = &cpus[id + 1];
> - links[id + 1].cpus->dai_name = "DMIC16k Pin";
> - dmic_be_num = 2;
> - }
> + if (dmic_be_num <= 0)
> + return 0;
> +
> + /* at least we have dmic01 */
> + links[*id].name = "dmic01";
> + links[*id].cpus = &cpus[*id];
> + links[*id].cpus->dai_name = "DMIC01 Pin";
> + links[*id].init = dmic_init;
> + if (dmic_be_num > 1) {
> + /* set up 2 BE links at most */
> + links[*id + 1].name = "dmic16k";
> + links[*id + 1].cpus = &cpus[*id + 1];
> + links[*id + 1].cpus->dai_name = "DMIC16k Pin";
> + dmic_be_num = 2;
> }
>
> for (i = 0; i < dmic_be_num; i++) {
> - links[id].id = id;
> - links[id].num_cpus = 1;
> - links[id].codecs = dmic_component;
> - links[id].num_codecs = ARRAY_SIZE(dmic_component);
> - links[id].platforms = platform_component;
> - links[id].num_platforms = ARRAY_SIZE(platform_component);
> - links[id].ignore_suspend = 1;
> - links[id].dpcm_capture = 1;
> - links[id].no_pcm = 1;
> - id++;
> + links[*id].id = *id;
> + links[*id].num_cpus = 1;
> + links[*id].codecs = dmic_component;
> + links[*id].num_codecs = ARRAY_SIZE(dmic_component);
> + links[*id].platforms = platform_component;
> + links[*id].num_platforms = ARRAY_SIZE(platform_component);
> + links[*id].ignore_suspend = 1;
> + links[*id].dpcm_capture = 1;
> + links[*id].no_pcm = 1;
> +
> + (*id)++;
> }
>
> + return 0;
> +}
> +
> +static int create_hdmi_dai_links(struct device *dev,
> + struct snd_soc_dai_link *links,
> + struct snd_soc_dai_link_component *cpus,
> + int *id, int hdmi_num)
> +{
> + struct snd_soc_dai_link_component *idisp_components;
> + int i;
> +
> /* HDMI */
> - if (hdmi_num > 0) {
> - idisp_components = devm_kzalloc(dev,
> - sizeof(struct snd_soc_dai_link_component) *
> - hdmi_num, GFP_KERNEL);
> - if (!idisp_components)
> - goto devm_err;
> - }
> + if (hdmi_num <= 0)
> + return 0;
> +
> + idisp_components = devm_kzalloc(dev,
> + sizeof(struct snd_soc_dai_link_component) *
> + hdmi_num, GFP_KERNEL);
> + if (!idisp_components)
> + goto devm_err;
> +
> for (i = 1; i <= hdmi_num; i++) {
> - links[id].name = devm_kasprintf(dev, GFP_KERNEL,
> - "iDisp%d", i);
> - if (!links[id].name)
> + links[*id].name = devm_kasprintf(dev, GFP_KERNEL,
> + "iDisp%d", i);
> + if (!links[*id].name)
> goto devm_err;
>
> - links[id].id = id;
> - links[id].cpus = &cpus[id];
> - links[id].num_cpus = 1;
> - links[id].cpus->dai_name = devm_kasprintf(dev, GFP_KERNEL,
> - "iDisp%d Pin", i);
> - if (!links[id].cpus->dai_name)
> + links[*id].id = *id;
> + links[*id].cpus = &cpus[*id];
> + links[*id].num_cpus = 1;
> + links[*id].cpus->dai_name = devm_kasprintf(dev,
> + GFP_KERNEL,
> + "iDisp%d Pin",
> + i);
> + if (!links[*id].cpus->dai_name)
> goto devm_err;
>
> idisp_components[i - 1].name = "ehdaudio0D2";
> @@ -396,14 +429,79 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
> if (!idisp_components[i - 1].dai_name)
> goto devm_err;
>
> - links[id].codecs = &idisp_components[i - 1];
> - links[id].num_codecs = 1;
> - links[id].platforms = platform_component;
> - links[id].num_platforms = ARRAY_SIZE(platform_component);
> - links[id].init = sof_hdmi_init;
> - links[id].dpcm_playback = 1;
> - links[id].no_pcm = 1;
> - id++;
> + links[*id].codecs = &idisp_components[i - 1];
> + links[*id].num_codecs = 1;
> + links[*id].platforms = platform_component;
> + links[*id].num_platforms = ARRAY_SIZE(platform_component);
> + links[*id].init = sof_hdmi_init;
> + links[*id].dpcm_playback = 1;
> + links[*id].no_pcm = 1;
> +
> + (*id)++;
> + }
> +
> + return 0;
> +
> +devm_err:
> + return -ENOMEM;
> +}
> +
> +static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
> + int ssp_codec,
> + int ssp_amp,
> + int dmic_be_num,
> + int hdmi_num)
> +{
> + struct snd_soc_dai_link_component *cpus;
> + struct snd_soc_dai_link *links;
> + int ret, id = 0;
> +
> + links = devm_kzalloc(dev, sizeof(struct snd_soc_dai_link) *
> + sof_audio_card_cs42l42.num_links, GFP_KERNEL);
> + cpus = devm_kzalloc(dev, sizeof(struct snd_soc_dai_link_component) *
> + sof_audio_card_cs42l42.num_links, GFP_KERNEL);
> + if (!links || !cpus)
> + goto devm_err;
> +
> + if (soc_intel_is_glk()) {
> + /* gemini lake starts from spk link */
> + ret = create_spk_amp_dai_links(dev, links, cpus, &id, ssp_amp);
> + if (ret < 0) {
> + dev_err(dev, "fail to create spk amp dai links, ret %d\n",
> + ret);
> + goto devm_err;
> + }
> + }
> +
> + ret = create_hp_codec_dai_links(dev, links, cpus, &id, ssp_codec);
> + if (ret < 0) {
> + dev_err(dev, "fail to create hp codec dai links, ret %d\n",
> + ret);
> + goto devm_err;
> + }
> +
> + ret = create_dmic_dai_links(dev, links, cpus, &id, dmic_be_num);
> + if (ret < 0) {
> + dev_err(dev, "fail to create dmic dai links, ret %d\n",
> + ret);
> + goto devm_err;
> + }
> +
> + ret = create_hdmi_dai_links(dev, links, cpus, &id, hdmi_num);
> + if (ret < 0) {
> + dev_err(dev, "fail to create hdmi dai links, ret %d\n",
> + ret);
> + goto devm_err;
> + }
> +
> + if (!soc_intel_is_glk()) {
> + /* other platforms end with spk link */
> + ret = create_spk_amp_dai_links(dev, links, cpus, &id, ssp_amp);
> + if (ret < 0) {
> + dev_err(dev, "fail to create spk amp dai links, ret %d\n",
> + ret);
> + goto devm_err;
> + }
> }
>
> return links;
>
Powered by blists - more mailing lists