Commit 9834ffd1 authored by Matt Ranostay's avatar Matt Ranostay Committed by Mark Brown
Browse files

ASoC: omap-mcbsp: Add PM QoS support for McBSP to prevent glitches 

We can get audio errors if hitting deeper idle states on omaps:

[alsa.c:230] error: Fatal problem with alsa output, error -5.
[audio.c:614] error: Error in writing audio (Input/output error?)!

This seems to happen with off mode idle enabled as power for the
whole SoC may get cut off between filling the McBSP fifo using DMA.
While active DMA blocks deeper idle states in hardware, McBSP
activity does not seem to do so.

Basing the QoS latency calculation on the FIFO size, threshold,
sample rate, and channels.

Based on the original patch by Tony Lindgren
Link: https://patchwork.kernel.org/patch/9305867/



Signed-off-by: default avatarMatt Ranostay <matt@ranostay.consulting>
Signed-off-by: default avatarLiam Breck <kernel@networkimprov.net>
Tested-by: default avatarTony Lindgren <tony@atomide.com>
Acked-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a5de5b74

sound/soc/omap/mcbsp.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -323,8 +323,11 @@ struct omap_mcbsp { 




	unsigned int fmt;

	unsigned int fmt;

	unsigned int in_freq;

	unsigned int in_freq;

	unsigned int latency[2];

	int clk_div;

	int clk_div;

	int wlen;

	int wlen;



	struct pm_qos_request pm_qos_req;

};

};





void omap_mcbsp_config(struct omap_mcbsp *mcbsp,

void omap_mcbsp_config(struct omap_mcbsp *mcbsp,

sound/soc/omap/omap-mcbsp.c

+47 −1
Original line number Original line Diff line number Diff line
@@ -157,6 +157,17 @@ static void omap_mcbsp_dai_shutdown(struct snd_pcm_substream *substream, 
				    struct snd_soc_dai *cpu_dai)

				    struct snd_soc_dai *cpu_dai)

{

{

	struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai);

	struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai);

	int tx = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK);

	int stream1 = tx ? SNDRV_PCM_STREAM_PLAYBACK : SNDRV_PCM_STREAM_CAPTURE;

	int stream2 = tx ? SNDRV_PCM_STREAM_CAPTURE : SNDRV_PCM_STREAM_PLAYBACK;



	if (mcbsp->latency[stream2])

		pm_qos_update_request(&mcbsp->pm_qos_req,

				      mcbsp->latency[stream2]);

	else if (mcbsp->latency[stream1])

		pm_qos_remove_request(&mcbsp->pm_qos_req);



	mcbsp->latency[stream1] = 0;





	if (!cpu_dai->active) {

	if (!cpu_dai->active) {

		omap_mcbsp_free(mcbsp);

		omap_mcbsp_free(mcbsp);
@@ -164,6 +175,28 @@ static void omap_mcbsp_dai_shutdown(struct snd_pcm_substream *substream, 
	}

	}

}

}





static int omap_mcbsp_dai_prepare(struct snd_pcm_substream *substream,

				  struct snd_soc_dai *cpu_dai)

{

	struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai);

	struct pm_qos_request *pm_qos_req = &mcbsp->pm_qos_req;

	int tx = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK);

	int stream1 = tx ? SNDRV_PCM_STREAM_PLAYBACK : SNDRV_PCM_STREAM_CAPTURE;

	int stream2 = tx ? SNDRV_PCM_STREAM_CAPTURE : SNDRV_PCM_STREAM_PLAYBACK;

	int latency = mcbsp->latency[stream2];



	/* Prevent omap hardware from hitting off between FIFO fills */

	if (!latency || mcbsp->latency[stream1] < latency)

		latency = mcbsp->latency[stream1];



	if (pm_qos_request_active(pm_qos_req))

		pm_qos_update_request(pm_qos_req, latency);

	else if (latency)

		pm_qos_add_request(pm_qos_req, PM_QOS_CPU_DMA_LATENCY, latency);



	return 0;

}



static int omap_mcbsp_dai_trigger(struct snd_pcm_substream *substream, int cmd,

static int omap_mcbsp_dai_trigger(struct snd_pcm_substream *substream, int cmd,

				  struct snd_soc_dai *cpu_dai)

				  struct snd_soc_dai *cpu_dai)

{

{
@@ -226,6 +259,7 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, 
	int wlen, channels, wpf;

	int wlen, channels, wpf;

	int pkt_size = 0;

	int pkt_size = 0;

	unsigned int format, div, framesize, master;

	unsigned int format, div, framesize, master;

	unsigned int buffer_size = mcbsp->pdata->buffer_size;





	dma_data = snd_soc_dai_get_dma_data(cpu_dai, substream);

	dma_data = snd_soc_dai_get_dma_data(cpu_dai, substream);

	channels = params_channels(params);

	channels = params_channels(params);
@@ -240,7 +274,9 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, 
	default:

	default:

		return -EINVAL;

		return -EINVAL;

	}

	}

	if (mcbsp->pdata->buffer_size) {

	if (buffer_size) {

		int latency;



		if (mcbsp->dma_op_mode == MCBSP_DMA_MODE_THRESHOLD) {

		if (mcbsp->dma_op_mode == MCBSP_DMA_MODE_THRESHOLD) {

			int period_words, max_thrsh;

			int period_words, max_thrsh;

			int divider = 0;

			int divider = 0;
@@ -271,6 +307,12 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, 
			/* Use packet mode for non mono streams */

			/* Use packet mode for non mono streams */

			pkt_size = channels;

			pkt_size = channels;

		}

		}



		latency = ((((buffer_size - pkt_size) / channels) * 1000)

				 / (params->rate_num / params->rate_den));



		mcbsp->latency[substream->stream] = latency;



		omap_mcbsp_set_threshold(substream, pkt_size);

		omap_mcbsp_set_threshold(substream, pkt_size);

	}

	}
@@ -554,6 +596,7 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai, 
static const struct snd_soc_dai_ops mcbsp_dai_ops = {

static const struct snd_soc_dai_ops mcbsp_dai_ops = {

	.startup	= omap_mcbsp_dai_startup,

	.startup	= omap_mcbsp_dai_startup,

	.shutdown	= omap_mcbsp_dai_shutdown,

	.shutdown	= omap_mcbsp_dai_shutdown,

	.prepare	= omap_mcbsp_dai_prepare,

	.trigger	= omap_mcbsp_dai_trigger,

	.trigger	= omap_mcbsp_dai_trigger,

	.delay		= omap_mcbsp_dai_delay,

	.delay		= omap_mcbsp_dai_delay,

	.hw_params	= omap_mcbsp_dai_hw_params,

	.hw_params	= omap_mcbsp_dai_hw_params,
@@ -835,6 +878,9 @@ static int asoc_mcbsp_remove(struct platform_device *pdev) 
	if (mcbsp->pdata->ops && mcbsp->pdata->ops->free)

	if (mcbsp->pdata->ops && mcbsp->pdata->ops->free)

		mcbsp->pdata->ops->free(mcbsp->id);

		mcbsp->pdata->ops->free(mcbsp->id);





	if (pm_qos_request_active(&mcbsp->pm_qos_req))

		pm_qos_remove_request(&mcbsp->pm_qos_req);



	omap_mcbsp_cleanup(mcbsp);

	omap_mcbsp_cleanup(mcbsp);





	clk_put(mcbsp->fclk);

	clk_put(mcbsp->fclk);

CRA Git | Maintained and supported by SUSTech CRA and CCSE