November 2016 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH v4 0/3] ASoC: Component has suspend/resume support
by Kuninori Morimoto 30 Nov '16

30 Nov '16

Hi Mark, Lars-Peter These patches are v4+RFC of Component level suspend/resume support. I had waited Vinod's cleanup patch which will remove "codec_dev_list" from Intel drivers. But it seems nothing happen at this point. So, this v4 patch-set expects it will be reviwed/accepted *before* Vinod's patch. Kuninori Morimoto (3): ASoC: core: replace codec_dev_list to component_dev_list on Card ASoC: core: replace aux_comp_list to component_dev_list ASoC: add Component level suspend/resume include/sound/soc.h | 16 +++--- sound/soc/intel/boards/broadwell.c | 16 +++--- sound/soc/intel/boards/cht_bsw_rt5672.c | 16 +++--- sound/soc/soc-core.c | 90 ++++++++++++++++++++------------- 4 files changed, 85 insertions(+), 53 deletions(-) -- 1.9.1

1 3

[alsa-devel] TEST
by Jaechul Lee 29 Nov '16

29 Nov '16

TEST?

1 0

[alsa-devel] [PATCH] ALSA: line6: Claim POD X3 USB data interface
by Andrej Krutak 29 Nov '16

29 Nov '16

Deny userspace from using the interface concurrently. Signed-off-by: Andrej Krutak <dev(a)andree.sk> --- sound/usb/line6/driver.h | 1 + sound/usb/line6/podhd.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/sound/usb/line6/driver.h b/sound/usb/line6/driver.h index 7e3a3aa..5d18957 100644 --- a/sound/usb/line6/driver.h +++ b/sound/usb/line6/driver.h @@ -98,6 +98,7 @@ struct line6_properties { int altsetting; + unsigned ctrl_if; unsigned ep_ctrl_r; unsigned ep_ctrl_w; unsigned ep_audio_r; diff --git a/sound/usb/line6/podhd.c b/sound/usb/line6/podhd.c index 49cd4a6..6c53b87 100644 --- a/sound/usb/line6/podhd.c +++ b/sound/usb/line6/podhd.c @@ -153,6 +153,7 @@ struct usb_line6_podhd { .rats = &podhd_ratden}, .bytes_per_channel = 3 /* SNDRV_PCM_FMTBIT_S24_3LE */ }; +static struct usb_driver podhd_driver; static void podhd_startup_start_workqueue(unsigned long data); static void podhd_startup_workqueue(struct work_struct *work); @@ -291,8 +292,13 @@ static void podhd_disconnect(struct usb_line6 *line6) struct usb_line6_podhd *pod = (struct usb_line6_podhd *)line6; if (pod->line6.properties->capabilities & LINE6_CAP_CONTROL) { + struct usb_interface *intf; + del_timer_sync(&pod->startup_timer); cancel_work_sync(&pod->startup_work); + + intf = usb_ifnum_to_if(line6->usbdev, pod->line6.properties->ctrl_if); + usb_driver_release_interface(&podhd_driver, intf); } } @@ -304,10 +310,26 @@ static int podhd_init(struct usb_line6 *line6, { int err; struct usb_line6_podhd *pod = (struct usb_line6_podhd *) line6; + struct usb_interface *intf; line6->disconnect = podhd_disconnect; if (pod->line6.properties->capabilities & LINE6_CAP_CONTROL) { + /* claim the data interface */ + intf = usb_ifnum_to_if(line6->usbdev, pod->line6.properties->ctrl_if); + if (!intf) { + dev_err(pod->line6.ifcdev, "interface %d not found\n", + pod->line6.properties->ctrl_if); + return -ENODEV; + } + + err = usb_driver_claim_interface(&podhd_driver, intf, NULL); + if (err != 0) { + dev_err(pod->line6.ifcdev, "can't claim interface %d, error %d\n", + pod->line6.properties->ctrl_if, err); + return err; + } + /* create sysfs entries: */ err = snd_card_add_dev_attr(line6->card, &podhd_dev_attr_group); if (err < 0) @@ -406,6 +428,7 @@ static int podhd_init(struct usb_line6 *line6, .altsetting = 1, .ep_ctrl_r = 0x81, .ep_ctrl_w = 0x01, + .ctrl_if = 1, .ep_audio_r = 0x86, .ep_audio_w = 0x02, }, @@ -417,6 +440,7 @@ static int podhd_init(struct usb_line6 *line6, .altsetting = 1, .ep_ctrl_r = 0x81, .ep_ctrl_w = 0x01, + .ctrl_if = 1, .ep_audio_r = 0x86, .ep_audio_w = 0x02, }, -- 1.9.1

2 6

[alsa-devel] [PATCH] ALSA: usb-audio: Fix bogus error return in snd_usb_create_stream()
by Takashi Iwai 29 Nov '16

29 Nov '16

The function returns -EINVAL even if it builds the stream properly. The bogus error code sneaked in during the code refactoring, but it wasn't noticed until now since the returned error code itself is ignored in anyway. Kill it here, but there is no behavior change by this patch, obviously. Fixes: e5779998bf8b ('ALSA: usb-audio: refactor code') Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/usb/card.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/usb/card.c b/sound/usb/card.c index 2ddc034673a8..f36cb068dad3 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -206,7 +206,6 @@ static int snd_usb_create_stream(struct snd_usb_audio *chip, int ctrlif, int int if (! snd_usb_parse_audio_interface(chip, interface)) { usb_set_interface(dev, interface, 0); /* reset the current interface */ usb_driver_claim_interface(&usb_audio_driver, iface, (void *)-1L); - return -EINVAL; } return 0; -- 2.10.2

1 0

[alsa-devel] [PATCH] ALSA: echoaudio: Fix improper return value in function load_asic
by Takashi Iwai 29 Nov '16

29 Nov '16

From: Pan Bian <bianpan2016(a)163.com> When the second call to load_asic_generic() fails in function load_asic(), "false" is returned. The real value of "false" is 0, which indicates success in the context. As a result, the execution status and the return value may be inconsistent. This patch fixes the bug. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=188761 Signed-off-by: Pan Bian <bianpan2016(a)163.com> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/echoaudio/layla24_dsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/echoaudio/layla24_dsp.c b/sound/pci/echoaudio/layla24_dsp.c index df28e5117359..c02bc1dcc170 100644 --- a/sound/pci/echoaudio/layla24_dsp.c +++ b/sound/pci/echoaudio/layla24_dsp.c @@ -135,7 +135,7 @@ static int load_asic(struct echoaudio *chip) err = load_asic_generic(chip, DSP_FNC_LOAD_LAYLA24_EXTERNAL_ASIC, FW_LAYLA24_2S_ASIC); if (err < 0) - return false; + return err; /* Now give the external ASIC a little time to set up */ mdelay(10); -- 2.10.2

1 0

[alsa-devel] --max-file-time producing incorrect results
by Rob Nertney 29 Nov '16

29 Nov '16

I have a diagnostic mode for my hardware, which gives me a known pattern in 1 second increments (for my predetermined frame size/rate). If I simply pass a -d duration flag over and over with arecord, every capture is perfect when I inspect it. When I use the --max-file-time=1, my first PCM is perfect, then the following ones aren't. It appears that in between these 1-second PCM files, I am losing 128 frames between the 1-second files. I'm not sure what could be causing this type of error; any thoughts? Thanks, Rob

1 1

Re: [alsa-devel] [RFC PATCH v3 2/7] drm/i915: Add support for audio driver notifications
by Ville Syrjälä 29 Nov '16

29 Nov '16

On Fri, Nov 25, 2016 at 05:25:43AM +0530, Jerome Anand wrote: > Notifiations like mode change, hot plug and edid to > the audio driver are added. This is inturn used by the > audio driver for its functionality. > > A new interface file capturing the notifications needed by the > audio driver is added > > Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> > Signed-off-by: Jerome Anand <jerome.anand(a)intel.com> > --- > drivers/gpu/drm/i915/i915_drv.h | 3 +++ > drivers/gpu/drm/i915/intel_audio.c | 8 ++++++ > drivers/gpu/drm/i915/intel_hdmi.c | 1 + > drivers/gpu/drm/i915/intel_lpe_audio.c | 49 ++++++++++++++++++++++++++++++++++ > include/drm/intel_lpe_audio.h | 1 + > 5 files changed, 62 insertions(+) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 2a79048..33bc44c 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -3561,6 +3561,9 @@ int intel_lpe_audio_setup(struct drm_i915_private *dev_priv); > void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv); > void intel_lpe_audio_irq_handler(struct drm_i915_private *dev_priv); > bool intel_lpe_audio_detect(struct drm_i915_private *dev_priv); > +void intel_lpe_audio_notify(struct drm_i915_private *dev_priv, > + void *eld, int port, int tmds_clk_speed, > + bool connected); > > /* intel_i2c.c */ > extern int intel_setup_gmbus(struct drm_device *dev); > diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c > index 1c509f7..55a6831 100644 > --- a/drivers/gpu/drm/i915/intel_audio.c > +++ b/drivers/gpu/drm/i915/intel_audio.c > @@ -24,6 +24,7 @@ > #include <linux/kernel.h> > #include <linux/component.h> > #include <drm/i915_component.h> > +#include <drm/intel_lpe_audio.h> > #include "intel_drv.h" > > #include <drm/drmP.h> > @@ -627,6 +628,10 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder, > if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify) > acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr, > (int) port, (int) pipe); > + > + if (HAS_LPE_AUDIO(dev_priv)) > + intel_lpe_audio_notify(dev_priv, connector->eld, port, > + crtc_state->port_clock, true); > } > > /** > @@ -660,6 +665,9 @@ void intel_audio_codec_disable(struct intel_encoder *intel_encoder) > if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify) > acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr, > (int) port, (int) pipe); > + > + if (HAS_LPE_AUDIO(dev_priv)) > + intel_lpe_audio_notify(dev_priv, NULL, port, 0, true); > } > > /** > diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c > index fb88e32..02d50e3 100644 > --- a/drivers/gpu/drm/i915/intel_hdmi.c > +++ b/drivers/gpu/drm/i915/intel_hdmi.c > @@ -36,6 +36,7 @@ > #include <drm/drm_edid.h> > #include "intel_drv.h" > #include <drm/i915_drm.h> > +#include <drm/intel_lpe_audio.h> > #include "i915_drv.h" > > static struct drm_device *intel_hdmi_to_dev(struct intel_hdmi *intel_hdmi) > diff --git a/drivers/gpu/drm/i915/intel_lpe_audio.c b/drivers/gpu/drm/i915/intel_lpe_audio.c > index 5335fc6..93f83cb 100644 > --- a/drivers/gpu/drm/i915/intel_lpe_audio.c > +++ b/drivers/gpu/drm/i915/intel_lpe_audio.c > @@ -367,3 +367,52 @@ void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv) > > spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags); > } > + > + > +/** > + * intel_lpe_audio_notify() - notify lpe audio event > + * audio driver and i915 > + * @dev_priv: the i915 drm device private data > + * @eld : ELD data > + * @port: port id > + * @tmds_clk_speed: tmds clock frequency in Hz > + * @connected: hdmi connected/disconnected > + * > + * Notify lpe audio driver of eld change. > + */ > +void intel_lpe_audio_notify(struct drm_i915_private *dev_priv, > + void *eld, int port, int tmds_clk_speed, > + bool connected) > +{ > + unsigned long irq_flags; > + > + if (HAS_LPE_AUDIO(dev_priv)) { > + struct intel_hdmi_lpe_audio_pdata *pdata = dev_get_platdata( > + &(dev_priv->lpe_audio.platdev->dev)); > + > + if (pdata) { How could the !pdata case happen? If it can't we shouldn't cater for it. > + spin_lock_irqsave(&pdata->lpe_audio_slock, > + irq_flags); > + > + if (eld != NULL) { > + memcpy(pdata->eld.eld_data, eld, > + HDMI_MAX_ELD_BYTES); > + pdata->eld.port_id = port; > + > + if (tmds_clk_speed) Why the if? > + pdata->tmds_clock_speed = > + tmds_clk_speed; > + } > + pdata->hdmi_connected = connected; Also can't really see much need for this. Any one of the port/tmds clock/eld should be sufficient. > + if (pdata->notify_audio_lpe) > + pdata->notify_audio_lpe( > + (eld != NULL) ? &pdata->eld : NULL); > + else > + pdata->notify_pending = true; Still not sure why the "pending" thing is useful. Can't the audio driver just do its thing (whatever it is) unconditionally? When disabling just clear the port to INVALID, eld to zero, and tmds clock to 0, and it should all be fine no? > + > + spin_unlock_irqrestore(&pdata->lpe_audio_slock, > + irq_flags); > + } else > + DRM_DEBUG_DRIVER("no audio notification\n"); > + } > +} > diff --git a/include/drm/intel_lpe_audio.h b/include/drm/intel_lpe_audio.h > index a64c449..952de05 100644 > --- a/include/drm/intel_lpe_audio.h > +++ b/include/drm/intel_lpe_audio.h > @@ -25,6 +25,7 @@ > #define _INTEL_LPE_AUDIO_H_ > > #include <linux/types.h> > +#include <linux/spinlock_types.h> > > #define HDMI_MAX_ELD_BYTES 128 > > -- > 2.9.3 -- Ville Syrjälä Intel OTC

4 9

[alsa-devel] [PATCH][alsa-lib] topology: fix unused-variable warnings introduced to build_link()
by Takashi Sakamoto 29 Nov '16

29 Nov '16

A function with unused automatic variables was recently introduced to this library, then compiler generates below warnings. pcm.c: In function ‘build_link’: pcm.c:213:6: warning: unused variable ‘i’ [-Wunused-variable] int i, num_hw_configs = 0, err = 0; ^ pcm.c:210:43: warning: unused variable ‘cmpnt’ [-Wunused-variable] struct snd_soc_tplg_link_cmpnt *codec, *cmpnt; ^~~~~ pcm.c:210:35: warning: unused variable ‘codec’ [-Wunused-variable] struct snd_soc_tplg_link_cmpnt *codec, *cmpnt; ^~~~~ pcm.c:209:20: warning: unused variable ‘ref_elem’ [-Wunused-variable] struct tplg_elem *ref_elem = NULL; This commit removes them. Fixes: 53f7711769d4("topology: Define a function to build a single physical DAI link") Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- src/topology/pcm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/topology/pcm.c b/src/topology/pcm.c index 2e0a120..8f8a703 100644 --- a/src/topology/pcm.c +++ b/src/topology/pcm.c @@ -206,11 +206,9 @@ static int tplg_build_stream_cfg(snd_tplg_t *tplg, static int build_link(snd_tplg_t *tplg, struct tplg_elem *elem) { struct snd_soc_tplg_link_config *link = elem->link; - struct tplg_elem *ref_elem = NULL; - struct snd_soc_tplg_link_cmpnt *codec, *cmpnt; struct tplg_ref *ref; struct list_head *base, *pos; - int i, num_hw_configs = 0, err = 0; + int num_hw_configs = 0, err = 0; err = tplg_build_stream_cfg(tplg, link->stream, link->num_streams); -- 2.9.3

1 0

[alsa-devel] [PATCH] pcm: dmix: Do not discard slave reported delay in status result
by Takashi Iwai 29 Nov '16

29 Nov '16

Like the change done for dshare plugin, we can calculate the delay more precisely from the slave PCM. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- src/pcm/pcm_dmix.c | 45 ++++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c index 2fedb1c14a3b..825677ffeb3f 100644 --- a/src/pcm/pcm_dmix.c +++ b/src/pcm/pcm_dmix.c @@ -391,23 +391,14 @@ static void snd_pcm_dmix_sync_area(snd_pcm_t *pcm) /* * synchronize hardware pointer (hw_ptr) with ours */ -static int snd_pcm_dmix_sync_ptr(snd_pcm_t *pcm) +static int snd_pcm_dmix_sync_ptr0(snd_pcm_t *pcm, snd_pcm_uframes_t slave_hw_ptr) { snd_pcm_direct_t *dmix = pcm->private_data; - snd_pcm_uframes_t slave_hw_ptr, old_slave_hw_ptr, avail; + snd_pcm_uframes_t old_slave_hw_ptr, avail; snd_pcm_sframes_t diff; - switch (snd_pcm_state(dmix->spcm)) { - case SND_PCM_STATE_DISCONNECTED: - dmix->state = SND_PCM_STATE_DISCONNECTED; - return -ENODEV; - default: - break; - } - if (dmix->slowptr) - snd_pcm_hwsync(dmix->spcm); old_slave_hw_ptr = dmix->slave_hw_ptr; - slave_hw_ptr = dmix->slave_hw_ptr = *dmix->spcm->hw.ptr; + dmix->slave_hw_ptr = *dmix->spcm->hw.ptr; diff = slave_hw_ptr - old_slave_hw_ptr; if (diff == 0) /* fast path */ return 0; @@ -440,6 +431,24 @@ static int snd_pcm_dmix_sync_ptr(snd_pcm_t *pcm) return 0; } +static int snd_pcm_dmix_sync_ptr(snd_pcm_t *pcm) +{ + snd_pcm_direct_t *dmix = pcm->private_data; + + switch (snd_pcm_state(dmix->spcm)) { + case SND_PCM_STATE_DISCONNECTED: + dmix->state = SND_PCM_STATE_DISCONNECTED; + return -ENODEV; + default: + break; + } + + if (dmix->slowptr) + snd_pcm_hwsync(dmix->spcm); + + return snd_pcm_dmix_sync_ptr0(pcm, *dmix->spcm->hw.ptr); +} + /* * plugin implementation */ @@ -467,22 +476,24 @@ static int snd_pcm_dmix_status(snd_pcm_t *pcm, snd_pcm_status_t * status) { snd_pcm_direct_t *dmix = pcm->private_data; + memset(status, 0, sizeof(*status)); + snd_pcm_status(dmix->spcm, status); + switch (dmix->state) { case SNDRV_PCM_STATE_DRAINING: case SNDRV_PCM_STATE_RUNNING: - snd_pcm_dmix_sync_ptr(pcm); + snd_pcm_dmix_sync_ptr0(pcm, status->hw_ptr); + status->delay += snd_pcm_mmap_playback_delay(pcm) + + status->avail - dmix->spcm->buffer_size; break; default: break; } - memset(status, 0, sizeof(*status)); - snd_pcm_status(dmix->spcm, status); - status->state = snd_pcm_dmix_state(pcm); + status->trigger_tstamp = dmix->trigger_tstamp; status->avail = snd_pcm_mmap_playback_avail(pcm); status->avail_max = status->avail > dmix->avail_max ? status->avail : dmix->avail_max; dmix->avail_max = 0; - status->delay = snd_pcm_mmap_playback_delay(pcm); return 0; } -- 2.10.2

1 0

[alsa-devel] [PATCH alsa-lib] pcm: Add the PCM state checks to plugins
by Takashi Iwai 29 Nov '16

29 Nov '16

I noticed that some plugin codes have no proper PCM state checks and it results in expected outcomes. For example, when snd_pcm_drain() is called for a dmix PCM after calling snd_pcm_drop(), it stalls unexpectedly. It's just because its drain callback doesn't expect the SND_PCM_SETUP state. We can fix such a bug in each place one by one, but a safer way would be to filter out all such cases commonly in the PCM API functions themselves. This patch adds the PCM state sanity checks to major API functions so that they return -EBADFD when called in the unexpected PCM states. As well as for the thread-safety extension, it'd be a question of the performance; again at this time, the hw PCM is considered as an exception, and it has pcm->own_state_check flag set, which means that the common PCM state checks are skipped. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- src/pcm/pcm.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ src/pcm/pcm_hw.c | 1 + src/pcm/pcm_local.h | 1 + 3 files changed, 50 insertions(+) diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c index cd87bc759ded..f2ca02b55973 100644 --- a/src/pcm/pcm.c +++ b/src/pcm/pcm.c @@ -655,6 +655,23 @@ playback devices. #include <limits.h> #include "pcm_local.h" +#ifndef DOC_HIDDEN +#define P_STATE(x) (1U << SND_PCM_STATE_ ## x) +#define P_STATE_RUNNABLE (P_STATE(PREPARED) | \ + P_STATE(RUNNING) | \ + P_STATE(XRUN) | \ + P_STATE(PAUSED) | \ + P_STATE(DRAINING)) + +/* check whether the PCM is in the unexpected state */ +static int bad_pcm_state(snd_pcm_t *pcm, unsigned int supported_states) +{ + if (pcm->own_state_check) + return 0; /* don't care, the plugin checks by itself */ + return !(supported_states & (1U << snd_pcm_state(pcm))); +} +#endif + /** * \brief get identifier of PCM handle * \param pcm PCM handle @@ -1120,6 +1137,8 @@ int snd_pcm_prepare(snd_pcm_t *pcm) SNDMSG("PCM not set up"); return -EIO; } + if (bad_pcm_state(pcm, ~P_STATE(DISCONNECTED))) + return -EBADFD; snd_pcm_lock(pcm); err = pcm->fast_ops->prepare(pcm->fast_op_arg); snd_pcm_unlock(pcm); @@ -1166,6 +1185,8 @@ int snd_pcm_start(snd_pcm_t *pcm) SNDMSG("PCM not set up"); return -EIO; } + if (bad_pcm_state(pcm, P_STATE(PREPARED))) + return -EBADFD; snd_pcm_lock(pcm); err = __snd_pcm_start(pcm); snd_pcm_unlock(pcm); @@ -1194,6 +1215,9 @@ int snd_pcm_drop(snd_pcm_t *pcm) SNDMSG("PCM not set up"); return -EIO; } + if (bad_pcm_state(pcm, P_STATE_RUNNABLE | P_STATE(SETUP) | + P_STATE(SUSPENDED))) + return -EBADFD; snd_pcm_lock(pcm); err = pcm->fast_ops->drop(pcm->fast_op_arg); snd_pcm_unlock(pcm); @@ -1222,6 +1246,8 @@ int snd_pcm_drain(snd_pcm_t *pcm) SNDMSG("PCM not set up"); return -EIO; } + if (bad_pcm_state(pcm, P_STATE_RUNNABLE)) + return -EBADFD; /* lock handled in the callback */ return pcm->fast_ops->drain(pcm->fast_op_arg); } @@ -1247,6 +1273,8 @@ int snd_pcm_pause(snd_pcm_t *pcm, int enable) SNDMSG("PCM not set up"); return -EIO; } + if (bad_pcm_state(pcm, P_STATE_RUNNABLE)) + return -EBADFD; snd_pcm_lock(pcm); err = pcm->fast_ops->pause(pcm->fast_op_arg, enable); snd_pcm_unlock(pcm); @@ -1273,6 +1301,8 @@ snd_pcm_sframes_t snd_pcm_rewindable(snd_pcm_t *pcm) SNDMSG("PCM not set up"); return -EIO; } + if (bad_pcm_state(pcm, P_STATE_RUNNABLE)) + return -EBADFD; snd_pcm_lock(pcm); result = pcm->fast_ops->rewindable(pcm->fast_op_arg); snd_pcm_unlock(pcm); @@ -1299,6 +1329,8 @@ snd_pcm_sframes_t snd_pcm_rewind(snd_pcm_t *pcm, snd_pcm_uframes_t frames) } if (frames == 0) return 0; + if (bad_pcm_state(pcm, P_STATE_RUNNABLE)) + return -EBADFD; snd_pcm_lock(pcm); result = pcm->fast_ops->rewind(pcm->fast_op_arg, frames); snd_pcm_unlock(pcm); @@ -1325,6 +1357,8 @@ snd_pcm_sframes_t snd_pcm_forwardable(snd_pcm_t *pcm) SNDMSG("PCM not set up"); return -EIO; } + if (bad_pcm_state(pcm, P_STATE_RUNNABLE)) + return -EBADFD; snd_pcm_lock(pcm); result = pcm->fast_ops->forwardable(pcm->fast_op_arg); snd_pcm_unlock(pcm); @@ -1355,6 +1389,8 @@ snd_pcm_sframes_t snd_pcm_forward(snd_pcm_t *pcm, snd_pcm_uframes_t frames) } if (frames == 0) return 0; + if (bad_pcm_state(pcm, P_STATE_RUNNABLE)) + return -EBADFD; snd_pcm_lock(pcm); result = pcm->fast_ops->forward(pcm->fast_op_arg, frames); snd_pcm_unlock(pcm); @@ -1393,6 +1429,8 @@ snd_pcm_sframes_t snd_pcm_writei(snd_pcm_t *pcm, const void *buffer, snd_pcm_ufr SNDMSG("invalid access type %s", snd_pcm_access_name(pcm->access)); return -EINVAL; } + if (bad_pcm_state(pcm, P_STATE_RUNNABLE)) + return -EBADFD; return _snd_pcm_writei(pcm, buffer, size); } @@ -1427,6 +1465,8 @@ snd_pcm_sframes_t snd_pcm_writen(snd_pcm_t *pcm, void **bufs, snd_pcm_uframes_t SNDMSG("invalid access type %s", snd_pcm_access_name(pcm->access)); return -EINVAL; } + if (bad_pcm_state(pcm, P_STATE_RUNNABLE)) + return -EBADFD; return _snd_pcm_writen(pcm, bufs, size); } @@ -1461,6 +1501,8 @@ snd_pcm_sframes_t snd_pcm_readi(snd_pcm_t *pcm, void *buffer, snd_pcm_uframes_t SNDMSG("invalid access type %s", snd_pcm_access_name(pcm->access)); return -EINVAL; } + if (bad_pcm_state(pcm, P_STATE_RUNNABLE)) + return -EBADFD; return _snd_pcm_readi(pcm, buffer, size); } @@ -1495,6 +1537,8 @@ snd_pcm_sframes_t snd_pcm_readn(snd_pcm_t *pcm, void **bufs, snd_pcm_uframes_t s SNDMSG("invalid access type %s", snd_pcm_access_name(pcm->access)); return -EINVAL; } + if (bad_pcm_state(pcm, P_STATE_RUNNABLE)) + return -EBADFD; return _snd_pcm_readn(pcm, bufs, size); } @@ -6938,6 +6982,8 @@ int snd_pcm_mmap_begin(snd_pcm_t *pcm, { int err; + if (bad_pcm_state(pcm, P_STATE_RUNNABLE)) + return -EBADFD; snd_pcm_lock(pcm); err = __snd_pcm_mmap_begin(pcm, areas, offset, frames); snd_pcm_unlock(pcm); @@ -7033,6 +7079,8 @@ snd_pcm_sframes_t snd_pcm_mmap_commit(snd_pcm_t *pcm, { snd_pcm_sframes_t result; + if (bad_pcm_state(pcm, P_STATE_RUNNABLE)) + return -EBADFD; snd_pcm_lock(pcm); result = __snd_pcm_mmap_commit(pcm, offset, frames); snd_pcm_unlock(pcm); diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c index 56e88b6bf6c0..30cd5d0f6503 100644 --- a/src/pcm/pcm_hw.c +++ b/src/pcm/pcm_hw.c @@ -1516,6 +1516,7 @@ int snd_pcm_hw_open_fd(snd_pcm_t **pcmp, const char *name, #ifdef THREAD_SAFE_API pcm->need_lock = 0; /* hw plugin is thread-safe */ #endif + pcm->own_state_check = 1; /* skip the common state check */ ret = snd_pcm_hw_mmap_status(pcm); if (ret < 0) { diff --git a/src/pcm/pcm_local.h b/src/pcm/pcm_local.h index bba2f15ac463..32e6dcdf6fcd 100644 --- a/src/pcm/pcm_local.h +++ b/src/pcm/pcm_local.h @@ -234,6 +234,7 @@ struct _snd_pcm { * use the mmaped buffer of the slave */ unsigned int donot_close: 1; /* don't close this PCM */ + unsigned int own_state_check:1; /* plugin has own PCM state check */ snd_pcm_channel_info_t *mmap_channels; snd_pcm_channel_area_t *running_areas; snd_pcm_channel_area_t *stopped_areas; -- 2.10.2

1 0