March 2013 - Alsa-devel - mailman.alsa-project.org

Re: [alsa-devel] [PATCH -next] ASoC: tas5086: use module_i2c_driver to simplify the code
by Mark Brown 12 Mar '13

12 Mar '13

On Tue, Mar 12, 2013 at 09:36:24PM +0800, Wei Yongjun wrote: > From: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn> > > Use the module_i2c_driver() macro to make the code smaller > and a bit simpler. Applied, thanks.

1 0

[alsa-devel] [PATCH] hda-emu: stream tag should always be non-zero
by David Henningsson 12 Mar '13

12 Mar '13

Sending zero as stream tag is discouraged, because it means no data, and the real code doesn't do that. Avoid it here too. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- hda-emu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hda-emu.c b/hda-emu.c index c98a3ea..13756bb 100644 --- a/hda-emu.c +++ b/hda-emu.c @@ -760,7 +760,7 @@ void hda_test_pcm(int id, int op, int subid, } hda_log(HDA_LOG_INFO, "PCM format_val = 0x%x\n", format_val); #ifdef HAVE_COMMON_PREPARE - err = snd_hda_codec_prepare(_codec, hinfo, subid, + err = snd_hda_codec_prepare(_codec, hinfo, subid + 1, format_val, substream); #else err = hinfo->ops.prepare(hinfo, _codec, 1, format_val, substream); -- 1.7.9.5

2 1

[alsa-devel] [PATCH] hda-emu: Fix typo in HAVE_COMMON_PREPARE
by David Henningsson 12 Mar '13

12 Mar '13

This typo caused snd_hda_codec_prepare never to be executed by hda-emu. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 4b20f50..01a3a16 100644 --- a/configure.ac +++ b/configure.ac @@ -501,7 +501,7 @@ if grep -q snd_hda_codec_prepare hda/hda_codec.h; then else AC_MSG_RESULT(no) fi -if test "$HAVE_COMMON_PREAPRE" = "yes"; then +if test "$HAVE_COMMON_PREPARE" = "yes"; then AC_DEFINE(HAVE_COMMON_PREPARE) fi -- 1.7.9.5

2 1

[alsa-devel] [PATCH] Revert "ALSA: hda - Remove limit of widget connections"
by David Henningsson 12 Mar '13

12 Mar '13

This reverts commit 4eea30914facd2c99061cd70e5b05d3c76c743a2. The commit causes an error with node ranges: In my case, connection list length is 3, with a connection list read of 0x1e9915: a total of 6 nids (0x15, 0x16, 0x17, 0x18, 0x19, 0x1e). Since the new code makes us allocate only 3 nids to the array sent to get_raw_connections, the function fails. --- sound/pci/hda/hda_codec.c | 62 +++++++++++++++----------------------------- sound/pci/hda/hda_codec.h | 4 ++- sound/pci/hda/hda_proc.c | 20 +++----------- sound/pci/hda/patch_hdmi.c | 3 --- 4 files changed, 28 insertions(+), 61 deletions(-) diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 97c68dd..e5e8549 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -382,23 +382,13 @@ static void remove_conn_list(struct hda_codec *codec) /* read the connection and add to the cache */ static int read_and_add_raw_conns(struct hda_codec *codec, hda_nid_t nid) { - hda_nid_t list[32]; - hda_nid_t *result = list; + hda_nid_t list[HDA_MAX_CONNECTIONS]; int len; len = snd_hda_get_raw_connections(codec, nid, list, ARRAY_SIZE(list)); - if (len == -ENOSPC) { - len = snd_hda_get_num_raw_conns(codec, nid); - result = kmalloc(sizeof(hda_nid_t) * len, GFP_KERNEL); - if (!result) - return -ENOMEM; - len = snd_hda_get_raw_connections(codec, nid, result, len); - } - if (len >= 0) - len = snd_hda_override_conn_list(codec, nid, len, result); - if (result != list) - kfree(result); - return len; + if (len < 0) + return len; + return snd_hda_override_conn_list(codec, nid, len, list); } /** @@ -476,27 +466,6 @@ int snd_hda_get_connections(struct hda_codec *codec, hda_nid_t nid, } EXPORT_SYMBOL_HDA(snd_hda_get_connections); -/* return CONNLIST_LEN parameter of the given widget */ -static unsigned int get_num_conns(struct hda_codec *codec, hda_nid_t nid) -{ - unsigned int wcaps = get_wcaps(codec, nid); - unsigned int parm; - - if (!(wcaps & AC_WCAP_CONN_LIST) && - get_wcaps_type(wcaps) != AC_WID_VOL_KNB) - return 0; - - parm = snd_hda_param_read(codec, nid, AC_PAR_CONNLIST_LEN); - if (parm == -1) - parm = 0; - return parm; -} - -int snd_hda_get_num_raw_conns(struct hda_codec *codec, hda_nid_t nid) -{ - return get_num_conns(codec, nid) & AC_CLIST_LENGTH; -} - /** * snd_hda_get_raw_connections - copy connection list without cache * @codec: the HDA codec @@ -514,16 +483,19 @@ int snd_hda_get_raw_connections(struct hda_codec *codec, hda_nid_t nid, unsigned int parm; int i, conn_len, conns; unsigned int shift, num_elems, mask; + unsigned int wcaps; hda_nid_t prev_nid; int null_count = 0; if (snd_BUG_ON(!conn_list || max_conns <= 0)) return -EINVAL; - parm = get_num_conns(codec, nid); - if (!parm) + wcaps = get_wcaps(codec, nid); + if (!(wcaps & AC_WCAP_CONN_LIST) && + get_wcaps_type(wcaps) != AC_WID_VOL_KNB) return 0; + parm = snd_hda_param_read(codec, nid, AC_PAR_CONNLIST_LEN); if (parm & AC_CLIST_LONG) { /* long form */ shift = 16; @@ -580,13 +552,21 @@ int snd_hda_get_raw_connections(struct hda_codec *codec, hda_nid_t nid, continue; } for (n = prev_nid + 1; n <= val; n++) { - if (conns >= max_conns) - return -ENOSPC; + if (conns >= max_conns) { + snd_printk(KERN_ERR "hda_codec: " + "Too many connections %d for NID 0x%x\n", + conns, nid); + return -EINVAL; + } conn_list[conns++] = n; } } else { - if (conns >= max_conns) - return -ENOSPC; + if (conns >= max_conns) { + snd_printk(KERN_ERR "hda_codec: " + "Too many connections %d for NID 0x%x\n", + conns, nid); + return -EINVAL; + } conn_list[conns++] = val; } prev_nid = val; diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index 23ca172..246ed53 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h @@ -551,6 +551,9 @@ enum { AC_JACK_PORT_BOTH, }; +/* max. connections to a widget */ +#define HDA_MAX_CONNECTIONS 32 + /* max. codec address */ #define HDA_MAX_CODEC_ADDRESS 0x0f @@ -957,7 +960,6 @@ snd_hda_get_num_conns(struct hda_codec *codec, hda_nid_t nid) { return snd_hda_get_connections(codec, nid, NULL, 0); } -int snd_hda_get_num_raw_conns(struct hda_codec *codec, hda_nid_t nid); int snd_hda_get_raw_connections(struct hda_codec *codec, hda_nid_t nid, hda_nid_t *conn_list, int max_conns); int snd_hda_get_conn_list(struct hda_codec *codec, hda_nid_t nid, diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c index 0fee8fa..5e02f26 100644 --- a/sound/pci/hda/hda_proc.c +++ b/sound/pci/hda/hda_proc.c @@ -22,7 +22,6 @@ */ #include <linux/init.h> -#include <linux/slab.h> #include <sound/core.h> #include "hda_codec.h" #include "hda_local.h" @@ -624,7 +623,7 @@ static void print_codec_info(struct snd_info_entry *entry, snd_hda_param_read(codec, nid, AC_PAR_AUDIO_WIDGET_CAP); unsigned int wid_type = get_wcaps_type(wid_caps); - hda_nid_t *conn = NULL; + hda_nid_t conn[HDA_MAX_CONNECTIONS]; int conn_len = 0; snd_iprintf(buffer, "Node 0x%02x [%s] wcaps 0x%x:", nid, @@ -661,18 +660,9 @@ static void print_codec_info(struct snd_info_entry *entry, if (wid_type == AC_WID_VOL_KNB) wid_caps |= AC_WCAP_CONN_LIST; - if (wid_caps & AC_WCAP_CONN_LIST) { - conn_len = snd_hda_get_num_raw_conns(codec, nid); - if (conn_len > 0) { - conn = kmalloc(sizeof(hda_nid_t) * conn_len, - GFP_KERNEL); - if (!conn) - return; - if (snd_hda_get_raw_connections(codec, nid, conn, - conn_len) < 0) - conn_len = 0; - } - } + if (wid_caps & AC_WCAP_CONN_LIST) + conn_len = snd_hda_get_raw_connections(codec, nid, conn, + HDA_MAX_CONNECTIONS); if (wid_caps & AC_WCAP_IN_AMP) { snd_iprintf(buffer, " Amp-In caps: "); @@ -745,8 +735,6 @@ static void print_codec_info(struct snd_info_entry *entry, if (codec->proc_widget_hook) codec->proc_widget_hook(buffer, codec, nid); - - kfree(conn); } snd_hda_power_down(codec); } diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 78e1827..d24af4a 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -64,9 +64,6 @@ struct hdmi_spec_per_cvt { unsigned int maxbps; }; -/* max. connections to a widget */ -#define HDA_MAX_CONNECTIONS 32 - struct hdmi_spec_per_pin { hda_nid_t pin_nid; int num_mux_nids; -- 1.7.9.5

2 1

Re: [alsa-devel] [PATCH -next] ASoC: tas5086: use module_i2c_driver to simplify the code
by Daniel Mack 12 Mar '13

12 Mar '13

On 12.03.2013 14:36, Wei Yongjun wrote: > From: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn> > > Use the module_i2c_driver() macro to make the code smaller > and a bit simpler. Thanks for catching this! > Signed-off-by: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn> Acked-by: Daniel Mack <zonque(a)gmail.com> > --- > sound/soc/codecs/tas5086.c | 12 +----------- > 1 file changed, 1 insertion(+), 11 deletions(-) > > diff --git a/sound/soc/codecs/tas5086.c b/sound/soc/codecs/tas5086.c > index 008bea4..40cee84 100644 > --- a/sound/soc/codecs/tas5086.c > +++ b/sound/soc/codecs/tas5086.c > @@ -584,17 +584,7 @@ static struct i2c_driver tas5086_i2c_driver = { > .remove = tas5086_i2c_remove, > }; > > -static int __init tas5086_modinit(void) > -{ > - return i2c_add_driver(&tas5086_i2c_driver); > -} > -module_init(tas5086_modinit); > - > -static void __exit tas5086_modexit(void) > -{ > - i2c_del_driver(&tas5086_i2c_driver); > -} > -module_exit(tas5086_modexit); > +module_i2c_driver(tas5086_i2c_driver); > > MODULE_AUTHOR("Daniel Mack <zonque(a)gmail.com>"); > MODULE_DESCRIPTION("Texas Instruments TAS5086 ALSA SoC Codec Driver"); > >

1 0

[alsa-devel] [PATCH] salsa-lib: define __SALSA_EXPORT_FUNC in version.h
by Mihail Zenkov 12 Mar '13

12 Mar '13

We have to include "global.h" to define __SALSA_EXPORT_FUNC --- salsa-lib-0.1.3/src/version.h.in +++ salsa-lib-0.1.3-1/src/version.h.in @@ -1,6 +1,8 @@ #ifndef __ALSA_VERSION_H #define __ALSA_VERSION_H +#include "global.h" + #define SND_LIB_MAJOR @SND_LIB_MAJOR@ #define SND_LIB_MINOR @SND_LIB_MINOR@ #define SND_LIB_SUBMINOR @SND_LIB_SUBMINOR@

2 2

Re: [alsa-devel] [PATCH] omap: convert to devm_ioremap_resource()
by Peter Ujfalusi 12 Mar '13

12 Mar '13

On 03/11/2013 04:58 PM, Silviu-Mihai Popescu wrote: > Convert all uses of devm_request_and_ioremap() to the newly introduced > devm_ioremap_resource() which provides more consistent error handling. > > devm_ioremap_resource() provides its own error messages so all explicit > error messages can be removed from the failure code paths. Acked-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> > > Signed-off-by: Silviu-Mihai Popescu <silviupopescu1990(a)gmail.com> > --- > sound/soc/omap/omap-dmic.c | 9 +++------ > sound/soc/omap/omap-mcpdm.c | 8 +++----- > 2 files changed, 6 insertions(+), 11 deletions(-) > > diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c > index 77e9e7e..8ebaf11 100644 > --- a/sound/soc/omap/omap-dmic.c > +++ b/sound/soc/omap/omap-dmic.c > @@ -493,12 +493,9 @@ static int asoc_dmic_probe(struct platform_device *pdev) > goto err_put_clk; > } > > - dmic->io_base = devm_request_and_ioremap(&pdev->dev, res); > - if (!dmic->io_base) { > - dev_err(&pdev->dev, "cannot remap\n"); > - ret = -ENOMEM; > - goto err_put_clk; > - } > + dmic->io_base = devm_ioremap_resource(&pdev->dev, res); > + if (IS_ERR(dmic->io_base)) > + return PTR_ERR(dmic->io_base); > > ret = snd_soc_register_dai(&pdev->dev, &omap_dmic_dai); > if (ret) > diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c > index 079f277..ddfcc18 100644 > --- a/sound/soc/omap/omap-mcpdm.c > +++ b/sound/soc/omap/omap-mcpdm.c > @@ -464,11 +464,9 @@ static int asoc_mcpdm_probe(struct platform_device *pdev) > if (res == NULL) > return -ENOMEM; > > - mcpdm->io_base = devm_request_and_ioremap(&pdev->dev, res); > - if (!mcpdm->io_base) { > - dev_err(&pdev->dev, "cannot remap\n"); > - return -ENOMEM; > - } > + mcpdm->io_base = devm_ioremap_resource(&pdev->dev, res); > + if (IS_ERR(mcpdm->io_base)) > + return PTR_ERR(mcpdm->io_base); > > mcpdm->irq = platform_get_irq(pdev, 0); > if (mcpdm->irq < 0) > -- Péter

1 0

Re: [alsa-devel] [PATCH] omap: convert to devm_ioremap_resource()
by Peter Ujfalusi 12 Mar '13

12 Mar '13

On 03/12/2013 09:24 AM, Silviu Popescu wrote: > As far as I can tell from the mails that you have provided, those > patches replace devm_request_mem_region(), followed by devm_ioremap() > with devm_request_and_ioremap(). > What this patch attempts to do is replace devm_request_and_ioremap() > with the newly introduced devm_ioremap_resource(), for the reasons > expressed in the patch body. Ah, true. -- Péter

1 0

[alsa-devel] [PATCH v3] ALSA: usb: Work around CM6631 sample rate change bug
by Torstein Hegge 12 Mar '13

12 Mar '13

The C-Media CM6631 USB-to-S/PDIF receiver doesn't respond to changes in sample rate while the interface is active. Reset the interface after setting the sampling frequency on sample rate changes, to ensure that the sample rate set by snd_usb_init_sample_rate() is used. Otherwise, the device will try to use the sample rate of the previous stream, causing distorted sound on sample rate changes. The reset is performed for all current C-Media UAC V2.0 devices, including CM6610, CM6620 and CM6631, but has only been tested with CM6631. Signed-off-by: Torstein Hegge <hegge(a)resisty.net> --- Changes since v2: - More USB ids covered. - int crate -> int cur_rate - unsigned int previous_rate -> int prev_rate sound/usb/clock.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 46 insertions(+), 4 deletions(-) diff --git a/sound/usb/clock.c b/sound/usb/clock.c index 5e634a2..98c4e26 100644 --- a/sound/usb/clock.c +++ b/sound/usb/clock.c @@ -253,7 +253,7 @@ static int set_sample_rate_v2(struct snd_usb_audio *chip, int iface, { struct usb_device *dev = chip->dev; unsigned char data[4]; - int err, crate; + int err, cur_rate, prev_rate; int clock = snd_usb_clock_find_source(chip, fmt->clock); if (clock < 0) @@ -266,6 +266,18 @@ static int set_sample_rate_v2(struct snd_usb_audio *chip, int iface, return -ENXIO; } + if ((err = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC2_CS_CUR, + USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN, + UAC2_CS_CONTROL_SAM_FREQ << 8, + snd_usb_ctrl_intf(chip) | (clock << 8), + data, sizeof(data))) < 0) { + snd_printk(KERN_WARNING "%d:%d:%d: cannot get freq (v2)\n", + dev->devnum, iface, fmt->altsetting); + return err; + } + + prev_rate = data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24); + data[0] = rate; data[1] = rate >> 8; data[2] = rate >> 16; @@ -290,9 +302,39 @@ static int set_sample_rate_v2(struct snd_usb_audio *chip, int iface, return err; } - crate = data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24); - if (crate != rate) - snd_printd(KERN_WARNING "current rate %d is different from the runtime rate %d\n", crate, rate); + cur_rate = data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24); + if (cur_rate != rate) { + snd_printd(KERN_WARNING + "current rate %d is different from the runtime rate %d\n", + cur_rate, rate); + } + + /* Some devices doesn't respond to sample rate changes while the + * interface is active. */ + if (cur_rate != prev_rate) { + switch (chip->usb_id) { + /* C-Media CM6610/CM6620/CM6631 */ + case USB_ID(0x054c, 0x06cf): /* Sony */ + case USB_ID(0x0b05, 0x17a8): /* Asus Xonar Essence One */ + case USB_ID(0x0d8c, 0x0301): + case USB_ID(0x0d8c, 0x0302): + case USB_ID(0x0d8c, 0x0304): /* CM6631 (Schiit) */ + case USB_ID(0x0d8c, 0x0305): + case USB_ID(0x0d8c, 0x0306): + case USB_ID(0x0d8c, 0x0309): /* CM6631 */ + case USB_ID(0x0d8c, 0x0310): + case USB_ID(0x0d8c, 0x0311): /* CM6610A */ + case USB_ID(0x0d8c, 0x0312): /* CM6620A */ + case USB_ID(0x0d8c, 0x0313): /* CM6630A */ + case USB_ID(0x0d8c, 0x0314): /* CM6631A */ + case USB_ID(0x0d8c, 0x0315): /* CM6632A */ + case USB_ID(0x0d8c, 0x0319): /* CM6631A */ + case USB_ID(0x200c, 0x1030): /* Reloop */ + usb_set_interface(dev, iface, 0); + usb_set_interface(dev, iface, fmt->altsetting); + break; + } + } return 0; } -- 1.7.10.4

2 3

Re: [alsa-devel] [PATCH] omap: convert to devm_ioremap_resource()
by Peter Ujfalusi 12 Mar '13

12 Mar '13

Hi, On 03/11/2013 04:58 PM, Silviu-Mihai Popescu wrote: > Convert all uses of devm_request_and_ioremap() to the newly introduced > devm_ioremap_resource() which provides more consistent error handling. > > devm_ioremap_resource() provides its own error messages so all explicit > error messages can be removed from the failure code paths. I believe both of the drivers has been patched for this: omap-mcbpdm: http://mailman.alsa-project.org/pipermail/alsa-devel/2013-February/059484.h… http://mailman.alsa-project.org/pipermail/alsa-devel/2013-February/059427.h… omap-dmic: http://mailman.alsa-project.org/pipermail/alsa-devel/2013-February/059485.h… and they should be already queued for next. -- Péter > > Signed-off-by: Silviu-Mihai Popescu <silviupopescu1990(a)gmail.com> > --- > sound/soc/omap/omap-dmic.c | 9 +++------ > sound/soc/omap/omap-mcpdm.c | 8 +++----- > 2 files changed, 6 insertions(+), 11 deletions(-) > > diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c > index 77e9e7e..8ebaf11 100644 > --- a/sound/soc/omap/omap-dmic.c > +++ b/sound/soc/omap/omap-dmic.c > @@ -493,12 +493,9 @@ static int asoc_dmic_probe(struct platform_device *pdev) > goto err_put_clk; > } > > - dmic->io_base = devm_request_and_ioremap(&pdev->dev, res); > - if (!dmic->io_base) { > - dev_err(&pdev->dev, "cannot remap\n"); > - ret = -ENOMEM; > - goto err_put_clk; > - } > + dmic->io_base = devm_ioremap_resource(&pdev->dev, res); > + if (IS_ERR(dmic->io_base)) > + return PTR_ERR(dmic->io_base); > > ret = snd_soc_register_dai(&pdev->dev, &omap_dmic_dai); > if (ret) > diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c > index 079f277..ddfcc18 100644 > --- a/sound/soc/omap/omap-mcpdm.c > +++ b/sound/soc/omap/omap-mcpdm.c > @@ -464,11 +464,9 @@ static int asoc_mcpdm_probe(struct platform_device *pdev) > if (res == NULL) > return -ENOMEM; > > - mcpdm->io_base = devm_request_and_ioremap(&pdev->dev, res); > - if (!mcpdm->io_base) { > - dev_err(&pdev->dev, "cannot remap\n"); > - return -ENOMEM; > - } > + mcpdm->io_base = devm_ioremap_resource(&pdev->dev, res); > + if (IS_ERR(mcpdm->io_base)) > + return PTR_ERR(mcpdm->io_base); > > mcpdm->irq = platform_get_irq(pdev, 0); > if (mcpdm->irq < 0) >

1 0