Unverified Commit e85e75b6 authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Mark Brown
Browse files

ASoC: Intel: avs: Clean up hw constraints initialization 



Provide a separate function that initializes all PCM hardware
constraints for the driver. No functional changes.

Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20240426095733.3946951-9-cezary.rojewski@intel.com


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

sound/soc/intel/avs/pcm.c

+44 −40
Original line number Diff line number Diff line
@@ -448,19 +448,6 @@ static const struct snd_soc_dai_ops avs_dai_hda_be_ops = { 
	.trigger = avs_dai_hda_be_trigger,

};



static const unsigned int rates[] = {

	8000, 11025, 12000, 16000,

	22050, 24000, 32000, 44100,

	48000, 64000, 88200, 96000,

	128000, 176400, 192000,

};



static const struct snd_pcm_hw_constraint_list hw_rates = {

	.count = ARRAY_SIZE(rates),

	.list = rates,

	.mask = 0,

};



static int hw_rule_param_size(struct snd_pcm_hw_params *params, struct snd_pcm_hw_rule *rule)

{

	struct snd_interval *interval = hw_param_interval(params, rule->var);
@@ -481,40 +468,33 @@ static int hw_rule_param_size(struct snd_pcm_hw_params *params, struct snd_pcm_h 
	return snd_interval_refine(interval, &to);

}



static int avs_dai_fe_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *dai)

static int avs_pcm_hw_constraints_init(struct snd_pcm_substream *substream)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct avs_dma_data *data;

	struct hdac_bus *bus;

	struct hdac_ext_stream *host_stream;

	static const unsigned int rates[] = {

		8000, 11025, 12000, 16000,

		22050, 24000, 32000, 44100,

		48000, 64000, 88200, 96000,

		128000, 176400, 192000,

	};

	static const struct snd_pcm_hw_constraint_list rate_list = {

		.count = ARRAY_SIZE(rates),

		.list = rates,

	};

	int ret;



	ret = avs_dai_startup(substream, dai);

	if (ret)

		return ret;



	data = snd_soc_dai_get_dma_data(dai, substream);

	bus = &data->adev->base.core;



	host_stream = snd_hdac_ext_stream_assign(bus, substream, HDAC_EXT_STREAM_TYPE_HOST);

	if (!host_stream) {

		ret = -EBUSY;

		goto err;

	}



	data->host_stream = host_stream;

	ret = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);

	if (ret < 0)

		goto err;

		return ret;



	/* avoid wrap-around with wall-clock */

	/* Avoid wrap-around with wall-clock. */

	ret = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_TIME, 20, 178000000);

	if (ret < 0)

		goto err;

		return ret;



	ret = snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE, &hw_rates);

	ret = snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE, &rate_list);

	if (ret < 0)

		goto err;

		return ret;



	/* Adjust buffer and period size based on the audio format. */

	snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_SIZE, hw_rule_param_size, NULL,
@@ -524,16 +504,40 @@ static int avs_dai_fe_startup(struct snd_pcm_substream *substream, struct snd_so 
			    SNDRV_PCM_HW_PARAM_FORMAT, SNDRV_PCM_HW_PARAM_CHANNELS,

			    SNDRV_PCM_HW_PARAM_RATE, -1);



	return ret;

}



static int avs_dai_fe_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *dai)

{

	struct hdac_ext_stream *host_stream;

	struct avs_dma_data *data;

	struct hdac_bus *bus;

	int ret;



	ret = avs_pcm_hw_constraints_init(substream);

	if (ret)

		return ret;



	ret = avs_dai_startup(substream, dai);

	if (ret)

		return ret;



	data = snd_soc_dai_get_dma_data(dai, substream);

	bus = &data->adev->base.core;



	host_stream = snd_hdac_ext_stream_assign(bus, substream, HDAC_EXT_STREAM_TYPE_HOST);

	if (!host_stream) {

		avs_dai_shutdown(substream, dai);

		return -EBUSY;

	}



	data->host_stream = host_stream;

	snd_pcm_set_sync(substream);



	dev_dbg(dai->dev, "%s fe STARTUP tag %d str %p",

		__func__, hdac_stream(host_stream)->stream_tag, substream);



	return 0;



err:

	kfree(data);

	return ret;

}



static void avs_dai_fe_shutdown(struct snd_pcm_substream *substream, struct snd_soc_dai *dai)