ASoC: omap-mcbsp: Add PM QoS support for McBSP to prevent glitches
PATCH v7 1/1 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
---
Changes from v1:
* add calculations for latency per number of FIFO locations
Changes from v2:
* add missing mcbsp.h header change
Changes from v3:
* base the latency calculations on threshold, buffer size, sample rate, and channels
Changes from v4:
* using Peter Ujfalusi's suggestions for restoring a higher latency on audio stream completion, or if not applicable remove the QoS request
Changes from v5:
* clean up latency checking logic
* move logic to .prepare and .shutdown to avoid functions that can sleep
Changes from v6:
* move QoS removal to asoc_mcbsp_remove from omap_mcbsp_cleanup
* also remove header include that is unneeded
sound/soc/omap/mcbsp.h | 3 +++ sound/soc/omap/omap-mcbsp.c | 47 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 49 insertions(+), 1 deletion(-)
sound/soc/omap/mcbsp.h +3 -0
@@ -323,8 +323,11 @@ struct omap_mcbsp {unsigned int fmt;unsigned int in_freq; +unsigned int latency[2 ];int clk_div;int wlen; + +struct pm_qos_request pm_qos_req; }; void omap_mcbsp_config(struct omap_mcbsp *mcbsp,
sound/soc/omap/omap-mcbsp.c +46 -1
89 lines not on this page · raw message
Signature · 1 line
2.10.2
Quoted 35 lines · Matt Ranostay
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
Cc Tony Lindgren <[email protected]>Cc Peter Ujfalusi <[email protected]>Acked-by Peter Ujfalusi <[email protected]>Signed-off-by Matt Ranostay <[email protected]>---
Changes from v1:
* add calculations for latency per number of FIFO locationsChanges from v2:
* add missingmcbsp.hheader changeChanges from v3:
* base the latency calculations on threshold, buffer size, sample rate, and channelsChanges from v4:
* using Peter Ujfalusi's suggestions for restoring a higher latency on audio stream completion, or if not applicable remove the QoS request
Quoted 7 lines
Changes from v5:
* clean up latency checking logic
* move logic to .prepare and .shutdown to avoid functions that can sleepChanges from v6:
* move QoS removal toasoc_mcbsp_removefromomap_mcbsp_cleanup
* also remove header include that is unneeded
Hmm now I'm seeing these when starting or stopping playback:
WARNING: CPU: 0 PID: 373 at kernel/power/qos.c:534 omap_mcbsp_dai_shutdown+0x6c/0x70 [snd_soc_omap_mcbsp] pm_qos_remove_request() called for unknown object Modules linked in: snd_soc_omap_twl4030 snd_soc_twl4030 snd_soc_omap_mcbsp evdev mwifiex_sdio mwifiex leds_gpio snd_soc_omap cfg80211 bq27xxx_battery_i2c leds_pca963x bq27xxx_battery led_class bq24190_charger phy_twl4030_usb omap2430 mus b_hdrc usbcore snd_soc_core twl4030_wdt snd_pcm_dmaengine rtc_twl snd_pcm snd_timer snd soundcore twl4030_pwrbutton pwm_twl_le d twl4030_keypad pwm_twl matrix_keymap omap_ssi hsi ledtrig_timer usb_f_serial usb_f_rndis usb_f_mass_storage usb_f_ecm u_ethe r usb_f_acm libcomposite u_serial udc_core usb_common autofs4 [last unloaded: snd_soc_omap_mcbsp] [ 51.542541] CPU: 0 PID: 373 Comm: mpg123 Not tainted 4.10.0-rc2-next-20170109+ #751 [ 51.550231] Hardware name: Generic OMAP36xx (Flattened Device Tree) [ 51.556579] [<c0110198>] (unwind_backtrace) from [<c010c208>] (show_stack+0x10/0x14) [ 51.564361] [<c010c208>] (show_stack) from [<c04be0a0>] (dump_stack+0xac/0xe0) [ 51.571655] [<c04be0a0>] (dump_stack) from [<c0137428>] (__warn+0xd8/0x104) [ 51.578643] [<c0137428>] (__warn) from [<c0137488>] (warn_slowpath_fmt+0x34/0x44) [ 51.586212] [<c0137488>] (warn_slowpath_fmt) from [<bf3538f4>] (omap_mcbsp_dai_shutdown+0x6c/0x70 [snd_soc_omap_mcbsp]) [ 51.597351] [<bf3538f4>] (omap_mcbsp_dai_shutdown [snd_soc_omap_mcbsp]) from [<bf11037c>] (soc_pcm_close+0xa0/0x2b8 [snd_so c_core]) [ 51.609497] [<bf11037c>] (soc_pcm_close [snd_soc_core]) from [<bf0d0654>] (snd_pcm_release_substream.part.13+0x48/0xac [snd _pcm]) [ 51.621337] [<bf0d0654>] (snd_pcm_release_substream.part.13 [snd_pcm]) from [<bf0d0764>] (snd_pcm_release+0x94/0xb4 [snd_pc m]) [ 51.632843] [<bf0d0764>] (snd_pcm_release [snd_pcm]) from [<c02b91d8>] (__fput+0x94/0x1e4) [ 51.641174] [<c02b91d8>] (__fput) from [<c015b768>] (task_work_run+0xcc/0x104) [ 51.648437] [<c015b768>] (task_work_run) from [<c010bb38>] (do_work_pending+0xbc/0xc0) [ 51.656402] [<c010bb38>] (do_work_pending) from [<c01077c8>] (slow_work_pending+0xc/0x20)
Regards,
Tony
Quoted 40 lines · Tony Lindgren
Quoted 39 lines · Matt Ranostay
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
Cc Tony Lindgren <[email protected]>Cc Peter Ujfalusi <[email protected]>Acked-by Peter Ujfalusi <[email protected]>Signed-off-by Matt Ranostay <[email protected]>---
Changes from v1:
* add calculations for latency per number of FIFO locationsChanges from v2:
* add missingmcbsp.hheader changeChanges from v3:
* base the latency calculations on threshold, buffer size, sample rate, and channelsChanges from v4:
* using Peter Ujfalusi's suggestions for restoring a higher latency on audio stream completion, or if not applicable remove the QoS requestChanges from v5:
* clean up latency checking logic
* move logic to .prepare and .shutdown to avoid functions that can sleep
Quoted 5 lines
Quoted 3 lines
Changes from v6:
* move QoS removal toasoc_mcbsp_removefromomap_mcbsp_cleanup
* also remove header include that is unneededHmm now I'm seeing these when starting or stopping playback:
Weird.. I'll test again tonight and get back to you
Quoted 30 lines
WARNING: CPU: 0 PID: 373 at kernel/power/qos.c:534 omap_mcbsp_dai_shutdown+0x6c/0x70 [snd_soc_omap_mcbsp] pm_qos_remove_request() called for unknown object Modules linked in: snd_soc_omap_twl4030 snd_soc_twl4030 snd_soc_omap_mcbsp evdev mwifiex_sdio mwifiex leds_gpio snd_soc_omap cfg80211 bq27xxx_battery_i2c leds_pca963x bq27xxx_battery led_class bq24190_charger phy_twl4030_usb omap2430 mus b_hdrc usbcore snd_soc_core twl4030_wdt snd_pcm_dmaengine rtc_twl snd_pcm snd_timer snd soundcore twl4030_pwrbutton pwm_twl_le d twl4030_keypad pwm_twl matrix_keymap omap_ssi hsi ledtrig_timer usb_f_serial usb_f_rndis usb_f_mass_storage usb_f_ecm u_ethe r usb_f_acm libcomposite u_serial udc_core usb_common autofs4 [last unloaded: snd_soc_omap_mcbsp] [ 51.542541] CPU: 0 PID: 373 Comm: mpg123 Not tainted 4.10.0-rc2-next-20170109+ #751 [ 51.550231] Hardware name: Generic OMAP36xx (Flattened Device Tree) [ 51.556579] [<c0110198>] (unwind_backtrace) from [<c010c208>] (show_stack+0x10/0x14) [ 51.564361] [<c010c208>] (show_stack) from [<c04be0a0>] (dump_stack+0xac/0xe0) [ 51.571655] [<c04be0a0>] (dump_stack) from [<c0137428>] (__warn+0xd8/0x104) [ 51.578643] [<c0137428>] (__warn) from [<c0137488>] (warn_slowpath_fmt+0x34/0x44) [ 51.586212] [<c0137488>] (warn_slowpath_fmt) from [<bf3538f4>] (omap_mcbsp_dai_shutdown+0x6c/0x70 [snd_soc_omap_mcbsp]) [ 51.597351] [<bf3538f4>] (omap_mcbsp_dai_shutdown [snd_soc_omap_mcbsp]) from [<bf11037c>] (soc_pcm_close+0xa0/0x2b8 [snd_so c_core]) [ 51.609497] [<bf11037c>] (soc_pcm_close [snd_soc_core]) from [<bf0d0654>] (snd_pcm_release_substream.part.13+0x48/0xac [snd _pcm]) [ 51.621337] [<bf0d0654>] (snd_pcm_release_substream.part.13 [snd_pcm]) from [<bf0d0764>] (snd_pcm_release+0x94/0xb4 [snd_pc m]) [ 51.632843] [<bf0d0764>] (snd_pcm_release [snd_pcm]) from [<c02b91d8>] (__fput+0x94/0x1e4) [ 51.641174] [<c02b91d8>] (__fput) from [<c015b768>] (task_work_run+0xcc/0x104) [ 51.648437] [<c015b768>] (task_work_run) from [<c010bb38>] (do_work_pending+0xbc/0xc0) [ 51.656402] [<c010bb38>] (do_work_pending) from [<c01077c8>] (slow_work_pending+0xc/0x20)Regards,
Tony
Quoted 40 lines · Tony Lindgren
Quoted 39 lines · Matt Ranostay
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
Cc Tony Lindgren <[email protected]>Cc Peter Ujfalusi <[email protected]>Acked-by Peter Ujfalusi <[email protected]>Signed-off-by Matt Ranostay <[email protected]>---
Changes from v1:
* add calculations for latency per number of FIFO locationsChanges from v2:
* add missingmcbsp.hheader changeChanges from v3:
* base the latency calculations on threshold, buffer size, sample rate, and channelsChanges from v4:
* using Peter Ujfalusi's suggestions for restoring a higher latency on audio stream completion, or if not applicable remove the QoS requestChanges from v5:
* clean up latency checking logic
* move logic to .prepare and .shutdown to avoid functions that can sleep
Quoted 5 lines
Quoted 3 lines
Changes from v6:
* move QoS removal toasoc_mcbsp_removefromomap_mcbsp_cleanup
* also remove header include that is unneededHmm now I'm seeing these when starting or stopping playback:
Ok I can't reproduce but I have an idea why it is happening. There is likely a race condition between pm_qos_remove_request() and omap_mcbsp_dai_shutdown()... Should we do a pm_qos_request_active check in omap_mcbsp_dai_shutdown? That seems to be hacking around the issue.
Thanks,
Matt
Quoted 30 lines
WARNING: CPU: 0 PID: 373 at kernel/power/qos.c:534 omap_mcbsp_dai_shutdown+0x6c/0x70 [snd_soc_omap_mcbsp] pm_qos_remove_request() called for unknown object Modules linked in: snd_soc_omap_twl4030 snd_soc_twl4030 snd_soc_omap_mcbsp evdev mwifiex_sdio mwifiex leds_gpio snd_soc_omap cfg80211 bq27xxx_battery_i2c leds_pca963x bq27xxx_battery led_class bq24190_charger phy_twl4030_usb omap2430 mus b_hdrc usbcore snd_soc_core twl4030_wdt snd_pcm_dmaengine rtc_twl snd_pcm snd_timer snd soundcore twl4030_pwrbutton pwm_twl_le d twl4030_keypad pwm_twl matrix_keymap omap_ssi hsi ledtrig_timer usb_f_serial usb_f_rndis usb_f_mass_storage usb_f_ecm u_ethe r usb_f_acm libcomposite u_serial udc_core usb_common autofs4 [last unloaded: snd_soc_omap_mcbsp] [ 51.542541] CPU: 0 PID: 373 Comm: mpg123 Not tainted 4.10.0-rc2-next-20170109+ #751 [ 51.550231] Hardware name: Generic OMAP36xx (Flattened Device Tree) [ 51.556579] [<c0110198>] (unwind_backtrace) from [<c010c208>] (show_stack+0x10/0x14) [ 51.564361] [<c010c208>] (show_stack) from [<c04be0a0>] (dump_stack+0xac/0xe0) [ 51.571655] [<c04be0a0>] (dump_stack) from [<c0137428>] (__warn+0xd8/0x104) [ 51.578643] [<c0137428>] (__warn) from [<c0137488>] (warn_slowpath_fmt+0x34/0x44) [ 51.586212] [<c0137488>] (warn_slowpath_fmt) from [<bf3538f4>] (omap_mcbsp_dai_shutdown+0x6c/0x70 [snd_soc_omap_mcbsp]) [ 51.597351] [<bf3538f4>] (omap_mcbsp_dai_shutdown [snd_soc_omap_mcbsp]) from [<bf11037c>] (soc_pcm_close+0xa0/0x2b8 [snd_so c_core]) [ 51.609497] [<bf11037c>] (soc_pcm_close [snd_soc_core]) from [<bf0d0654>] (snd_pcm_release_substream.part.13+0x48/0xac [snd _pcm]) [ 51.621337] [<bf0d0654>] (snd_pcm_release_substream.part.13 [snd_pcm]) from [<bf0d0764>] (snd_pcm_release+0x94/0xb4 [snd_pc m]) [ 51.632843] [<bf0d0764>] (snd_pcm_release [snd_pcm]) from [<c02b91d8>] (__fput+0x94/0x1e4) [ 51.641174] [<c02b91d8>] (__fput) from [<c015b768>] (task_work_run+0xcc/0x104) [ 51.648437] [<c015b768>] (task_work_run) from [<c010bb38>] (do_work_pending+0xbc/0xc0) [ 51.656402] [<c010bb38>] (do_work_pending) from [<c01077c8>] (slow_work_pending+0xc/0x20)Regards,
Tony
Quoted 45 lines · Matt Ranostay
Quoted 44 lines · Tony Lindgren
Quoted 42 lines · Matt Ranostay
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
Cc Tony Lindgren <[email protected]>Cc Peter Ujfalusi <[email protected]>Acked-by Peter Ujfalusi <[email protected]>Signed-off-by Matt Ranostay <[email protected]>---
Changes from v1:
* add calculations for latency per number of FIFO locationsChanges from v2:
* add missingmcbsp.hheader changeChanges from v3:
* base the latency calculations on threshold, buffer size, sample rate, and channelsChanges from v4:
* using Peter Ujfalusi's suggestions for restoring a higher latency on audio stream completion, or if not applicable remove the QoS requestChanges from v5:
* clean up latency checking logic
* move logic to .prepare and .shutdown to avoid functions that can sleepChanges from v6:
* move QoS removal toasoc_mcbsp_removefromomap_mcbsp_cleanup
* also remove header include that is unneeded
Quoted 7 lines
Quoted 1 line
Hmm now I'm seeing these when starting or stopping playback:
Ok I can't reproduce but I have an idea why it is happening. There is likely a race condition between
pm_qos_remove_request()andomap_mcbsp_dai_shutdown()... Should we do apm_qos_request_activecheck inomap_mcbsp_dai_shutdown? That seems to be hacking around the issue.
OK. Again this is with next using omap2plus_defconfig and:
CONFIG_DEBUG_LOCKDEP=yCONFIG_DEBUG_ATOMIC_SLEEP=y
Regards,
Tony
Quoted 54 lines · Tony Lindgren
Quoted 45 lines · Matt Ranostay
Quoted 44 lines · Tony Lindgren
Quoted 42 lines · Matt Ranostay
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
Cc Tony Lindgren <[email protected]>Cc Peter Ujfalusi <[email protected]>Acked-by Peter Ujfalusi <[email protected]>Signed-off-by Matt Ranostay <[email protected]>---
Changes from v1:
* add calculations for latency per number of FIFO locationsChanges from v2:
* add missingmcbsp.hheader changeChanges from v3:
* base the latency calculations on threshold, buffer size, sample rate, and channelsChanges from v4:
* using Peter Ujfalusi's suggestions for restoring a higher latency on audio stream completion, or if not applicable remove the QoS requestChanges from v5:
* clean up latency checking logic
* move logic to .prepare and .shutdown to avoid functions that can sleepChanges from v6:
* move QoS removal toasoc_mcbsp_removefromomap_mcbsp_cleanup
* also remove header include that is unneededQuoted 7 lines
Quoted 1 line
Hmm now I'm seeing these when starting or stopping playback:
Ok I can't reproduce but I have an idea why it is happening. There is likely a race condition between
pm_qos_remove_request()andomap_mcbsp_dai_shutdown()... Should we do apm_qos_request_activecheck inomap_mcbsp_dai_shutdown? That seems to be hacking around the issue.
Quoted 4 lines
OK. Again this is with next using
omap2plus_defconfigand:
CONFIG_DEBUG_LOCKDEP=yCONFIG_DEBUG_ATOMIC_SLEEP=y
Yep I was testing with that enabled. Not sure why I'm not getting it all... maybe different side effects like sample rate of the audio being played?
Peter, is there chance that there is race condition is possible between pm_qos_remove_request and omap_mcbsp_dai_shutdown?
Quoted 4 lines
Regards,
Tony
Quoted 6 lines · Matt Ranostay
Yep I was testing with that enabled. Not sure why I'm not getting it all... maybe different side effects like sample rate of the audio being played?
Peter, is there chance that there is race condition is possible between
pm_qos_remove_requestandomap_mcbsp_dai_shutdown?
Not with my knowledge.
However one thing might happen which is not handled:
application opens up the audio card, does some hw_param setup, then it decides to close the card. In this case the pm_qos is not placed, but in dai_shutdown we try to remove it -> WARN().
I think we need to check either if the pm_qos is active and only then bother with the removal/updated or we can check if the mcbsp->latency[stream1] is not 0, which should be the same as checking for the pm_qos active.
Signature · 5 lines
Péter _______________________________________________ Alsa-devel mailing list [email protected] http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Quoted 14 lines · Peter Ujfalusi
Quoted 6 lines · Matt Ranostay
Yep I was testing with that enabled. Not sure why I'm not getting it all... maybe different side effects like sample rate of the audio being played?
Peter, is there chance that there is race condition is possible between
pm_qos_remove_requestandomap_mcbsp_dai_shutdown?Not with my knowledge.
However one thing might happen which is not handled:
application opens up the audio card, does somehw_paramsetup, then it decides to close the card. In this case thepm_qosis not placed, but indai_shutdownwe try to remove it ->WARN().
Quoted 4 lines
I think we need to check either if the
pm_qosis active and only then bother with the removal/updated or we can check if the mcbsp->latency[stream1] is not 0, which should be the same as checking for thepm_qosactive
Ok makes sense. Weird I'm not seeing it but I wanted to be sure adding checks wasn't just hiding a issue.
Will submit v8... and hopefully that is the final one! *fingers crossed*
Quoted 3 lines
--
Péter
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel