| 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
| ||
|
Message-ID: <ff55e63f-1c17-12ef-57e6-144a5bea4480@linux.intel.com>
Date: Wed, 26 Jul 2023 16:47:43 +0800
From: "Liao, Bard" <yung-chuan.liao@...ux.intel.com>
To: Brent Lu <brent.lu@...el.com>, alsa-devel@...a-project.org
Cc: Cezary Rojewski <cezary.rojewski@...el.com>,
Pierre-Louis Bossart <pierre-louis.bossart@...ux.intel.com>,
Liam Girdwood <liam.r.girdwood@...ux.intel.com>,
Peter Ujfalusi <peter.ujfalusi@...ux.intel.com>,
Ranjani Sridharan <ranjani.sridharan@...ux.intel.com>,
Kai Vehmanen <kai.vehmanen@...ux.intel.com>,
Mark Brown <broonie@...nel.org>,
Jaroslav Kysela <perex@...ex.cz>,
Takashi Iwai <tiwai@...e.com>, linux-kernel@...r.kernel.org,
Yong Zhi <yong.zhi@...el.com>,
Ajye Huang <ajye_huang@...pal.corp-partner.google.com>,
Uday M Bhat <uday.m.bhat@...el.com>,
Terry Cheong <htcheong@...omium.org>,
Mac Chiang <mac.chiang@...el.com>,
"Dharageswari . R" <dharageswari.r@...el.com>,
Kuninori Morimoto <kuninori.morimoto.gx@...esas.com>
Subject: Re: [PATCH 1/2] ASoC: Intel: maxim-common: get codec number from ACPI
On 7/20/2023 5:26 PM, Brent Lu wrote:
> Implement a helper function to get number of codecs from ACPI
> subsystem to remove the need of quirk flag in machine driver.
>
> Signed-off-by: Brent Lu <brent.lu@...el.com>
> ---
> sound/soc/intel/boards/sof_maxim_common.c | 174 +++++++++++++---------
> sound/soc/intel/boards/sof_maxim_common.h | 21 ++-
> 2 files changed, 113 insertions(+), 82 deletions(-)
>
> diff --git a/sound/soc/intel/boards/sof_maxim_common.c b/sound/soc/intel/boards/sof_maxim_common.c
> index 112e89951da0..f8b44a81fec1 100644
> --- a/sound/soc/intel/boards/sof_maxim_common.c
> +++ b/sound/soc/intel/boards/sof_maxim_common.c
> @@ -4,6 +4,7 @@
> #include <linux/module.h>
> #include <linux/string.h>
> #include <sound/pcm.h>
> +#include <sound/pcm_params.h>
> #include <sound/soc.h>
> #include <sound/soc-acpi.h>
> #include <sound/soc-dai.h>
> @@ -11,6 +12,21 @@
> #include <uapi/sound/asound.h>
> #include "sof_maxim_common.h"
>
> +/* helper function to get the number of specific codec */
> +static int get_num_codecs(const char *hid)
> +{
> + struct acpi_device *adev = NULL;
> + int dev_num = 0;
> +
> + do {
> + adev = acpi_dev_get_next_match_dev(adev, hid, NULL, -1);
> + if (adev)
> + dev_num++;
> + } while (adev != NULL);
> +
> + return dev_num;
> +}
> +
> #define MAX_98373_PIN_NAME 16
>
> const struct snd_soc_dapm_route max_98373_dapm_routes[] = {
> @@ -168,17 +184,6 @@ static struct snd_soc_codec_conf max_98390_codec_conf[] = {
> .dlc = COMP_CODEC_CONF(MAX_98390_DEV1_NAME),
> .name_prefix = "Left",
> },
> -};
> -
> -static struct snd_soc_codec_conf max_98390_4spk_codec_conf[] = {
> - {
> - .dlc = COMP_CODEC_CONF(MAX_98390_DEV0_NAME),
> - .name_prefix = "Right",
> - },
> - {
> - .dlc = COMP_CODEC_CONF(MAX_98390_DEV1_NAME),
> - .name_prefix = "Left",
> - },
> {
> .dlc = COMP_CODEC_CONF(MAX_98390_DEV2_NAME),
> .name_prefix = "Tweeter Right",
> @@ -189,19 +194,7 @@ static struct snd_soc_codec_conf max_98390_4spk_codec_conf[] = {
> },
> };
>
> -struct snd_soc_dai_link_component max_98390_components[] = {
> - {
> - .name = MAX_98390_DEV0_NAME,
> - .dai_name = MAX_98390_CODEC_DAI,
> - },
> - {
> - .name = MAX_98390_DEV1_NAME,
> - .dai_name = MAX_98390_CODEC_DAI,
> - },
> -};
> -EXPORT_SYMBOL_NS(max_98390_components, SND_SOC_INTEL_SOF_MAXIM_COMMON);
> -
> -struct snd_soc_dai_link_component max_98390_4spk_components[] = {
max_98390_components[] and max_98390_4spk_components[] are still used
by sof_rt5682.c, we should remove them in the same patch.
Maybe combine the 2 patches together?
> +static struct snd_soc_dai_link_component max_98390_components[] = {
> {
> .name = MAX_98390_DEV0_NAME,
> .dai_name = MAX_98390_CODEC_DAI,
> @@ -219,62 +212,56 @@ struct snd_soc_dai_link_component max_98390_4spk_components[] = {
> .dai_name = MAX_98390_CODEC_DAI,
> },
> };
> -EXPORT_SYMBOL_NS(max_98390_4spk_components, SND_SOC_INTEL_SOF_MAXIM_COMMON);
> +
> +static const struct {
> + unsigned int tx;
> + unsigned int rx;
> +} max_98390_tdm_mask[] = {
> + {.tx = 0x01, .rx = 0x3},
> + {.tx = 0x02, .rx = 0x3},
> + {.tx = 0x04, .rx = 0x3},
> + {.tx = 0x08, .rx = 0x3},
> +};
>
> static int max_98390_hw_params(struct snd_pcm_substream *substream,
> struct snd_pcm_hw_params *params)
> {
> struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
> struct snd_soc_dai *codec_dai;
> - int i;
> + int i, ret = 0;
>
> for_each_rtd_codec_dais(rtd, i, codec_dai) {
> - if (i >= ARRAY_SIZE(max_98390_4spk_components)) {
> + if (i >= ARRAY_SIZE(max_98390_tdm_mask)) {
> dev_err(codec_dai->dev, "invalid codec index %d\n", i);
> return -ENODEV;
> }
>
> - if (!strcmp(codec_dai->component->name, MAX_98390_DEV0_NAME)) {
> - /* DEV0 tdm slot configuration Right */
> - snd_soc_dai_set_tdm_slot(codec_dai, 0x01, 3, 4, 32);
> - }
> - if (!strcmp(codec_dai->component->name, MAX_98390_DEV1_NAME)) {
> - /* DEV1 tdm slot configuration Left */
> - snd_soc_dai_set_tdm_slot(codec_dai, 0x02, 3, 4, 32);
> - }
> -
> - if (!strcmp(codec_dai->component->name, MAX_98390_DEV2_NAME)) {
> - /* DEVi2 tdm slot configuration Tweeter Right */
> - snd_soc_dai_set_tdm_slot(codec_dai, 0x04, 3, 4, 32);
> - }
> - if (!strcmp(codec_dai->component->name, MAX_98390_DEV3_NAME)) {
> - /* DEV3 tdm slot configuration Tweeter Left */
> - snd_soc_dai_set_tdm_slot(codec_dai, 0x08, 3, 4, 32);
> + ret = snd_soc_dai_set_tdm_slot(codec_dai, max_98390_tdm_mask[i].tx,
> + max_98390_tdm_mask[i].rx, 4,
> + params_width(params));
> + if (ret < 0) {
> + dev_err(codec_dai->dev, "fail to set tdm slot, ret %d\n",
> + ret);
> + return ret;
> }
> }
> return 0;
> }
>
> -int max_98390_spk_codec_init(struct snd_soc_pcm_runtime *rtd)
> +static int max_98390_init(struct snd_soc_pcm_runtime *rtd)
> {
> struct snd_soc_card *card = rtd->card;
> + int num_codecs = get_num_codecs(MAX_98390_ACPI_HID);
> int ret;
>
> - /* add regular speakers dapm route */
> - ret = snd_soc_dapm_add_routes(&card->dapm, max_98390_dapm_routes,
> - ARRAY_SIZE(max_98390_dapm_routes));
Don't we need to add max_98390_dapm_routes for the 4 speakers case?
> - if (ret) {
> - dev_err(rtd->dev, "unable to add Left/Right Speaker dapm, ret %d\n", ret);
> - return ret;
> - }
> -
> - /* add widgets/controls/dapm for tweeter speakers */
> - if (acpi_dev_present("MX98390", "3", -1)) {
> + switch (num_codecs) {
> + case 4:
> + /* add widgets/controls/dapm for tweeter speakers */
> ret = snd_soc_dapm_new_controls(&card->dapm, max_98390_tt_dapm_widgets,
> ARRAY_SIZE(max_98390_tt_dapm_widgets));
> -
> if (ret) {
> - dev_err(rtd->dev, "unable to add tweeter dapm controls, ret %d\n", ret);
> + dev_err(rtd->dev, "unable to add tweeter dapm widgets, ret %d\n",
> + ret);
> /* Don't need to add routes if widget addition failed */
> return ret;
> }
> @@ -282,33 +269,80 @@ int max_98390_spk_codec_init(struct snd_soc_pcm_runtime *rtd)
> ret = snd_soc_add_card_controls(card, max_98390_tt_kcontrols,
> ARRAY_SIZE(max_98390_tt_kcontrols));
> if (ret) {
> - dev_err(rtd->dev, "unable to add tweeter card controls, ret %d\n", ret);
> + dev_err(rtd->dev, "unable to add tweeter controls, ret %d\n",
> + ret);
> return ret;
> }
>
> ret = snd_soc_dapm_add_routes(&card->dapm, max_98390_tt_dapm_routes,
> ARRAY_SIZE(max_98390_tt_dapm_routes));
> - if (ret)
> - dev_err(rtd->dev,
> - "unable to add Tweeter Left/Right Speaker dapm, ret %d\n", ret);
> + if (ret) {
> + dev_err(rtd->dev, "unable to add tweeter dapm routes, ret %d\n",
> + ret);
> + return ret;
> + }
> +
> + fallthrough;
> + case 2:
> + /* add regular speakers dapm route */
> + ret = snd_soc_dapm_add_routes(&card->dapm, max_98390_dapm_routes,
> + ARRAY_SIZE(max_98390_dapm_routes));
> + if (ret) {
> + dev_err(rtd->dev, "unable to add dapm routes, ret %d\n",
> + ret);
> + return ret;
> + }
> + break;
> + default:
> + dev_err(rtd->dev, "invalid codec number %d\n", num_codecs);
> + ret = -EINVAL;
> + break;
> }
> +
> return ret;
> }
> -EXPORT_SYMBOL_NS(max_98390_spk_codec_init, SND_SOC_INTEL_SOF_MAXIM_COMMON);
>
> -const struct snd_soc_ops max_98390_ops = {
> +static const struct snd_soc_ops max_98390_ops = {
> .hw_params = max_98390_hw_params,
> };
> -EXPORT_SYMBOL_NS(max_98390_ops, SND_SOC_INTEL_SOF_MAXIM_COMMON);
>
> -void max_98390_set_codec_conf(struct snd_soc_card *card, int ch)
> +void max_98390_dai_link(struct snd_soc_dai_link *link)
> +{
> + int num_codecs = get_num_codecs(MAX_98390_ACPI_HID);
> +
> + link->codecs = max_98390_components;
> +
> + switch (num_codecs) {
> + case 2:
> + case 4:
> + link->num_codecs = num_codecs;
> + break;
> + default:
> + pr_err("invalid codec number %d for %s\n", num_codecs,
> + MAX_98390_ACPI_HID);
> + break;
> + }
> +
> + link->init = max_98390_init;
> + link->ops = &max_98390_ops;
> +}
> +EXPORT_SYMBOL_NS(max_98390_dai_link, SND_SOC_INTEL_SOF_MAXIM_COMMON);
> +
> +void max_98390_set_codec_conf(struct snd_soc_card *card)
> {
> - if (ch == ARRAY_SIZE(max_98390_4spk_codec_conf)) {
> - card->codec_conf = max_98390_4spk_codec_conf;
> - card->num_configs = ARRAY_SIZE(max_98390_4spk_codec_conf);
> - } else {
> - card->codec_conf = max_98390_codec_conf;
> - card->num_configs = ARRAY_SIZE(max_98390_codec_conf);
> + int num_codecs = get_num_codecs(MAX_98390_ACPI_HID);
> +
> + card->codec_conf = max_98390_codec_conf;
> +
> + switch (num_codecs) {
> + case 2:
> + case 4:
> + card->num_configs = num_codecs;
> + break;
> + default:
> + pr_err("invalid codec number %d for %s\n", num_codecs,
> + MAX_98390_ACPI_HID);
> + break;
> }
> }
> EXPORT_SYMBOL_NS(max_98390_set_codec_conf, SND_SOC_INTEL_SOF_MAXIM_COMMON);
> diff --git a/sound/soc/intel/boards/sof_maxim_common.h b/sound/soc/intel/boards/sof_maxim_common.h
> index 7a8c53049e4d..a3676d68cc12 100644
> --- a/sound/soc/intel/boards/sof_maxim_common.h
> +++ b/sound/soc/intel/boards/sof_maxim_common.h
> @@ -27,18 +27,15 @@ int max_98373_trigger(struct snd_pcm_substream *substream, int cmd);
> /*
> * Maxim MAX98390
> */
> -#define MAX_98390_CODEC_DAI "max98390-aif1"
> -#define MAX_98390_DEV0_NAME "i2c-MX98390:00"
> -#define MAX_98390_DEV1_NAME "i2c-MX98390:01"
> -#define MAX_98390_DEV2_NAME "i2c-MX98390:02"
> -#define MAX_98390_DEV3_NAME "i2c-MX98390:03"
> -
> -extern struct snd_soc_dai_link_component max_98390_components[2];
> -extern struct snd_soc_dai_link_component max_98390_4spk_components[4];
> -extern const struct snd_soc_ops max_98390_ops;
> -
> -void max_98390_set_codec_conf(struct snd_soc_card *card, int ch);
> -int max_98390_spk_codec_init(struct snd_soc_pcm_runtime *rtd);
> +#define MAX_98390_ACPI_HID "MX98390"
> +#define MAX_98390_CODEC_DAI "max98390-aif1"
> +#define MAX_98390_DEV0_NAME "i2c-MX98390:00"
> +#define MAX_98390_DEV1_NAME "i2c-MX98390:01"
> +#define MAX_98390_DEV2_NAME "i2c-MX98390:02"
> +#define MAX_98390_DEV3_NAME "i2c-MX98390:03"
> +
> +void max_98390_dai_link(struct snd_soc_dai_link *link);
> +void max_98390_set_codec_conf(struct snd_soc_card *card);
>
> /*
> * Maxim MAX98357A/MAX98360A
Powered by blists - more mailing lists