diff mbox

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

Message ID 20160830183834.6u73eb5ujgm5emlk@atomide.com (mailing list archive)
State New, archived
Headers show

Commit Message

Tony Lindgren Aug. 30, 2016, 6:38 p.m. UTC 
* kbuild test robot <lkp@intel.com> [160829 21:31]:
> vim +/dev_pm_qos_request_active +1108 sound/soc/omap/mcbsp.c
> 
>   1102		clk_put(mcbsp->fclk);
>   1103		return ret;
>   1104	}
>   1105	
>   1106	void omap_mcbsp_cleanup(struct omap_mcbsp *mcbsp)
>   1107	{
> > 1108		if (dev_pm_qos_request_active(&mcbsp->pm_qos_req))
>   1109			pm_qos_remove_request(&mcbsp->pm_qos_req);
>   1110	
>   1111		if (mcbsp->pdata->buffer_size)

Oops sorry about that. Looks like I completely missed that warning
after a copy-paste adding of the check to omap_mcbsp_cleanup. Looks
like implementing dev_pm_qos needs more work as it needs the
set_latency_tolerance implemented somewhere.

Updated patch below, Mark let me know if you need an incremental
patch to fix the warning.

Regards,

Tony

8< -----------------
From: Tony Lindgren <tony@atomide.com>
Date: Mon, 29 Aug 2016 11:27:46 -0700
Subject: [PATCHv2] 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.

Let's fix the issue by adding PM QoS latency requirement for McBSP.
Based on my experiments a working latency value is somewhere
around 35 ms with 40 ms breaking. So let's use a safer value of 30 ms.

Note that this is different from snd_pcm_hw_constraint_step() as
that can configure things based on the buffer and period size.
However, that does not help to block idle between the fifo fills.

Note that in theory some omaps are capable of playing audio while
hitting deeper idle states. If somebody needs that and gets it
working, we can set the latency requirements accordingly.

Signed-off-by: Tony Lindgren <tony@atomide.com>

Comments

Mark Brown Aug. 31, 2016, 5:24 p.m. UTC | #1 
On Tue, Aug 30, 2016 at 11:38:35AM -0700, Tony Lindgren wrote:

> Updated patch below, Mark let me know if you need an incremental
> patch to fix the warning.
> 
> Regards,
> 
> Tony
> 
> 8< -----------------
> From: Tony Lindgren <tony@atomide.com>
> Date: Mon, 29 Aug 2016 11:27:46 -0700
> Subject: [PATCHv2] ASoC: omap-mcbsp: Add PM QoS support for McBSP to prevent

Please send the patch normally rather than burying it in the middle of
another e-mail :(
Tony Lindgren Aug. 31, 2016, 5:42 p.m. UTC | #2 
* Mark Brown <broonie@kernel.org> [160831 10:25]:
> On Tue, Aug 30, 2016 at 11:38:35AM -0700, Tony Lindgren wrote:
> 
> > Updated patch below, Mark let me know if you need an incremental
> > patch to fix the warning.
> > 
> > Regards,
> > 
> > Tony
> > 
> > 8< -----------------
> > From: Tony Lindgren <tony@atomide.com>
> > Date: Mon, 29 Aug 2016 11:27:46 -0700
> > Subject: [PATCHv2] ASoC: omap-mcbsp: Add PM QoS support for McBSP to prevent
> 
> Please send the patch normally rather than burying it in the middle of
> another e-mail :(

OK will resend after hearing back comments from Peter.

Tony
diff mbox

Patch

diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c
--- a/sound/soc/omap/mcbsp.c
+++ b/sound/soc/omap/mcbsp.c
@@ -25,6 +25,7 @@ 
 #include <linux/io.h>
 #include <linux/slab.h>
 #include <linux/pm_runtime.h>
+#include <linux/pm_qos.h>
 
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 
@@ -643,6 +644,10 @@  void omap_mcbsp_start(struct omap_mcbsp *mcbsp, int tx, int rx)
 	int enable_srg = 0;
 	u16 w;
 
+	/* Prevent omap hardware from hitting off between fifo fills */
+	pm_qos_add_request(&mcbsp->pm_qos_req, PM_QOS_CPU_DMA_LATENCY,
+			   30 * 1000);
+
 	if (mcbsp->st_data)
 		omap_st_start(mcbsp);
 
@@ -731,6 +736,8 @@  void omap_mcbsp_stop(struct omap_mcbsp *mcbsp, int tx, int rx)
 
 	if (mcbsp->st_data)
 		omap_st_stop(mcbsp);
+
+	pm_qos_remove_request(&mcbsp->pm_qos_req);
 }
 
 int omap2_mcbsp_set_clks_src(struct omap_mcbsp *mcbsp, u8 fck_src_id)
@@ -1098,6 +1105,9 @@  err_thres:
 
 void omap_mcbsp_cleanup(struct omap_mcbsp *mcbsp)
 {
+	if (pm_qos_request_active(&mcbsp->pm_qos_req))
+		pm_qos_remove_request(&mcbsp->pm_qos_req);
+
 	if (mcbsp->pdata->buffer_size)
 		sysfs_remove_group(&mcbsp->dev->kobj, &additional_attr_group);
 
diff --git a/sound/soc/omap/mcbsp.h b/sound/soc/omap/mcbsp.h
--- a/sound/soc/omap/mcbsp.h
+++ b/sound/soc/omap/mcbsp.h
@@ -325,6 +325,8 @@  struct omap_mcbsp {
 	unsigned int in_freq;
 	int clk_div;
 	int wlen;
+
+	struct pm_qos_request pm_qos_req;
 };
 
 void omap_mcbsp_config(struct omap_mcbsp *mcbsp,