From: Rander Wang <rander.wang@intel.com>

Date: Tue, 7 Mar 2023 13:06:56 +0200

Subject: [PATCH] ASoC: SOF: IPC4: update gain ipc msg definition to align with

 fw

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

References: bsc#1012628

Patch-mainline: 6.2.10

Git-commit: e45cd86c3a78bfb9875a5eb8ab5dab459b59bbe2

[ Upstream commit e45cd86c3a78bfb9875a5eb8ab5dab459b59bbe2 ]

Recent firmware changes modified the curve duration from 32 to 64 bits,

which breaks volume ramps. A simple solution would be to change the

definition, but unfortunately the ASoC topology framework only supports

up to 32 bit tokens.

This patch suggests breaking the 64 bit value in low and high parts, with

only the low-part extracted from topology and high-part only zeroes. Since

the curve duration is represented in hundred of nanoseconds, we can still

represent a 400s ramp, which is just fine. The defacto ABI change has no

effect on existing users since the IPC4 firmware has not been released just

yet.

Link: https://github.com/thesofproject/linux/issues/4026

Signed-off-by: Rander Wang <rander.wang@intel.com>

Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>

Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>

Link: https://lore.kernel.org/r/20230307110656.1816-1-peter.ujfalusi@linux.intel.com

Signed-off-by: Mark Brown <broonie@kernel.org>

Signed-off-by: Sasha Levin <sashal@kernel.org>

Signed-off-by: Jiri Slaby <jslaby@suse.cz>

---

 sound/soc/sof/ipc4-control.c  | 3 ++-

 sound/soc/sof/ipc4-topology.c | 4 ++--

 sound/soc/sof/ipc4-topology.h | 6 ++++--

 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/sound/soc/sof/ipc4-control.c b/sound/soc/sof/ipc4-control.c

index 0d5a578c..7442ec1c 100644

--- a/sound/soc/sof/ipc4-control.c

+++ b/sound/soc/sof/ipc4-control.c

@@ -84,7 +84,8 @@ sof_ipc4_set_volume_data(struct snd_sof_dev *sdev, struct snd_sof_widget *swidge

 		}

 		/* set curve type and duration from topology */

-		data.curve_duration = gain->data.curve_duration;

+		data.curve_duration_l = gain->data.curve_duration_l;

+		data.curve_duration_h = gain->data.curve_duration_h;

 		data.curve_type = gain->data.curve_type;

 		msg->data_ptr = &dat;;

diff --git a/sound/soc/sof/ipc4-topology.c b/sound/soc/sof/ipc4-topology.c

index 65da1cf7..6da6137f 100644

--- a/sound/soc/sof/ipc4-topology.c

+++ b/sound/soc/sof/ipc4-topology.c

@@ -107,7 +107,7 @@ static const struct sof_topology_token gain_tokens[] = {

 		get_token_u32, offsetof(struct sof_ipc4_gain_data, curve_type)},

 	{SOF_TKN_GAIN_RAMP_DURATION,

 		SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,

-		offsetof(struct sof_ipc4_gain_data, curve_duration)},

+		offsetof(struct sof_ipc4_gain_data, curve_duration_l)},

 	{SOF_TKN_GAIN_VAL, SND_SOC_TPLG_TUPLE_TYPE_WORD,

 		get_token_u32, offsetof(struct sof_ipc4_gain_data, init_val)},

 };

@@ -670,7 +670,7 @@ static int sof_ipc4_widget_setup_comp_pga(struct snd_sof_widget *swidget)

 	dev_dbg(scomp->dev,

 		"pga widget %s: ramp type: %d, ramp duration %d, initial gain value: %#x, cpc %d\n",

-		swidget->widget->name, gain->data.curve_type, gain->data.curve_duration,

+		swidget->widget->name, gain->data.curve_type, gain->data.curve_duration_l,

 		gain->data.init_val, gain->base_config.cpc);

 	ret = sof_ipc4_widget_setup_msg(swidget, &gain->msg);

diff --git a/sound/soc/sof/ipc4-topology.h b/sound/soc/sof/ipc4-topology.h

index 2363a7cc..cf9d2785 100644

--- a/sound/soc/sof/ipc4-topology.h

+++ b/sound/soc/sof/ipc4-topology.h

@@ -217,14 +217,16 @@ struct sof_ipc4_control_data {

  * @init_val: Initial value

  * @curve_type: Curve type

  * @reserved: reserved for future use

- * @curve_duration: Curve duration

+ * @curve_duration_l: Curve duration low part

+ * @curve_duration_h: Curve duration high part

  */

 struct sof_ipc4_gain_data {

 	uint32_t channels;

 	uint32_t init_val;

 	uint32_t curve_type;

 	uint32_t reserved;

-	uint32_t curve_duration;

+	uint32_t curve_duration_l;

+	uint32_t curve_duration_h;

 } __aligned(8);

 /**

-- 

2.35.3