Unverified Commit 75af4199 authored by V sujith kumar Reddy's avatar V sujith kumar Reddy Committed by Mark Brown
Browse files

ASoC: SOF: Add DAI configuration support for AMD platforms. 



Add support for configuring sp and hs DAI from topology.

Signed-off-by: default avatarV sujith kumar Reddy <Vsujithkumar.Reddy@amd.com>
Link: https://lore.kernel.org/r/20221129100102.826781-1-vsujithkumar.reddy@amd.corp-partner.google.com


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

include/sound/sof/dai-amd.h

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ struct sof_ipc_dai_acp_params { 


	uint32_t fsync_rate;    /* FSYNC frequency in Hz */

	uint32_t tdm_slots;

	uint32_t tdm_mode;

} __packed;



/* ACPDMIC Configuration Request - SOF_IPC_DAI_AMD_CONFIG */

include/sound/sof/dai.h

+2 −0
Original line number Diff line number Diff line
@@ -86,6 +86,8 @@ enum sof_ipc_dai_type { 
	SOF_DAI_AMD_DMIC,		/**< AMD ACP DMIC */

	SOF_DAI_MEDIATEK_AFE,		/**< Mediatek AFE */

	SOF_DAI_AMD_HS,			/**< Amd HS */

	SOF_DAI_AMD_SP_VIRTUAL,		/**< AMD ACP SP VIRTUAL */

	SOF_DAI_AMD_HS_VIRTUAL,		/**< AMD ACP HS VIRTUAL */

};



/* general purpose DAI configuration */

include/uapi/sound/sof/tokens.h

+5 −0
Original line number Diff line number Diff line
@@ -198,4 +198,9 @@ 
/* COPIER */

#define SOF_TKN_INTEL_COPIER_NODE_TYPE		1980



/* ACP I2S */

#define SOF_TKN_AMD_ACPI2S_RATE			1700

#define SOF_TKN_AMD_ACPI2S_CH			1701

#define SOF_TKN_AMD_ACPI2S_TDM_MODE		1702



#endif

sound/soc/sof/ipc3-pcm.c

+2 −0
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ static int sof_ipc3_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd, 
			channels->min, channels->max);

		break;

	case SOF_DAI_AMD_SP:

	case SOF_DAI_AMD_SP_VIRTUAL:

		rate->min = private->dai_config->acpsp.fsync_rate;

		rate->max = private->dai_config->acpsp.fsync_rate;

		channels->min = private->dai_config->acpsp.tdm_slots;
@@ -347,6 +348,7 @@ static int sof_ipc3_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd, 
			channels->min, channels->max);

		break;

	case SOF_DAI_AMD_HS:

	case SOF_DAI_AMD_HS_VIRTUAL:

		rate->min = private->dai_config->acphs.fsync_rate;

		rate->max = private->dai_config->acphs.fsync_rate;

		channels->min = private->dai_config->acphs.tdm_slots;

sound/soc/sof/ipc3-topology.c

+28 −8
Original line number Diff line number Diff line
@@ -276,6 +276,16 @@ static const struct sof_topology_token acpdmic_tokens[] = { 
		offsetof(struct sof_ipc_dai_acpdmic_params, pdm_ch)},

};



/* ACPI2S */

static const struct sof_topology_token acpi2s_tokens[] = {

	{SOF_TKN_AMD_ACPI2S_RATE, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,

		offsetof(struct sof_ipc_dai_acp_params, fsync_rate)},

	{SOF_TKN_AMD_ACPI2S_CH, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,

		offsetof(struct sof_ipc_dai_acp_params, tdm_slots)},

	{SOF_TKN_AMD_ACPI2S_TDM_MODE, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,

		offsetof(struct sof_ipc_dai_acp_params, tdm_mode)},

};



/* Core tokens */

static const struct sof_topology_token core_tokens[] = {

	{SOF_TKN_COMP_CORE_ID, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,
@@ -311,6 +321,7 @@ static const struct sof_token_info ipc3_token_list[SOF_TOKEN_COUNT] = { 
	[SOF_SAI_TOKENS] = {"SAI tokens", sai_tokens, ARRAY_SIZE(sai_tokens)},

	[SOF_AFE_TOKENS] = {"AFE tokens", afe_tokens, ARRAY_SIZE(afe_tokens)},

	[SOF_ACPDMIC_TOKENS] = {"ACPDMIC tokens", acpdmic_tokens, ARRAY_SIZE(acpdmic_tokens)},

	[SOF_ACPI2S_TOKENS]   = {"ACPI2S tokens", acpi2s_tokens, ARRAY_SIZE(acpi2s_tokens)},

};



/**
@@ -1193,6 +1204,7 @@ static int sof_link_acp_sp_load(struct snd_soc_component *scomp, struct snd_sof_ 
	struct snd_soc_tplg_hw_config *hw_config = slink->hw_configs;

	struct sof_dai_private_data *private = dai->private;

	u32 size = sizeof(*config);

	int ret;



	/* handle master/slave and inverted clocks */

	sof_dai_set_format(hw_config, config);
@@ -1201,12 +1213,15 @@ static int sof_link_acp_sp_load(struct snd_soc_component *scomp, struct snd_sof_ 
	memset(&config->acpsp, 0, sizeof(config->acpsp));

	config->hdr.size = size;



	config->acpsp.fsync_rate = le32_to_cpu(hw_config->fsync_rate);

	config->acpsp.tdm_slots = le32_to_cpu(hw_config->tdm_slots);

	ret = sof_update_ipc_object(scomp, &config->acpsp, SOF_ACPI2S_TOKENS, slink->tuples,

				    slink->num_tuples, size, slink->num_hw_configs);

	if (ret < 0)

		return ret;



	dev_info(scomp->dev, "ACP_SP config ACP%d channel %d rate %d\n",



	dev_info(scomp->dev, "ACP_SP config ACP%d channel %d rate %d tdm_mode %d\n",

		 config->dai_index, config->acpsp.tdm_slots,

		 config->acpsp.fsync_rate);

		 config->acpsp.fsync_rate, config->acpsp.tdm_mode);



	dai->number_configs = 1;

	dai->current_config = 0;
@@ -1223,6 +1238,7 @@ static int sof_link_acp_hs_load(struct snd_soc_component *scomp, struct snd_sof_ 
	struct snd_soc_tplg_hw_config *hw_config = slink->hw_configs;

	struct sof_dai_private_data *private = dai->private;

	u32 size = sizeof(*config);

	int ret;



	/* Configures the DAI hardware format and inverted clocks */

	sof_dai_set_format(hw_config, config);
@@ -1231,12 +1247,14 @@ static int sof_link_acp_hs_load(struct snd_soc_component *scomp, struct snd_sof_ 
	memset(&config->acphs, 0, sizeof(config->acphs));

	config->hdr.size = size;



	config->acphs.fsync_rate = le32_to_cpu(hw_config->fsync_rate);

	config->acphs.tdm_slots = le32_to_cpu(hw_config->tdm_slots);

	ret = sof_update_ipc_object(scomp, &config->acphs, SOF_ACPI2S_TOKENS, slink->tuples,

				    slink->num_tuples, size, slink->num_hw_configs);

	if (ret < 0)

		return ret;



	dev_info(scomp->dev, "ACP_HS config ACP%d channel %d rate %d\n",

	dev_info(scomp->dev, "ACP_HS config ACP%d channel %d rate %d tdm_mode %d\n",

		 config->dai_index, config->acphs.tdm_slots,

		 config->acphs.fsync_rate);

		 config->acphs.fsync_rate, config->acphs.tdm_mode);



	dai->number_configs = 1;

	dai->current_config = 0;
@@ -1545,9 +1563,11 @@ static int sof_ipc3_widget_setup_comp_dai(struct snd_sof_widget *swidget) 
			ret = sof_link_acp_bt_load(scomp, slink, config, dai);

			break;

		case SOF_DAI_AMD_SP:

		case SOF_DAI_AMD_SP_VIRTUAL:

			ret = sof_link_acp_sp_load(scomp, slink, config, dai);

			break;

		case SOF_DAI_AMD_HS:

		case SOF_DAI_AMD_HS_VIRTUAL:

			ret = sof_link_acp_hs_load(scomp, slink, config, dai);

			break;

		case SOF_DAI_AMD_DMIC: