[PATCH v5 05/10] ASoC: qcom: Add helper function to get dma control and lpaif handle

Srinivas Kandagatla srinivas.kandagatla at linaro.org
Tue Nov 23 13:28:23 CET 2021



On 22/11/2021 11:46, Srinivasa Rao Mandadapu wrote:
> Add support function to get dma control and lpaif handle to avoid
> repeated code in platform driver
> 
> Signed-off-by: Srinivasa Rao Mandadapu <srivasam at codeaurora.org>
> Co-developed-by: Venkata Prasad Potturu <potturu at codeaurora.org>
> Signed-off-by: Venkata Prasad Potturu <potturu at codeaurora.org>

Few minor Nits, but overall it looks good to me.

Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla at linaro.org>

> ---
>   sound/soc/qcom/lpass-platform.c | 90 ++++++++++++++++++++---------------------
>   1 file changed, 43 insertions(+), 47 deletions(-)
> 
> diff --git a/sound/soc/qcom/lpass-platform.c b/sound/soc/qcom/lpass-platform.c
> index a44162c..59c0884 100644
> --- a/sound/soc/qcom/lpass-platform.c
> +++ b/sound/soc/qcom/lpass-platform.c
> @@ -177,6 +177,44 @@ static int lpass_platform_pcmops_close(struct snd_soc_component *component,
>   	return 0;
>   }
>   
> +static void __get_lpaif_handle(struct snd_pcm_substream *substream,
> +				struct snd_soc_component *component,
> +				struct lpaif_dmactl **dmactl, int *id, struct regmap **map)
Same indentation is off here.

> +{
> +	struct snd_soc_pcm_runtime *soc_runtime = asoc_substream_to_rtd(substream);
> +	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(soc_runtime, 0);
> +	struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);
> +	struct snd_pcm_runtime *rt = substream->runtime;
> +	struct lpass_pcm_data *pcm_data = rt->private_data;
> +	struct lpass_variant *v = drvdata->variant;
> +	int dir = substream->stream;
> +	unsigned int dai_id = cpu_dai->driver->id;
> +	struct lpaif_dmactl *l_dmactl;
> +	struct regmap *l_map;
> +	int l_id;
> +
> +	if (dir ==  SNDRV_PCM_STREAM_PLAYBACK) {
> +		l_id = pcm_data->dma_ch;
> +		if (dai_id == LPASS_DP_RX) {
> +			l_dmactl = drvdata->hdmi_rd_dmactl;
> +			l_map = drvdata->hdmiif_map;
> +		} else {
> +			l_dmactl = drvdata->rd_dmactl;
> +			l_map = drvdata->lpaif_map;
> +		}
> +	} else {
> +		l_dmactl = drvdata->wr_dmactl;
> +		l_id = pcm_data->dma_ch - v->wrdma_channel_start;
> +		l_map = drvdata->lpaif_map;
> +	}
> +	if (dmactl)
> +		*dmactl = l_dmactl;
> +	if (id)
> +		*id = l_id;
> +	if (map)
> +		*map = l_map;
> +}
> +
>   static int lpass_platform_pcmops_hw_params(struct snd_soc_component *component,
>   					   struct snd_pcm_substream *substream,
>   					   struct snd_pcm_hw_params *params)
> @@ -191,22 +229,12 @@ static int lpass_platform_pcmops_hw_params(struct snd_soc_component *component,
>   	unsigned int channels = params_channels(params);
>   	unsigned int regval;
>   	struct lpaif_dmactl *dmactl;
> -	int id, dir = substream->stream;
> +	int id;
>   	int bitwidth;
>   	int ret, dma_port = pcm_data->i2s_port + v->dmactl_audif_start;
>   	unsigned int dai_id = cpu_dai->driver->id;
>   
> -	if (dir ==  SNDRV_PCM_STREAM_PLAYBACK) {
> -		id = pcm_data->dma_ch;
> -		if (dai_id == LPASS_DP_RX)
> -			dmactl = drvdata->hdmi_rd_dmactl;
> -		else
> -			dmactl = drvdata->rd_dmactl;
> -
> -	} else {
> -		dmactl = drvdata->wr_dmactl;
> -		id = pcm_data->dma_ch - v->wrdma_channel_start;
> -	}
> +	__get_lpaif_handle(substream, component, &dmactl, &id, NULL);
error handling is missing.

>   
>   	bitwidth = snd_pcm_format_width(format);
>   	if (bitwidth < 0) {
> @@ -379,24 +407,9 @@ static int lpass_platform_pcmops_prepare(struct snd_soc_component *component,
>   	int ret, id, ch, dir = substream->stream;
>   	unsigned int dai_id = cpu_dai->driver->id;
>   
> -
>   	ch = pcm_data->dma_ch;
> -	if (dir ==  SNDRV_PCM_STREAM_PLAYBACK) {
> -		if (dai_id == LPASS_DP_RX) {
> -			dmactl = drvdata->hdmi_rd_dmactl;
> -			map = drvdata->hdmiif_map;
> -		} else {
> -			dmactl = drvdata->rd_dmactl;
> -			map = drvdata->lpaif_map;
> -		}
> -
> -		id = pcm_data->dma_ch;
> -	} else {
> -		dmactl = drvdata->wr_dmactl;
> -		id = pcm_data->dma_ch - v->wrdma_channel_start;
> -		map = drvdata->lpaif_map;
> -	}
>   
> +	__get_lpaif_handle(substream, component, &dmactl, &id, &map);
>   	ret = regmap_write(map, LPAIF_DMABASE_REG(v, ch, dir, dai_id),
>   				runtime->dma_addr);
>   	if (ret) {
> @@ -444,26 +457,12 @@ static int lpass_platform_pcmops_trigger(struct snd_soc_component *component,
>   	struct lpaif_dmactl *dmactl;
>   	struct regmap *map;
>   	int ret, ch, id;
> -	int dir = substream->stream;
>   	unsigned int reg_irqclr = 0, val_irqclr = 0;
>   	unsigned int  reg_irqen = 0, val_irqen = 0, val_mask = 0;
>   	unsigned int dai_id = cpu_dai->driver->id;
>   
>   	ch = pcm_data->dma_ch;
> -	if (dir ==  SNDRV_PCM_STREAM_PLAYBACK) {
> -		id = pcm_data->dma_ch;
> -		if (dai_id == LPASS_DP_RX) {
> -			dmactl = drvdata->hdmi_rd_dmactl;
> -			map = drvdata->hdmiif_map;
> -		} else {
> -			dmactl = drvdata->rd_dmactl;
> -			map = drvdata->lpaif_map;
> -		}
> -	} else {
> -		dmactl = drvdata->wr_dmactl;
> -		id = pcm_data->dma_ch - v->wrdma_channel_start;
> -		map = drvdata->lpaif_map;
> -	}
> +	__get_lpaif_handle(substream, component, &dmactl, &id, &map);
>   
>   	switch (cmd) {
>   	case SNDRV_PCM_TRIGGER_START:
> @@ -597,10 +596,7 @@ static snd_pcm_uframes_t lpass_platform_pcmops_pointer(
>   	struct regmap *map;
>   	unsigned int dai_id = cpu_dai->driver->id;
>   
> -	if (dai_id == LPASS_DP_RX)
> -		map = drvdata->hdmiif_map;
> -	else
> -		map = drvdata->lpaif_map;
> +	__get_lpaif_handle(substream, component, NULL, NULL, &map);
>   
>   	ch = pcm_data->dma_ch;
>   
> 


More information about the Alsa-devel mailing list