Unverified Commit be3c2153 authored by Ranjani Sridharan's avatar Ranjani Sridharan Committed by Mark Brown
Browse files

ASoC: SOF: Separate the tokens for input and output pin index 



Using the same token ID for both input and output format pin index
results in collisions and incorrect pin index getting parsed from
topology.

Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarPaul Olaru <paul.olaru@oss.nxp.com>
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20230515104403.32207-1-peter.ujfalusi@linux.intel.com


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

include/uapi/sound/sof/tokens.h

+2 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ 
#define SOF_TKN_CAVS_AUDIO_FORMAT_IN_INTERLEAVING_STYLE	1906

#define SOF_TKN_CAVS_AUDIO_FORMAT_IN_FMT_CFG	1907

#define SOF_TKN_CAVS_AUDIO_FORMAT_IN_SAMPLE_TYPE	1908

#define SOF_TKN_CAVS_AUDIO_FORMAT_PIN_INDEX		1909

#define SOF_TKN_CAVS_AUDIO_FORMAT_INPUT_PIN_INDEX	1909

/* intentional token numbering discontinuity, reserved for future use */

#define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_RATE	1930

#define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_BIT_DEPTH	1931
@@ -194,6 +194,7 @@ 
#define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_INTERLEAVING_STYLE	1936

#define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_FMT_CFG	1937

#define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_SAMPLE_TYPE	1938

#define SOF_TKN_CAVS_AUDIO_FORMAT_OUTPUT_PIN_INDEX	1939

/* intentional token numbering discontinuity, reserved for future use */

#define SOF_TKN_CAVS_AUDIO_FORMAT_IBS		1970

#define SOF_TKN_CAVS_AUDIO_FORMAT_OBS		1971

sound/soc/sof/ipc4-topology.c

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static const struct sof_topology_token ipc4_in_audio_format_tokens[] = { 
		audio_fmt.interleaving_style)},

	{SOF_TKN_CAVS_AUDIO_FORMAT_IN_FMT_CFG, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,

		offsetof(struct sof_ipc4_pin_format, audio_fmt.fmt_cfg)},

	{SOF_TKN_CAVS_AUDIO_FORMAT_PIN_INDEX, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,

	{SOF_TKN_CAVS_AUDIO_FORMAT_INPUT_PIN_INDEX, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,

		offsetof(struct sof_ipc4_pin_format, pin_index)},

	{SOF_TKN_CAVS_AUDIO_FORMAT_IBS, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,

		offsetof(struct sof_ipc4_pin_format, buffer_size)},
@@ -79,7 +79,7 @@ static const struct sof_topology_token ipc4_out_audio_format_tokens[] = { 
		audio_fmt.interleaving_style)},

	{SOF_TKN_CAVS_AUDIO_FORMAT_OUT_FMT_CFG, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,

		offsetof(struct sof_ipc4_pin_format, audio_fmt.fmt_cfg)},

	{SOF_TKN_CAVS_AUDIO_FORMAT_PIN_INDEX, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,

	{SOF_TKN_CAVS_AUDIO_FORMAT_OUTPUT_PIN_INDEX, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,

		offsetof(struct sof_ipc4_pin_format, pin_index)},

	{SOF_TKN_CAVS_AUDIO_FORMAT_OBS, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,

		offsetof(struct sof_ipc4_pin_format, buffer_size)},