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

[alsa-devel] [PATCH] Provide sequencer sound card number / PID via alsa-lib
by Martin Koegler 17 Feb '16

17 Feb '16

From: Martin Koegler <martin.koegler(a)chello.at> rawmidi devices expose the card number via IOCTLs, which allows to find the corresponding device in sysfs. The sequencer provides no identifing data. Chromium works around this issue by scanning rawmidi as well as sequencer devices and matching them by using assumtions, how the kernel register sequencer devices. This changes adds support for exposing the card number for kernel clients as well as the PID for user client. It supports kernels with and without the required support. Signed-off-by: Martin Koegler <martin.koegler(a)chello.at> --- include/seq.h | 1 + include/sound/asequencer.h | 5 +++-- src/seq/seq.c | 11 +++++++++++ src/seq/seq_hw.c | 8 +++++++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/include/seq.h b/include/seq.h index 9576822..77996e5 100644 --- a/include/seq.h +++ b/include/seq.h @@ -143,6 +143,7 @@ snd_seq_client_type_t snd_seq_client_info_get_type(const snd_seq_client_info_t * const char *snd_seq_client_info_get_name(snd_seq_client_info_t *info); int snd_seq_client_info_get_broadcast_filter(const snd_seq_client_info_t *info); int snd_seq_client_info_get_error_bounce(const snd_seq_client_info_t *info); +int snd_seq_client_info_get_owner(const snd_seq_client_info_t *info); const unsigned char *snd_seq_client_info_get_event_filter(const snd_seq_client_info_t *info); int snd_seq_client_info_get_num_ports(const snd_seq_client_info_t *info); int snd_seq_client_info_get_event_lost(const snd_seq_client_info_t *info); diff --git a/include/sound/asequencer.h b/include/sound/asequencer.h index 09c8a00..7ebf7fd 100644 --- a/include/sound/asequencer.h +++ b/include/sound/asequencer.h @@ -24,7 +24,7 @@ /** version of the sequencer */ -#define SNDRV_SEQ_VERSION SNDRV_PROTOCOL_VERSION (1, 0, 1) +#define SNDRV_SEQ_VERSION SNDRV_PROTOCOL_VERSION (1, 0, 2) /** * definition of sequencer event types @@ -356,7 +356,8 @@ struct snd_seq_client_info { unsigned char event_filter[32]; /* event filter bitmap */ int num_ports; /* RO: number of ports */ int event_lost; /* number of lost events */ - char reserved[64]; /* for future use */ + int owner; /* RO: card number[kernel] / PID[user] */ + char reserved[64 - sizeof(int)]; /* for future use */ }; diff --git a/src/seq/seq.c b/src/seq/seq.c index 620ca3f..2505293 100644 --- a/src/seq/seq.c +++ b/src/seq/seq.c @@ -1522,6 +1522,17 @@ int snd_seq_client_info_get_error_bounce(const snd_seq_client_info_t *info) } /** + * \brief Get the sound card number (kernel) or owning PID + * \param info client_info container + * \return card number/PID/-1 if value is not available. + */ +int snd_seq_client_info_get_owner(const snd_seq_client_info_t *info) +{ + assert(info); + return info->owner; +} + +/** * \brief (DEPRECATED) Get the event filter bitmap of a client_info container * \param info client_info container * \return NULL if no event filter, or pointer to event filter bitmap diff --git a/src/seq/seq_hw.c b/src/seq/seq_hw.c index d033367..a4c083a 100644 --- a/src/seq/seq_hw.c +++ b/src/seq/seq_hw.c @@ -32,10 +32,11 @@ const char *_snd_module_seq_hw = ""; #ifndef DOC_HIDDEN #define SNDRV_FILE_SEQ ALSA_DEVICE_DIRECTORY "seq" #define SNDRV_FILE_ALOADSEQ ALOAD_DEVICE_DIRECTORY "aloadSEQ" -#define SNDRV_SEQ_VERSION_MAX SNDRV_PROTOCOL_VERSION(1, 0, 1) +#define SNDRV_SEQ_VERSION_MAX SNDRV_PROTOCOL_VERSION(1, 0, 2) typedef struct { int fd; + int micro_version; } snd_seq_hw_t; #endif /* DOC_HIDDEN */ @@ -100,6 +101,8 @@ static int snd_seq_hw_get_client_info(snd_seq_t *seq, snd_seq_client_info_t * in /*SYSERR("SNDRV_SEQ_IOCTL_GET_CLIENT_INFO failed");*/ return -errno; } + if (hw->micro_version < SNDRV_PROTOCOL_MICRO(SNDRV_SEQ_VERSION_MAX)) + info->owner = -1; return 0; } @@ -368,6 +371,8 @@ static int snd_seq_hw_query_next_client(snd_seq_t *seq, snd_seq_client_info_t *i /*SYSERR("SNDRV_SEQ_IOCTL_QUERY_NEXT_CLIENT failed");*/ return -errno; } + if (hw->micro_version < SNDRV_PROTOCOL_MICRO(SNDRV_SEQ_VERSION_MAX)) + info->owner = -1; return 0; } @@ -480,6 +485,7 @@ int snd_seq_hw_open(snd_seq_t **handle, const char *name, int streams, int mode) return -ENOMEM; } hw->fd = fd; + hw->micro_version = SNDRV_PROTOCOL_MICRO(ver); if (streams & SND_SEQ_OPEN_OUTPUT) { seq->obuf = (char *) malloc(seq->obufsize = SND_SEQ_OBUF_SIZE); if (!seq->obuf) { -- 2.6.2

3 16

[alsa-devel] [PATCH] ASoC: hdac_hdmi: Dereference 'edev' after checking for NULL
by Fabio Estevam 17 Feb '16

17 Feb '16

From: Fabio Estevam <fabio.estevam(a)nxp.com> Commit 4a3478debf36 ("ASoC: hdac_hdmi: Add jack reporting") leads to the following Smatch complaint: sound/soc/codecs/hdac_hdmi.c:971 hdac_hdmi_present_sense() warn: variable dereferenced before check 'edev' (see line 967) ,so deference 'edev' after checking for NULL. Reported-by: Dan Carpenter <dan.carpenter(a)oracle.com> Signed-off-by: Fabio Estevam <fabio.estevam(a)nxp.com> --- sound/soc/codecs/hdac_hdmi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c index 36f1200..920af2f 100644 --- a/sound/soc/codecs/hdac_hdmi.c +++ b/sound/soc/codecs/hdac_hdmi.c @@ -964,13 +964,15 @@ static int hdac_hdmi_add_cvt(struct hdac_ext_device *edev, hda_nid_t nid) static void hdac_hdmi_present_sense(struct hdac_hdmi_pin *pin, int repoll) { struct hdac_ext_device *edev = pin->edev; - struct hdac_hdmi_priv *hdmi = edev->private_data; + struct hdac_hdmi_priv *hdmi; struct hdac_hdmi_pcm *pcm; int val; if (!edev) return; + hdmi = edev->private_data; + pin->repoll_count = repoll; pm_runtime_get_sync(&edev->hdac.dev); -- 1.9.1

3 3

[alsa-devel] [PATCH v2] ASoC: hdac_hdmi: Remove 'edev' NULL check
by Fabio Estevam 17 Feb '16

17 Feb '16

Commit 4a3478debf36 ("ASoC: hdac_hdmi: Add jack reporting") leads to the following Smatch complaint: sound/soc/codecs/hdac_hdmi.c:971 hdac_hdmi_present_sense() warn: variable dereferenced before check 'edev' (see line 967) As explained by Subhransu S. Prusty: "This NULL check is not required, can be removed. edev object is expected to be present when the present_sense is called. This is called from places where this edev object is already available." So remove the evdev NULL check. Reported-by: Dan Carpenter <dan.carpenter(a)oracle.com> Signed-off-by: Fabio Estevam <fabio.estevam(a)nxp.com> --- Changes since v1: - Remove NULL check (Subhransu) sound/soc/codecs/hdac_hdmi.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c index 36f1200..2884dbf 100644 --- a/sound/soc/codecs/hdac_hdmi.c +++ b/sound/soc/codecs/hdac_hdmi.c @@ -968,9 +968,6 @@ static void hdac_hdmi_present_sense(struct hdac_hdmi_pin *pin, int repoll) struct hdac_hdmi_pcm *pcm; int val; - if (!edev) - return; - pin->repoll_count = repoll; pm_runtime_get_sync(&edev->hdac.dev); -- 1.9.1

3 2

[alsa-devel] [PATCH RFT] ASoC: max98926: Fix blr_clk_ratio calculation
by Axel Lin 17 Feb '16

17 Feb '16

Current code calculates blr_clk_ratio before setting max98926->ch_size, fix it. Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- Hi Anish, I don't have this h/w, please review and test this patch. thanks, Axel sound/soc/codecs/max98926.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/max98926.c b/sound/soc/codecs/max98926.c index 66884ebd..5245e10 100644 --- a/sound/soc/codecs/max98926.c +++ b/sound/soc/codecs/max98926.c @@ -383,8 +383,7 @@ static int max98926_dai_hw_params(struct snd_pcm_substream *substream, int rate = params_rate(params), i; struct snd_soc_codec *codec = dai->codec; struct max98926_priv *max98926 = snd_soc_codec_get_drvdata(codec); - /* BCLK/LRCLK ratio calculation */ - int blr_clk_ratio = params_channels(params) * max98926->ch_size; + int blr_clk_ratio; switch (params_format(params)) { case SNDRV_PCM_FORMAT_S16_LE: @@ -414,6 +413,9 @@ static int max98926_dai_hw_params(struct snd_pcm_substream *substream, return -EINVAL; } + /* BCLK/LRCLK ratio calculation */ + blr_clk_ratio = params_channels(params) * max98926->ch_size; + switch (blr_clk_ratio) { case 32: regmap_update_bits(max98926->regmap, -- 2.1.4

3 2

[alsa-devel] [RFC v1 0/9] ASoC: Add support to Qualcomm msm8x16-wcd codec
by Srinivas Kandagatla 17 Feb '16

17 Feb '16

This patchset aims at adding msm8x16-wcd codec support. msm8x16-wcd codec is found in Qualcomm msm8916 and apq8016 processors. This codec IP is split in to two parts(Digital & Analog), Analog part is integrated in to PMIC PM8916 and the digital part is integrated into Application processor. Register access to the analog part is done via SPMI interface to PMIC, and registers on the Application processor are memory mapped. Data transfer between Analog and Digital Die is done via a internal bus called PDM. I did split the driver into sensible patches to easy the review process. Most of this driver is ported from downstream Andriod v3.10 kernel. Jack support and Headset button detection code is not added in to this series. This codec support: - 3 Microphones: Primary Mic(Handset mic), Headset Mic and Secondary Mic. - 2 Digital Microphones. - 2 Mic Bias Circuits. - Earpiece - Headset - Loud Speaker. - Jack Detect. - Headset Button detection circuit. Tested this code on v4.5-rc4 with lpass driver capture support patches for Headset (Mic and speakers), Secondary Mic and Loudspeaker on DB410C. DMIC should work too. Thanks, srini Srinivas Kandagatla (9): ASoC: msm8x176: Add Device Tree bindings. ASoC: msm8x16: add driver structure ASoC: msm8x16: add codec registers definitions ASoC: msm8x16: add ranges for default, readonly ASoC: msm8x16: add codec intialization setup ASoC: msm8x16: add codec dais ASoC: msm8x16: Add sound mixer controls. ASoC: msm8x16: add dapm widgets ASoC: msm8x16: add dapm routes .../devicetree/bindings/sound/qcom,msm8x16-wcd.txt | 91 + include/dt-bindings/sound/msm8x16-wcd.h | 7 + sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 3 +- sound/soc/codecs/msm8x16-wcd-registers.h | 518 +++++ sound/soc/codecs/msm8x16-wcd.c | 2132 ++++++++++++++++++++ sound/soc/codecs/msm8x16-wcd.h | 764 +++++++ 7 files changed, 3518 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/sound/qcom,msm8x16-wcd.txt create mode 100644 include/dt-bindings/sound/msm8x16-wcd.h create mode 100644 sound/soc/codecs/msm8x16-wcd-registers.h create mode 100644 sound/soc/codecs/msm8x16-wcd.c create mode 100644 sound/soc/codecs/msm8x16-wcd.h -- 1.9.1

3 18

[alsa-devel] [PATCH v4] portman2x4 - use new parport device model
by Sudip Mukherjee 17 Feb '16

17 Feb '16

Modify portman driver to use the new parallel port device model. The advantage of using the device model is that the device gets binded to the hardware, we get the feature of hotplug, we can bind/unbind the driver at runtime. The changes are in the way the driver gets registered with the parallel port subsystem and the temporary device to probe portman card is removed and portman_probe() is used in the probe callback. Signed-off-by: Sudip Mukherjee <sudip(a)vectorindia.org> --- v4: temporary device to probe is removed. v3: changed commit message v2: 1. pardev_cb is initialized while declaring, thus removing the use of memset. 2. used pdev->id. 3. v1 did not have the parport probe callback, but we will need the probe callback for binding as the name of the driver and the name of the device is different. 4. in v1 I missed modifying snd_portman_probe_port(). sound/drivers/portman2x4.c | 79 +++++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c index 464385a..0741a3b 100644 --- a/sound/drivers/portman2x4.c +++ b/sound/drivers/portman2x4.c @@ -648,30 +648,6 @@ static void snd_portman_interrupt(void *userdata) spin_unlock(&pm->reg_lock); } -static int snd_portman_probe_port(struct parport *p) -{ - struct pardevice *pardev; - int res; - - pardev = parport_register_device(p, DRIVER_NAME, - NULL, NULL, NULL, - 0, NULL); - if (!pardev) - return -EIO; - - if (parport_claim(pardev)) { - parport_unregister_device(pardev); - return -EIO; - } - - res = portman_probe(p); - - parport_release(pardev); - parport_unregister_device(pardev); - - return res ? -EIO : 0; -} - static void snd_portman_attach(struct parport *p) { struct platform_device *device; @@ -705,10 +681,20 @@ static void snd_portman_detach(struct parport *p) /* nothing to do here */ } +static int snd_portman_dev_probe(struct pardevice *pardev) +{ + if (strcmp(pardev->name, DRIVER_NAME)) + return -ENODEV; + + return 0; +} + static struct parport_driver portman_parport_driver = { - .name = "portman2x4", - .attach = snd_portman_attach, - .detach = snd_portman_detach + .name = "portman2x4", + .probe = snd_portman_dev_probe, + .match_port = snd_portman_attach, + .detach = snd_portman_detach, + .devmodel = true, }; /********************************************************************* @@ -736,6 +722,12 @@ static int snd_portman_probe(struct platform_device *pdev) struct snd_card *card = NULL; struct portman *pm = NULL; int err; + struct pardev_cb portman_cb = { + .preempt = NULL, + .wakeup = NULL, + .irq_func = snd_portman_interrupt, /* ISR */ + .flags = PARPORT_DEV_EXCL, /* flags */ + }; p = platform_get_drvdata(pdev); platform_set_drvdata(pdev, NULL); @@ -745,9 +737,6 @@ static int snd_portman_probe(struct platform_device *pdev) if (!enable[dev]) return -ENOENT; - if ((err = snd_portman_probe_port(p)) < 0) - return err; - err = snd_card_new(&pdev->dev, index[dev], id[dev], THIS_MODULE, 0, &card); if (err < 0) { @@ -759,23 +748,33 @@ static int snd_portman_probe(struct platform_device *pdev) sprintf(card->longname, "%s at 0x%lx, irq %i", card->shortname, p->base, p->irq); - pardev = parport_register_device(p, /* port */ - DRIVER_NAME, /* name */ - NULL, /* preempt */ - NULL, /* wakeup */ - snd_portman_interrupt, /* ISR */ - PARPORT_DEV_EXCL, /* flags */ - (void *)card); /* private */ + portman_cb.private = card; /* private */ + pardev = parport_register_dev_model(p, /* port */ + DRIVER_NAME, /* name */ + &portman_cb, /* callbacks */ + pdev->id); /* device number */ if (pardev == NULL) { snd_printd("Cannot register pardevice\n"); err = -EIO; goto __err; } + if (parport_claim(pardev)) { + err = -EIO; + goto free_pardev; + } + + err = portman_probe(p); + parport_release(pardev); + + if (err) { + err = -EIO; + goto free_pardev; + } + if ((err = portman_create(card, pardev, &pm)) < 0) { snd_printd("Cannot create main component\n"); - parport_unregister_device(pardev); - goto __err; + goto free_pardev; } card->private_data = pm; card->private_free = snd_portman_card_private_free; @@ -808,6 +807,8 @@ static int snd_portman_probe(struct platform_device *pdev) snd_printk(KERN_INFO "Portman 2x4 on 0x%lx\n", p->base); return 0; +free_pardev: + parport_unregister_device(pardev); __err: snd_card_free(card); return err; -- 1.9.1

2 1

Re: [alsa-devel] ASoC: hdac_hdmi: Add jack reporting
by Dan Carpenter 17 Feb '16

17 Feb '16

Hello Jeeja KP, This is a semi-automatic email about new static checker warnings. The patch 4a3478debf36: "ASoC: hdac_hdmi: Add jack reporting" from Feb 12, 2016, leads to the following Smatch complaint: sound/soc/codecs/hdac_hdmi.c:971 hdac_hdmi_present_sense() warn: variable dereferenced before check 'edev' (see line 967) sound/soc/codecs/hdac_hdmi.c 966 struct hdac_ext_device *edev = pin->edev; 967 struct hdac_hdmi_priv *hdmi = edev->private_data; ^^^^^^^^^^^^^^^^^^ Patch introduces a new dereference. 968 struct hdac_hdmi_pcm *pcm; 969 int val; 970 971 if (!edev) ^^^^^ Existing code assumed that edev could be NULL. 972 return; 973 regards, dan carpenter

1 0

[alsa-devel] [PATCH v2] sound: hdmi: avoid dereferencing uninitialized 'jack' pointer
by Arnd Bergmann 16 Feb '16

16 Feb '16

When CONFIG_SND_JACK is disabled, the hdmi driver tries to create a new output jack structure and dereferences it even though the pointer is never assigned: sound/pci/hda/patch_hdmi.c: In function 'generic_hdmi_build_jack': sound/pci/hda/patch_hdmi.c:2534:30: error: 'jack' may be used uninitialized in this function [-Werror=maybe-uninitialized] sound/pci/hda/patch_hdmi.c:2526:19: note: 'jack' was declared here This makes snd_jack_new() return an error when SND_JACK is disabled, forcing all users to handle errors gracefully and avoiding the problem in all callers that correctly check the return code. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> Fixes: 788d441a164c ("ALSA: hda - Use component ops for i915 HDMI/DP audio jack handling") --- include/sound/jack.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/sound/jack.h b/include/sound/jack.h index 23bede121c78..1e84a2e413f8 100644 --- a/include/sound/jack.h +++ b/include/sound/jack.h @@ -99,7 +99,7 @@ void snd_jack_report(struct snd_jack *jack, int status); static inline int snd_jack_new(struct snd_card *card, const char *id, int type, struct snd_jack **jack, bool initial_kctl, bool phantom_jack) { - return 0; + return -ENXIO; } static inline int snd_jack_add_new_kctl(struct snd_jack *jack, const char * name, int mask) -- 2.7.0

1 0

[alsa-devel] [RFD] Add hw_params support for hostless stream BE DAIs
by Jeeja KP 16 Feb '16

16 Feb '16

We have no mechanism to configure hw_params for DAIs which are hostless. Like a loop or DAIs connected to internal sinks/sources. Problem Statement: During a BE-BE loop of DSP or a SRC->SINK path, we cannot program hw_params. There are no hw_params from user as these are hostless. This scenario can happens in below 2 cases: Case 1: BE-BE loop aka hostless stream through SoC DSP Hostless stream can be defined by BE to BE connection and in this case the path is enabled or disabled by the state of the DAPM graph. This usually means there is a mixer control that can be used to connect or disconnect the path between both DAIs. Example: |--------------/----------------| | | | | codec out modem_in | | | | ssp0_TX ssp1_RX | | | | AIFI_Playback dummy_capture In the above case (SSP0,codec playback,SSp1 dai needs to be configured and turned on with the selected hw_params). Case 2: SoC Internal Sink or Source Example: WOV SINK (DAPM Sink) | | | Switch | | w1 | dmic rx (BE dai widget) | Capture(codec dai widget) | DMIC AIF | DMic | Soc DMic (MIC Widget) (SRC) In the above case BE (dmic RX) dai hw_params needs to applied. Approach: 1. Allow params to be defined for other BE dai link also. this currently applicable only for codec_codec link. 2. when params is defined for BE dai link, create params kcontrols and associate it with the dai widgets. this will allow params to be selected via Kcontrol for each dai defined in the dai link. 3. Before powering on the dai widget and if the dai is not powered with the stream event, then dai_ops(hw_params) for the dai widget will be called.This will apply the selected hw_params. 4. with the above, fix_up can be removed and can use .params to select the parameter. Core Changes: 1. params definition needs to changed, currently this is defined to used only for codec codec link. define new flag to identifying codec codec link. 2. if params is defined for any BE dai link, then create kcontrol for each dai defined in the dai_link and associated the kcontrol to dai widget. 3. In the powering sequence check if the dai widget and if the event is not a stream event, SND_SOC_DAPM_STREAM_NOP , then call dai ops with the selected params. This will apply the hw_params for dai. 1. params definition: - Add new flag in struct snd_soc_dai_link. - Based on this flag create, the codec codec link instead of params struct snd_soc_dai_link { const struct snd_soc_pcm_stream *params; unsigned int num_params; + /* flag to create codec codec based on the flag*/ + unsigned int codec_link:1; + unsigned int dai_fmt; /* format to set on init */ enum snd_soc_dpcm_trigger trigger[2]; /* trigger type for DPCM */ - creation of dai link based on the codec_link flag static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order) } } else { - if (!dai_link->params) { + if (!dai_link->codec_link) { /* create the pcm */ ret = soc_new_pcm(rtd, num); if (ret < 0) { 2. when params is defined for BE dai link, create params kcontrols and associate it with the dai widgets. this will allow params to be selected via Kcontrol for each dai defined in the dai link. a. Move the param control creation from snd_soc_dapm_new_pcm and add new API to created kcontrols with the params. +snd_soc_dapm_create_param_control(struct snd_soc_card *card, + const struct snd_soc_pcm_stream *params, + unsigned int num_params) { /* create kcontrol based on the params */ } - modify the snd_soc_dapm_new_pcm to create the param control int snd_soc_dapm_new_pcm(struct snd_soc_card *card, const struct snd_soc_pcm_stream *params, unsigned int num_params, struct snd_soc_dapm_widget *source, struct snd_soc_dapm_widget *sink) { template.kcontrol_news = snd_soc_dapm_create_param_control(card, params, num_params); if (!template.kcontrol_news) { dev_err(card->dev, "ASoC: Failed to create control for %s widget\n", link_name); ret = -ENOMEM; - goto outfree_private_value; + goto outfree_link_name; } b. add new API snd_soc_dapm_new_dai_params() to create kcontrol for dai and associated it to dai. +int snd_soc_dapm_new_dai_params(struct snd_soc_card *card, + const struct snd_soc_pcm_stream *params, + unsigned int num_params, + struct snd_soc_dapm_widget *dai_w) +{ + struct snd_kcontrol_new *kcontrol_news; + + kcontrol_news = snd_soc_dapm_create_param_control(card, params, + num_params); + if (!kcontrol_news) { + dev_err(card->dev, "ASoC: Failed to create control for %s widget\n", + dai_w->name); + return -EINVAL; + } + + dai_w->num_kcontrols = 1; + dai_w->kcontrol_news = kcontrol_news; + + dai_w->params = params; + dai_w->num_params = num_params; + + return 0; + +} + +++ b/include/sound/soc-dapm.h +int snd_soc_dapm_new_dai_params(struct snd_soc_card *card, + const struct snd_soc_pcm_stream *params, + unsigned int num_params, + struct snd_soc_dapm_widget *dai_w); c. if the be dai link has .params defined, call new API snd_soc_dapm_new_dai_params +static int soc_link_be_params_widget(struct snd_soc_card *card, + struct snd_soc_dai *dai, + const struct snd_soc_pcm_stream *params, + unsigned int num_params) +{ + int ret; + struct snd_soc_dapm_widget *w; + + if (!strcmp(dai->name, "snd-soc-dummy")) + return 0; + + if (dai->playback_widget) { + w = dai->playback_widget; + ret = snd_soc_dapm_new_dai_params(card, params, + num_params, w); + + if (ret != 0) { + dev_err(card->dev, + "ASoC: Can't create params widget=%s %d\n", + w->name, ret); + return ret; + } + } + + if (dai->capture_widget) { + w = dai->capture_widget; + ret = snd_soc_dapm_new_dai_params(card, params, + num_params, w); + + if (ret != 0) { + dev_err(card->dev, + "ASoC: Can't create params widget=%s %d\n", + w->name, ret); + return ret; + } + } + + return 0; +} + +static int soc_link_be_params_dai_widgets(struct snd_soc_card *card, + struct snd_soc_dai_link *dai_link, + struct snd_soc_pcm_runtime *rtd) +{ + struct snd_soc_dai *cpu_dai = rtd->cpu_dai; + int ret, i; + + for (i = 0; i < rtd->num_codecs; i++) { + struct snd_soc_dai *codec = rtd->codec_dais[i]; + + ret = soc_link_be_params_widget(card, codec, + dai_link->params, + dai_link->num_params); + + if (!ret) + return ret; + } + + return soc_link_be_params_widget(card, cpu_dai, dai_link->params, + dai_link->num_params); +} + @@ -1651,6 +1714,13 @@ static int soc_probe_link_dais(struct snd_soc_card *card, dai_link->stream_name, ret); return ret; } + if (dai_link->params && dai_link->no_pcm) { + /* create dai link controls */ + ret = soc_link_be_params_dai_widgets(card, + dai_link, rtd); + if (ret) + return ret; + } } else { INIT_DELAYED_WORK(&rtd->delayed_work, codec2codec_close_delayed_work); 3. Applying the hw_params for dai widget --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -1398,9 +1398,64 @@ static void dapm_seq_check_event(struct snd_soc_card * card, } } +static int snd_soc_dai_params(struct snd_soc_dapm_widget *w, int event) +{ + struct snd_soc_dai *dai; + const struct snd_soc_pcm_stream *config = w->params + w->params_select; + struct snd_pcm_substream substream; + struct snd_pcm_hw_params *params = NULL; + u64 fmt; + int ret = 0; + + if (WARN_ON(!config)) + return -EINVAL; + + dai = w->priv; + + if (config->formats) { + fmt = ffs(config->formats) - 1; + } else { + dev_warn(w->dapm->dev, "ASoC: Invalid format %llx specified\n", + config->formats); + fmt = 0; + } + + /* Currently very limited parameter selection */ + params = kzalloc(sizeof(*params), GFP_KERNEL); + if (!params) { + ret = -ENOMEM; + goto out; + } + snd_mask_set(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT), fmt); + + hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE)->min = + config->rate_min; + hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE)->max = + config->rate_max; + + hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS)->min + = config->channels_min; + hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS)->max + = config->channels_max; + + memset(&substream, 0, sizeof(substream)); + if (w->id == snd_soc_dapm_dai_in) + substream.stream = SNDRV_PCM_STREAM_CAPTURE; + else + substream.stream = SNDRV_PCM_STREAM_PLAYBACK; + + ret = soc_dai_hw_params(&substream, params, dai); + if (ret < 0) + goto out; +out: + kfree(params); + return ret; +} + /* Apply the coalesced changes from a DAPM sequence */ static void dapm_seq_run_coalesced(struct snd_soc_card *card, - struct list_head *pending) + struct list_head *pending, + int event) { struct snd_soc_dapm_context *dapm; struct snd_soc_dapm_widget *w; @@ -1413,6 +1468,14 @@ static void dapm_seq_run_coalesced(struct snd_soc_card *card, dapm = w->dapm; list_for_each_entry(w, pending, power_list) { + if ((event == SND_SOC_DAPM_STREAM_NOP) && + ((w->id == snd_soc_dapm_dai_out) || + (w->id == snd_soc_dapm_dai_in))) { + snd_soc_dai_params(w, SND_SOC_DAPM_PRE_PMU); + } + } + + list_for_each_entry(w, pending, power_list) { WARN_ON(reg != w->reg || dapm != w->dapm); w->power = w->new_power; @@ -1447,6 +1510,13 @@ static void dapm_seq_run_coalesced(struct snd_soc_card *card, dapm_seq_check_event(card, w, SND_SOC_DAPM_POST_PMU); dapm_seq_check_event(card, w, SND_SOC_DAPM_POST_PMD); } + list_for_each_entry(w, pending, power_list) { + if ((event == SND_SOC_DAPM_STREAM_NOP) && + ((w->id == snd_soc_dapm_dai_out) || + (w->id == snd_soc_dapm_dai_in))) { + snd_soc_dai_params(w, SND_SOC_DAPM_POST_PMD); + } + } } /* Apply a DAPM power sequence. @@ -1482,7 +1552,7 @@ static void dapm_seq_run(struct snd_soc_card *card, if (sort[w->id] != cur_sort || w->reg != cur_reg || w->dapm != cur_dapm || w->subseq != cur_subseq) { if (!list_empty(&pending)) - dapm_seq_run_coalesced(card, &pending); + dapm_seq_run_coalesced(card, &pending, event); if (cur_dapm && cur_dapm->seq_notifier) { for (i = 0; i < ARRAY_SIZE(dapm_up_seq); i++) @@ -1545,7 +1615,7 @@ static void dapm_seq_run(struct snd_soc_card *card, } if (!list_empty(&pending)) - dapm_seq_run_coalesced(card, &pending); + dapm_seq_run_coalesced(card, &pending, event); if (cur_dapm && cur_dapm->seq_notifier) { for (i = 0; i < ARRAY_SIZE(dapm_up_seq); i++) -- 1.7.9.5 Comments welcome, based on discussion we will send patches. --Jeeja --

1 0

[alsa-devel] sound: list corruption in delete_and_unsubscribe_port
by Dmitry Vyukov 16 Feb '16

16 Feb '16

Hello, Here is a new one on 18558cae0272f8fd9647e69d3fec1565a7949865 (4.5-rc4). But need to note that sound become much more stable, I've seen only 2 of these over night. The following program causes list corruption: ------------[ cut here ]------------ WARNING: CPU: 2 PID: 12546 at lib/list_debug.c:62 __list_del_entry+0x10b/0x1e0() list_del corruption, ffff880063512388->next is LIST_POISON1 (dead000000000100) Modules linked in: CPU: 2 PID: 12546 Comm: a.out Not tainted 4.5.0-rc4+ #328 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011 ffffffff87b05080 ffff8800608b7a48 ffffffff82be46cf ffffffff81477fb8 fffffbfff0f60a10 ffff8800608b7ab8 ffff8800637d97c0 ffffffff86ad3780 0000000000000009 000000000000003e ffff8800608b7a88 ffffffff81355139 Call Trace: [<ffffffff81355249>] warn_slowpath_fmt+0xa9/0xd0 kernel/panic.c:494 [<ffffffff82c4c36b>] __list_del_entry+0x10b/0x1e0 lib/list_debug.c:60 [<ffffffff82c4c44d>] list_del+0xd/0x70 lib/list_debug.c:86 [<ffffffff852c38e3>] delete_and_unsubscribe_port+0x1e3/0x2f0 sound/core/seq/seq_ports.c:545 [<ffffffff852c43fa>] clear_subscriber_list+0x15a/0x260 sound/core/seq/seq_ports.c:250 [<ffffffff852c456a>] port_delete+0x6a/0x1c0 sound/core/seq/seq_ports.c:266 [<ffffffff852c5242>] snd_seq_delete_all_ports+0x242/0x350 sound/core/seq/seq_ports.c:330 [<ffffffff852ae1cf>] seq_free_client1+0x2f/0x290 sound/core/seq/seq_clientmgr.c:272 [<ffffffff852ae495>] seq_free_client+0x65/0x160 sound/core/seq/seq_clientmgr.c:299 [<ffffffff852b118d>] snd_seq_release+0x4d/0xb0 sound/core/seq/seq_clientmgr.c:380 [<ffffffff817c3256>] __fput+0x236/0x780 fs/file_table.c:208 [<ffffffff817c3825>] ____fput+0x15/0x20 fs/file_table.c:244 [<ffffffff813b3100>] task_work_run+0x170/0x210 kernel/task_work.c:115 [< inline >] tracehook_notify_resume include/linux/tracehook.h:191 [<ffffffff810066b1>] exit_to_usermode_loop+0x1d1/0x210 arch/x86/entry/common.c:251 [< inline >] prepare_exit_to_usermode arch/x86/entry/common.c:282 [<ffffffff810084ea>] syscall_return_slowpath+0x2ba/0x340 arch/x86/entry/common.c:344 [<ffffffff866626e2>] int_ret_from_sys_call+0x25/0x9f arch/x86/entry/entry_64.S:281 ---[ end trace 4cad985f706f8ace ]--- ------------[ cut here ]------------ // autogenerated by syzkaller (http://github.com/google/syzkaller) #include <pthread.h> #include <stdint.h> #include <string.h> #include <sys/syscall.h> #include <unistd.h> long r[143]; void* thr(void* arg) { switch ((long)arg) { case 0: syscall(SYS_mmap, 0x20000000ul, 0x40000ul, 0x3ul, 0x32ul, 0xfffffffffffffffful, 0x0ul); break; case 1: r[2] = syscall(SYS_open, "/dev/snd/seq", 0x400ul, 0, 0, 0); break; case 2: *(uint8_t*)0x2000df50 = (uint8_t)0xffffffffffffff80; *(uint8_t*)0x2000df51 = (uint8_t)0x1; *(uint8_t*)0x2000df52 = (uint8_t)0xfff; *(uint8_t*)0x2000df53 = (uint8_t)0xb0; *(uint8_t*)0x2000df54 = (uint8_t)0x401; *(uint8_t*)0x2000df55 = (uint8_t)0x7; *(uint8_t*)0x2000df56 = (uint8_t)0x7; *(uint8_t*)0x2000df57 = (uint8_t)0x0; *(uint8_t*)0x2000df58 = (uint8_t)0x1; *(uint8_t*)0x2000df59 = (uint8_t)0x401; *(uint8_t*)0x2000df5a = (uint8_t)0xffffffffffff0001; *(uint8_t*)0x2000df5b = (uint8_t)0x5; *(uint8_t*)0x2000df5c = (uint8_t)0x6; *(uint8_t*)0x2000df5d = (uint8_t)0x0; *(uint8_t*)0x2000df5e = (uint8_t)0xffff; *(uint8_t*)0x2000df5f = (uint8_t)0x3; *(uint8_t*)0x2000df60 = (uint8_t)0x0; *(uint8_t*)0x2000df61 = (uint8_t)0xffffffffffffffc0; *(uint8_t*)0x2000df62 = (uint8_t)0x6; *(uint8_t*)0x2000df63 = (uint8_t)0xfff; *(uint8_t*)0x2000df64 = (uint8_t)0x624c; *(uint8_t*)0x2000df65 = (uint8_t)0x53; *(uint8_t*)0x2000df66 = (uint8_t)0x0; *(uint8_t*)0x2000df67 = (uint8_t)0xfffffffffffffffc; *(uint8_t*)0x2000df68 = (uint8_t)0x3f; *(uint8_t*)0x2000df69 = (uint8_t)0x2; *(uint8_t*)0x2000df6a = (uint8_t)0x4; *(uint8_t*)0x2000df6b = (uint8_t)0x401; *(uint8_t*)0x2000df6c = (uint8_t)0x100000000; *(uint8_t*)0x2000df6d = (uint8_t)0x5; *(uint8_t*)0x2000df6e = (uint8_t)0x1; *(uint8_t*)0x2000df6f = (uint8_t)0x9; *(uint8_t*)0x2000df70 = (uint8_t)0x40; *(uint8_t*)0x2000df71 = (uint8_t)0xfff; *(uint8_t*)0x2000df72 = (uint8_t)0x6; *(uint8_t*)0x2000df73 = (uint8_t)0xffffffffffffff2b; *(uint8_t*)0x2000df74 = (uint8_t)0x1f; *(uint8_t*)0x2000df75 = (uint8_t)0x2; *(uint8_t*)0x2000df76 = (uint8_t)0x4; *(uint8_t*)0x2000df77 = (uint8_t)0x68; *(uint8_t*)0x2000df78 = (uint8_t)0x9c33; *(uint8_t*)0x2000df79 = (uint8_t)0x80; *(uint8_t*)0x2000df7a = (uint8_t)0x3; *(uint8_t*)0x2000df7b = (uint8_t)0x100; *(uint8_t*)0x2000df7c = (uint8_t)0xc1b1; *(uint8_t*)0x2000df7d = (uint8_t)0x3; *(uint8_t*)0x2000df7e = (uint8_t)0x0; *(uint8_t*)0x2000df7f = (uint8_t)0x8; *(uint8_t*)0x2000df80 = (uint8_t)0x3; *(uint8_t*)0x2000df81 = (uint8_t)0x8; *(uint8_t*)0x2000df82 = (uint8_t)0x8; *(uint8_t*)0x2000df83 = (uint8_t)0x5d; *(uint8_t*)0x2000df84 = (uint8_t)0x1; *(uint8_t*)0x2000df85 = (uint8_t)0x9; *(uint8_t*)0x2000df86 = (uint8_t)0x1; *(uint8_t*)0x2000df87 = (uint8_t)0x41; *(uint8_t*)0x2000df88 = (uint8_t)0x3; *(uint8_t*)0x2000df89 = (uint8_t)0x6; *(uint8_t*)0x2000df8a = (uint8_t)0x3f; *(uint8_t*)0x2000df8b = (uint8_t)0x3; *(uint8_t*)0x2000df8c = (uint8_t)0x9; *(uint8_t*)0x2000df8d = (uint8_t)0xffffffffffffff01; *(uint8_t*)0x2000df8e = (uint8_t)0x0; *(uint8_t*)0x2000df8f = (uint8_t)0x6; *(uint8_t*)0x2000df90 = (uint8_t)0xe9c; *(uint8_t*)0x2000df91 = (uint8_t)0x0; *(uint32_t*)0x2000df94 = (uint32_t)0x7b; *(uint32_t*)0x2000df98 = (uint32_t)0x1002; *(uint32_t*)0x2000df9c = (uint32_t)0x9; *(uint32_t*)0x2000dfa0 = (uint32_t)0x1000; *(uint32_t*)0x2000dfa4 = (uint32_t)0x80; *(uint32_t*)0x2000dfa8 = (uint32_t)0x10000; *(uint32_t*)0x2000dfac = (uint32_t)0x8; *(uint64_t*)0x2000dfb0 = (uint64_t)0x0; *(uint32_t*)0x2000dfb8 = (uint32_t)0x3; *(uint32_t*)0x2000dfbc = (uint32_t)0x39; *(uint8_t*)0x2000dfc0 = (uint8_t)0x0; *(uint8_t*)0x2000dfc1 = (uint8_t)0x0; *(uint8_t*)0x2000dfc2 = (uint8_t)0x0; *(uint8_t*)0x2000dfc3 = (uint8_t)0x0; *(uint8_t*)0x2000dfc4 = (uint8_t)0x0; *(uint8_t*)0x2000dfc5 = (uint8_t)0x0; *(uint8_t*)0x2000dfc6 = (uint8_t)0x0; *(uint8_t*)0x2000dfc7 = (uint8_t)0x0; *(uint8_t*)0x2000dfc8 = (uint8_t)0x0; *(uint8_t*)0x2000dfc9 = (uint8_t)0x0; *(uint8_t*)0x2000dfca = (uint8_t)0x0; *(uint8_t*)0x2000dfcb = (uint8_t)0x0; *(uint8_t*)0x2000dfcc = (uint8_t)0x0; *(uint8_t*)0x2000dfcd = (uint8_t)0x0; *(uint8_t*)0x2000dfce = (uint8_t)0x0; *(uint8_t*)0x2000dfcf = (uint8_t)0x0; *(uint8_t*)0x2000dfd0 = (uint8_t)0x0; *(uint8_t*)0x2000dfd1 = (uint8_t)0x0; *(uint8_t*)0x2000dfd2 = (uint8_t)0x0; *(uint8_t*)0x2000dfd3 = (uint8_t)0x0; *(uint8_t*)0x2000dfd4 = (uint8_t)0x0; *(uint8_t*)0x2000dfd5 = (uint8_t)0x0; *(uint8_t*)0x2000dfd6 = (uint8_t)0x0; *(uint8_t*)0x2000dfd7 = (uint8_t)0x0; *(uint8_t*)0x2000dfd8 = (uint8_t)0x0; *(uint8_t*)0x2000dfd9 = (uint8_t)0x0; *(uint8_t*)0x2000dfda = (uint8_t)0x0; *(uint8_t*)0x2000dfdb = (uint8_t)0x0; *(uint8_t*)0x2000dfdc = (uint8_t)0x0; *(uint8_t*)0x2000dfdd = (uint8_t)0x0; *(uint8_t*)0x2000dfde = (uint8_t)0x0; *(uint8_t*)0x2000dfdf = (uint8_t)0x0; *(uint8_t*)0x2000dfe0 = (uint8_t)0x0; *(uint8_t*)0x2000dfe1 = (uint8_t)0x0; *(uint8_t*)0x2000dfe2 = (uint8_t)0x0; *(uint8_t*)0x2000dfe3 = (uint8_t)0x0; *(uint8_t*)0x2000dfe4 = (uint8_t)0x0; *(uint8_t*)0x2000dfe5 = (uint8_t)0x0; *(uint8_t*)0x2000dfe6 = (uint8_t)0x0; *(uint8_t*)0x2000dfe7 = (uint8_t)0x0; *(uint8_t*)0x2000dfe8 = (uint8_t)0x0; *(uint8_t*)0x2000dfe9 = (uint8_t)0x0; *(uint8_t*)0x2000dfea = (uint8_t)0x0; *(uint8_t*)0x2000dfeb = (uint8_t)0x0; *(uint8_t*)0x2000dfec = (uint8_t)0x0; *(uint8_t*)0x2000dfed = (uint8_t)0x0; *(uint8_t*)0x2000dfee = (uint8_t)0x0; *(uint8_t*)0x2000dfef = (uint8_t)0x0; *(uint8_t*)0x2000dff0 = (uint8_t)0x0; *(uint8_t*)0x2000dff1 = (uint8_t)0x0; *(uint8_t*)0x2000dff2 = (uint8_t)0x0; *(uint8_t*)0x2000dff3 = (uint8_t)0x0; *(uint8_t*)0x2000dff4 = (uint8_t)0x0; *(uint8_t*)0x2000dff5 = (uint8_t)0x0; *(uint8_t*)0x2000dff6 = (uint8_t)0x0; *(uint8_t*)0x2000dff7 = (uint8_t)0x0; *(uint8_t*)0x2000dff8 = (uint8_t)0x0; *(uint8_t*)0x2000dff9 = (uint8_t)0x0; *(uint8_t*)0x2000dffa = (uint8_t)0x0; r[138] = syscall(SYS_ioctl, r[2], 0xc0a85320ul, 0x2000df50ul, 0, 0, 0); break; case 3: r[139] = syscall(SYS_read, r[2], 0x20025000ul, 0x75ul, 0, 0, 0); break; case 4: r[140] = syscall(SYS_close, r[2], 0, 0, 0, 0, 0); break; case 5: memcpy((void*)0x20022000, "\x2f\x64\x65\x76\x2f\x73\x65\x71\x75\x65\x6e\x63\x65\x72", 14); syscall(SYS_open, "/dev/sequencer", 0x4000ul, 0, 0, 0); break; } return 0; } int main() { long i; pthread_t th[6]; srand(getpid()); memset(r, -1, sizeof(r)); for (i = 0; i < 6; i++) { pthread_create(&th[i], 0, thr, (void*)i); usleep(10000); } for (i = 0; i < 6; i++) { pthread_create(&th[i], 0, thr, (void*)i); if (rand() % 2 == 0) usleep(rand() % 10000); } usleep(100000); return 0; }

2 3