August 2012 - Alsa-devel - mailman.alsa-project.org

Re: [alsa-devel] [PATCH 0/3] ALSA: snd-usb: Regression fixes for 3.5
by ☈king 31 Aug '12

31 Aug '12

I am having the following symptoms, before and after application of this thread's patches: Given: - An onboard card - A Logitech h390 USB headset - alsa-info of: http://www.alsa-project.org/db/?f=942b5e96b53a667270f895ec5061ca14af0339ee When: - I do: aplay $(locate .wav | grep Front) it outputs: alsa ALSA lib pcm_direct.c:980:(snd1_pcm_direct_initialize_slave) unable to install hw params ALSA lib pcm_dmix.c:1030:(snd_pcm_dmix_open) unable to initialize slave aplay: main:682: audio open error: Broken pipe - I do a Skype "Make a test sound" /var/log/messages streams dozens of these: kernel: cannot submit urb 0, error -28: not enough bandwidth Note that this is a new laptop and headset, so I haven't compared how either works on other setups, such as with other kernels or alsa versions. Any hints? Any further info needed? Thanks! —☈

2 2

[alsa-devel] double dai question and analog paths
by Raffaele Recalcati 31 Aug '12

31 Aug '12

I can play succesfully each of the following substreams: static struct snd_soc_dai_link omap3baia_dai[] = { { .name = "TLV320AIC31", .stream_name = "AIC31", .cpu_dai_name = "omap-mcbsp-dai.3", .codec_dai_name = "tlv320aic3x-hifi", .platform_name = "omap-pcm-audio", .codec_name = "tlv320aic3x-codec.2-0018", .init = omap3baia_tlvaic31_init, .ops = &omap3baia_tlvaic31_ops, }, { .name = "TWL4030", .stream_name = "TWL4030", .cpu_dai_name = "omap-mcbsp-dai.1", .platform_name = "omap-pcm-audio", .codec_dai_name = "twl4030-hifi", .codec_name = "twl4030-codec", .init = omap3baia_twl4030_init, .ops = &omap3baia_twl4030_ops, }, }; I have also some analog connections between TWL4030 and TLV320AIC31 and I'd like to create an automatic audio path (for example from TWL4030 HFL to TLV320AIC31 LINE2L), but I obtain "Failed to add route Virtual Tps to Tlv->LINE2L" static const struct snd_soc_dapm_route audio_map_twl4030[] = { {"Virtual Tps to Tlv", NULL, "HFL"}, /* from tps to tlv */ {"LINE2L", NULL, "Virtual Tps to Tlv"}, /* from tps to tlv */ }; Because LINE2L is obviously defined inside TWL4030 codec. static const struct snd_soc_dapm_widget dapm_widgets_twl4030[] = { SND_SOC_DAPM_OUTPUT("Virtual Tps to Tlv"), }; Is there a clean way to manage this situation? I have also tried without "Virtual Tps to Tlv" but the problem is the same. Thx, Raffaele

1 0

[alsa-devel] [PATCH] ALSA: snd-usb: use list_for_each_safe for endpoint resources
by Pavel Roskin 31 Aug '12

31 Aug '12

snd_usb_endpoint_free() frees the structure that contains its argument. Signed-off-by: Pavel Roskin <proski(a)gnu.org> Cc: stable(a)vger.kernel.org --- sound/usb/card.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/usb/card.c b/sound/usb/card.c index d5b5c33..4a469f0 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -553,7 +553,7 @@ static void snd_usb_audio_disconnect(struct usb_device *dev, struct snd_usb_audio *chip) { struct snd_card *card; - struct list_head *p; + struct list_head *p, *n; if (chip == (void *)-1L) return; @@ -570,7 +570,7 @@ static void snd_usb_audio_disconnect(struct usb_device *dev, snd_usb_stream_disconnect(p); } /* release the endpoint resources */ - list_for_each(p, &chip->ep_list) { + list_for_each_safe(p, n, &chip->ep_list) { snd_usb_endpoint_free(p); } /* release the midi resources */

2 1

Re: [alsa-devel] Logitech USB headset not working in 3.6-rc3
by Daniel Mack 30 Aug '12

30 Aug '12

On 25.08.2012 14:17, Josh Boyer wrote: > On Sat, Aug 25, 2012 at 02:13:58PM +0200, Daniel Mack wrote: >> On 25.08.2012 14:07, Bruno Wolff III wrote: >>> On Sat, Aug 25, 2012 at 14:02:51 +0200, >>> Daniel Mack <zonque(a)gmail.com> wrote: >>>> >>>> Can you revert commit e9ba389c5 ("ALSA: usb-audio: Fix >>>> scheduling-while-atomic bug in PCM capture stream") and see if that >>> >>> I can try that, but it takes a long time to build a new kernel on my >>> old hardware. >>> >>>> helps? If not, can you summarize again which kernels still work for you >>>> and which don't? >>> >>> The latest kernel that works is 3.6.0-0.rc2.git1.2.fc18. The earliest that >>> doesn't work is 3.6.0-0.rc2.git2.1.fc18. >>> >> >> The report you sent doesn't look like it could be caused by e9ba389c5. >> It fixes a kernel Ooops. But as it is the only relevant patch in that >> area, it would be interesting if reverting it fixes anything. > > Yep, agreed. If this revert kernel doesn't work, we're likely down to a > git bisect, Bruno. > >> Btw - thanks a lot for testing -rc kernels, much appreciated! > > Indeed! Could you please try this patch on top of Takashi's? Thanks again! Daniel

2 6

[alsa-devel] [PATCH 04/22] ASoC: Ux500: Move MSP pinctrl setup into the MSP driver
by Lee Jones 30 Aug '12

30 Aug '12

In the initial submission of the MSP driver msp1 and msp3's associated pinctrl mechanism was passed back to platform code using a plat_init() call-back routine, but it has no place in platform code. The MSP driver should set this up for the appropriate ports. Instead we use a use_pinctrl identifier which is passed from platform_data/Device Tree which indicates which ports should use pinctrl. CC: alsa-devel(a)alsa-project.org Signed-off-by: Lee Jones <lee.jones(a)linaro.org> --- arch/arm/mach-ux500/board-mop500-msp.c | 75 +------------------------------- arch/arm/mach-ux500/include/mach/msp.h | 2 - sound/soc/ux500/ux500_msp_i2s.c | 75 +++++++++++++++++++++++++------- sound/soc/ux500/ux500_msp_i2s.h | 2 - 4 files changed, 60 insertions(+), 94 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500-msp.c b/arch/arm/mach-ux500/board-mop500-msp.c index df15646..fc78d5d 100644 --- a/arch/arm/mach-ux500/board-mop500-msp.c +++ b/arch/arm/mach-ux500/board-mop500-msp.c @@ -23,53 +23,6 @@ #include "devices-db8500.h" #include "pins-db8500.h" -/* MSP1/3 Tx/Rx usage protection */ -static DEFINE_SPINLOCK(msp_rxtx_lock); - -/* Reference Count */ -static int msp_rxtx_ref; - -/* Pin modes */ -struct pinctrl *msp1_p; -struct pinctrl_state *msp1_def; -struct pinctrl_state *msp1_sleep; - -int msp13_i2s_init(void) -{ - int retval = 0; - unsigned long flags; - - spin_lock_irqsave(&msp_rxtx_lock, flags); - if (msp_rxtx_ref == 0 && !(IS_ERR(msp1_p) || IS_ERR(msp1_def))) { - retval = pinctrl_select_state(msp1_p, msp1_def); - if (retval) - pr_err("could not set MSP1 defstate\n"); - } - if (!retval) - msp_rxtx_ref++; - spin_unlock_irqrestore(&msp_rxtx_lock, flags); - - return retval; -} - -int msp13_i2s_exit(void) -{ - int retval = 0; - unsigned long flags; - - spin_lock_irqsave(&msp_rxtx_lock, flags); - WARN_ON(!msp_rxtx_ref); - msp_rxtx_ref--; - if (msp_rxtx_ref == 0 && !(IS_ERR(msp1_p) || IS_ERR(msp1_sleep))) { - retval = pinctrl_select_state(msp1_p, msp1_sleep); - if (retval) - pr_err("could not set MSP1 sleepstate\n"); - } - spin_unlock_irqrestore(&msp_rxtx_lock, flags); - - return retval; -} - static struct stedma40_chan_cfg msp0_dma_rx = { .high_priority = true, .dir = STEDMA40_PERIPH_TO_MEM, @@ -132,8 +85,6 @@ static struct msp_i2s_platform_data msp1_platform_data = { .id = MSP_I2S_1, .msp_i2s_dma_rx = NULL, .msp_i2s_dma_tx = &msp1_dma_tx, - .msp_i2s_init = msp13_i2s_init, - .msp_i2s_exit = msp13_i2s_exit, }; static struct stedma40_chan_cfg msp2_dma_rx = { @@ -219,47 +170,23 @@ static struct msp_i2s_platform_data msp3_platform_data = { .id = MSP_I2S_3, .msp_i2s_dma_rx = &msp1_dma_rx, .msp_i2s_dma_tx = NULL, - .msp_i2s_init = msp13_i2s_init, - .msp_i2s_exit = msp13_i2s_exit, }; int mop500_msp_init(struct device *parent) { - struct platform_device *msp1; - pr_info("%s: Register platform-device 'snd-soc-mop500'.\n", __func__); platform_device_register(&snd_soc_mop500); pr_info("Initialize MSP I2S-devices.\n"); db8500_add_msp_i2s(parent, 0, U8500_MSP0_BASE, IRQ_DB8500_MSP0, &msp0_platform_data); - msp1 = db8500_add_msp_i2s(parent, 1, U8500_MSP1_BASE, IRQ_DB8500_MSP1, + db8500_add_msp_i2s(parent, 1, U8500_MSP1_BASE, IRQ_DB8500_MSP1, &msp1_platform_data); db8500_add_msp_i2s(parent, 2, U8500_MSP2_BASE, IRQ_DB8500_MSP2, &msp2_platform_data); db8500_add_msp_i2s(parent, 3, U8500_MSP3_BASE, IRQ_DB8500_MSP1, &msp3_platform_data); - /* Get the pinctrl handle for MSP1 */ - if (msp1) { - msp1_p = pinctrl_get(&msp1->dev); - if (IS_ERR(msp1_p)) - dev_err(&msp1->dev, "could not get MSP1 pinctrl\n"); - else { - msp1_def = pinctrl_lookup_state(msp1_p, - PINCTRL_STATE_DEFAULT); - if (IS_ERR(msp1_def)) { - dev_err(&msp1->dev, - "could not get MSP1 defstate\n"); - } - msp1_sleep = pinctrl_lookup_state(msp1_p, - PINCTRL_STATE_SLEEP); - if (IS_ERR(msp1_sleep)) - dev_err(&msp1->dev, - "could not get MSP1 idlestate\n"); - } - } - pr_info("%s: Register platform-device 'ux500-pcm'\n", __func__); platform_device_register(&ux500_pcm); diff --git a/arch/arm/mach-ux500/include/mach/msp.h b/arch/arm/mach-ux500/include/mach/msp.h index 798be19..3cc7142 100644 --- a/arch/arm/mach-ux500/include/mach/msp.h +++ b/arch/arm/mach-ux500/include/mach/msp.h @@ -22,8 +22,6 @@ struct msp_i2s_platform_data { enum msp_i2s_id id; struct stedma40_chan_cfg *msp_i2s_dma_rx; struct stedma40_chan_cfg *msp_i2s_dma_tx; - int (*msp_i2s_init) (void); - int (*msp_i2s_exit) (void); }; #endif diff --git a/sound/soc/ux500/ux500_msp_i2s.c b/sound/soc/ux500/ux500_msp_i2s.c index 36be11e..2cbfc54 100644 --- a/sound/soc/ux500/ux500_msp_i2s.c +++ b/sound/soc/ux500/ux500_msp_i2s.c @@ -15,6 +15,7 @@ #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/pinctrl/consumer.h> #include <linux/delay.h> #include <linux/slab.h> @@ -25,6 +26,17 @@ #include "ux500_msp_i2s.h" +/* MSP1/3 Tx/Rx usage protection */ +static DEFINE_SPINLOCK(msp_rxtx_lock); + +/* Pin modes */ +struct pinctrl *pinctrl_p; +struct pinctrl_state *pinctrl_def; +struct pinctrl_state *pinctrl_sleep; + +/* Reference Count */ +int pinctrl_rxtx_ref; + /* Protocol desciptors */ static const struct msp_protdesc prot_descs[] = { { /* I2S */ @@ -352,17 +364,23 @@ static int configure_multichannel(struct ux500_msp *msp, static int enable_msp(struct ux500_msp *msp, struct ux500_msp_config *config) { - int status = 0; + int status = 0, retval = 0; u32 reg_val_DMACR, reg_val_GCR; + unsigned long flags; /* Check msp state whether in RUN or CONFIGURED Mode */ - if ((msp->msp_state == MSP_STATE_IDLE) && (msp->plat_init)) { - status = msp->plat_init(); - if (status) { - dev_err(msp->dev, "%s: ERROR: Failed to init MSP (%d)!\n", - __func__, status); - return status; + if (msp->msp_state == MSP_STATE_IDLE) { + spin_lock_irqsave(&msp_rxtx_lock, flags); + if (pinctrl_rxtx_ref == 0 && + !(IS_ERR(pinctrl_p) || IS_ERR(pinctrl_def))) { + retval = pinctrl_select_state(pinctrl_p, + pinctrl_def); + if (retval) + pr_err("could not set MSP defstate\n"); } + if (!retval) + pinctrl_rxtx_ref++; + spin_unlock_irqrestore(&msp_rxtx_lock, flags); } /* Configure msp with protocol dependent settings */ @@ -620,7 +638,8 @@ int ux500_msp_i2s_trigger(struct ux500_msp *msp, int cmd, int direction) int ux500_msp_i2s_close(struct ux500_msp *msp, unsigned int dir) { - int status = 0; + int status = 0, retval = 0; + unsigned long flags; dev_dbg(msp->dev, "%s: Enter (dir = 0x%01x).\n", __func__, dir); @@ -631,12 +650,19 @@ int ux500_msp_i2s_close(struct ux500_msp *msp, unsigned int dir) writel((readl(msp->registers + MSP_GCR) & (~(FRAME_GEN_ENABLE | SRG_ENABLE))), msp->registers + MSP_GCR); - if (msp->plat_exit) - status = msp->plat_exit(); - if (status) - dev_warn(msp->dev, - "%s: WARN: ux500_msp_i2s_exit failed (%d)!\n", - __func__, status); + + spin_lock_irqsave(&msp_rxtx_lock, flags); + WARN_ON(!pinctrl_rxtx_ref); + pinctrl_rxtx_ref--; + if (pinctrl_rxtx_ref == 0 && + !(IS_ERR(pinctrl_p) || IS_ERR(pinctrl_sleep))) { + retval = pinctrl_select_state(pinctrl_p, + pinctrl_sleep); + if (retval) + pr_err("could not set MSP sleepstate\n"); + } + spin_unlock_irqrestore(&msp_rxtx_lock, flags); + writel(0, msp->registers + MSP_GCR); writel(0, msp->registers + MSP_TCF); writel(0, msp->registers + MSP_RCF); @@ -678,8 +704,6 @@ int ux500_msp_i2s_init_msp(struct platform_device *pdev, msp->id = platform_data->id; msp->dev = &pdev->dev; - msp->plat_init = platform_data->msp_i2s_init; - msp->plat_exit = platform_data->msp_i2s_exit; msp->dma_cfg_rx = platform_data->msp_i2s_dma_rx; msp->dma_cfg_tx = platform_data->msp_i2s_dma_tx; @@ -717,6 +741,25 @@ int ux500_msp_i2s_init_msp(struct platform_device *pdev, dev_dbg(&pdev->dev, "I2S device-name: '%s'\n", i2s_cont->name); msp->i2s_cont = i2s_cont; + pinctrl_p = pinctrl_get(msp->dev); + if (IS_ERR(pinctrl_p)) + dev_err(&pdev->dev, "could not get MSP pinctrl\n"); + else { + pinctrl_def = pinctrl_lookup_state(pinctrl_p, + PINCTRL_STATE_DEFAULT); + if (IS_ERR(pinctrl_def)) { + dev_err(&pdev->dev, + "could not get MSP defstate (%li)\n", + PTR_ERR(pinctrl_def)); + } + pinctrl_sleep = pinctrl_lookup_state(pinctrl_p, + PINCTRL_STATE_SLEEP); + if (IS_ERR(pinctrl_sleep)) + dev_err(&pdev->dev, + "could not get MSP idlestate (%li)\n", + PTR_ERR(pinctrl_def)); + } + return 0; err_i2s_cont: diff --git a/sound/soc/ux500/ux500_msp_i2s.h b/sound/soc/ux500/ux500_msp_i2s.h index 2d9136d..1ce336f 100644 --- a/sound/soc/ux500/ux500_msp_i2s.h +++ b/sound/soc/ux500/ux500_msp_i2s.h @@ -524,8 +524,6 @@ struct ux500_msp { struct dma_chan *rx_pipeid; enum msp_state msp_state; int (*transfer) (struct ux500_msp *msp, struct i2s_message *message); - int (*plat_init) (void); - int (*plat_exit) (void); struct timer_list notify_timer; int def_elem_len; unsigned int dir_busy; -- 1.7.9.5

2 5

Re: [alsa-devel] [PATCH v2 02/14] MFD: twl4030-audio: Convert to use devm_kzalloc
by Peter Ujfalusi 30 Aug '12

30 Aug '12

Hi Tero, On 08/28/2012 12:50 PM, Tero Kristo wrote: > On Tue, 2012-08-14 at 17:22 +0300, Peter Ujfalusi wrote: >> Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> > > I think this one could use a short commit message, also about why > kfree():s are dropped (handled internally by devm_* etc.) I don't like empty commit messages either but this patch is self explaining I would think that the commit title explains it. -- Péter

1 0

Re: [alsa-devel] REGRESSION: Webcam mic for 145f:015b not longer working with 1.0.24 and above (OK with 1.0.23)
by Daniel Mack 30 Aug '12

30 Aug '12

On 27.08.2012 12:33, Kostas wrote: > On 27/08/2012 12:26 μμ, Daniel Mack wrote: >> On 27.08.2012 11:00, Kostas wrote: >>> Hi All, >>> >>> I have a 'Trust Webcam' (USB ID: 145f:015b) that comes with a microphone. >>> The microphone works with Alsa 1.0.23 but it does not work with the >>> latest Alsa 1.0.25 neither with Alsa 1.0.24. >>> Apparently this is a regression. >>> >>> What shall I do to figure out the source of the problem? >>> >>> Here are attached my alsa-infos, with Alsa 1.0.23 (working), 1.0.24 (NOT >>> working) and 1.0.25 (NOT working). >> Can you provide dmesg protocols for both a working and a non-working >> case please? >> >> > Below are attached the dmesg files. > Thanks - the logs look both good, I guess the interesting messages are only generated once you try to start the stream. Can you try this?

2 22

[alsa-devel] NRPACKS setting
by Raymond Celius 29 Aug '12

29 Aug '12

Hi, Is the NRPACKS setting equal to the number of packets per URB ? Best regards, Raymond Den 29. aug.. 2012 kl. 16.14 skrev alsa-devel-request(a)alsa-project.org: > Send Alsa-devel mailing list submissions to > alsa-devel(a)alsa-project.org > > To subscribe or unsubscribe via the World Wide Web, visit > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel > or, via email, send a message with subject or body 'help' to > alsa-devel-request(a)alsa-project.org > > You can reach the person managing the list at > alsa-devel-owner(a)alsa-project.org > > When replying, please edit your Subject line so it is more specific > than "Re: Contents of Alsa-devel digest..." > > > Today's Topics: > > 1. Re: [PATCH] ALSA: hda - Fix runtime PM accounting (Lin, Mengdong) > 2. Re: Logitech USB headset not working in 3.6-rc3 (Takashi Iwai) > 3. Re: Logitech USB headset not working in 3.6-rc3 (Daniel Mack) > 4. Re: [PATCH] ALSA: hda - Fix runtime PM accounting (Takashi Iwai) > 5. Re: Logitech USB headset not working in 3.6-rc3 (Takashi Iwai) > > > ---------------------------------------------------------------------- > > Message: 1 > Date: Wed, 29 Aug 2012 12:19:32 +0000 > From: "Lin, Mengdong" <mengdong.lin(a)intel.com> > To: Takashi Iwai <tiwai(a)suse.de> > Cc: "alsa-devel(a)alsa-project.org" <alsa-devel(a)alsa-project.org> > Subject: Re: [alsa-devel] [PATCH] ALSA: hda - Fix runtime PM > accounting > Message-ID: > <F46914AEC2663F4A9BB62374E5EEF8F81DAFDF(a)SHSMSX101.ccr.corp.intel.com> > Content-Type: text/plain; charset="us-ascii" > >> Now I introduced codec->epss flag that is initialized once in >> snd_hda_codec_new(), and let the codec driver overrides this flag. >> One bonus is that you can avoid the unnecessary codec parameter >> read at >> each power change. > > Yes, this is better. And the patch works well for me - [PATCH 1/2] > ALSA: hda - Avoid unnecessary parameter read for EPSS. > >> In anyway, there are a few issues: >> - The refcounting gets broken after module unload. It's because we >> leave the codec's pm_runtime usages after removal. > > Thanks for pointing out this! But I think the following codec can > introduce risk of race among multiple codecs to modify ' chip- > >power_count', > because only one codec's power on/off is serialized. > static void azx_power_notify(struct hda_bus *bus, struct hda_codec > *codec) > { > ... > if (codec->power_on) { > pm_runtime_get_sync(&chip->pci->dev); > chip->power_count++; > } else { > pm_runtime_put_sync(&chip->pci->dev); > chip->power_count--; > } > } > > How about calling pm_runtime_put_noidle() when freeing a codec in D0? > Maybe we can add a bus notify function like this: > Static void azx_codec_free_notify(struct hda_codec *codec) > { > If(codec->power_on) > pm_runtime_put_noidle(&codec->bus->pci->dev); > } > And snd_hda_codec_free() can trigger this notify. > >> - The D3-stop-clock check isn't done properly for the codecs >> providing >> own set_power_state ops. > > I cannot test the branch 'if (codec->patch_ops.set_power_state)' in > hda_set_power_state() for lack of such a codec. > But the logic seems right and the other branch works well for me :-) > >> - Ditto for the repeated power-set sequence, the error check, etc. > In hda_sync_power_state(), > if ((state & 0xff) == power_state) ... should be if ((state & > 0xf0)>> 4 == power_state), because PS-Act is bits 7:4 > break; > > And would you please explain why changing to D3 need not wait? One > of my codec does have a delay on change from D0 to D3. > > Thanks > Mengdong > > > > ------------------------------ > > Message: 2 > Date: Wed, 29 Aug 2012 15:29:03 +0200 > From: Takashi Iwai <tiwai(a)suse.de> > To: Daniel Mack <zonque(a)gmail.com> > Cc: Bruno Wolff III <bruno(a)wolff.to>, alsa-devel(a)alsa-project.org, > linux-kernel(a)vger.kernel.org, Josh Boyer <jwboyer(a)redhat.com> > Subject: Re: [alsa-devel] Logitech USB headset not working in 3.6-rc3 > Message-ID: <s5hsjb56d40.wl%tiwai(a)suse.de> > Content-Type: text/plain; charset=US-ASCII > > At Wed, 29 Aug 2012 13:26:25 +0200, > Daniel Mack wrote: >> >> [1 <text/plain; ISO-8859-1 (7bit)>] >> On 25.08.2012 14:17, Josh Boyer wrote: >>> On Sat, Aug 25, 2012 at 02:13:58PM +0200, Daniel Mack wrote: >>>> On 25.08.2012 14:07, Bruno Wolff III wrote: >>>>> On Sat, Aug 25, 2012 at 14:02:51 +0200, >>>>> Daniel Mack <zonque(a)gmail.com> wrote: >>>>>> >>>>>> Can you revert commit e9ba389c5 ("ALSA: usb-audio: Fix >>>>>> scheduling-while-atomic bug in PCM capture stream") and see if >>>>>> that >>>>> >>>>> I can try that, but it takes a long time to build a new kernel >>>>> on my >>>>> old hardware. >>>>> >>>>>> helps? If not, can you summarize again which kernels still work >>>>>> for you >>>>>> and which don't? >>>>> >>>>> The latest kernel that works is 3.6.0-0.rc2.git1.2.fc18. The >>>>> earliest that >>>>> doesn't work is 3.6.0-0.rc2.git2.1.fc18. >>>>> >>>> >>>> The report you sent doesn't look like it could be caused by >>>> e9ba389c5. >>>> It fixes a kernel Ooops. But as it is the only relevant patch in >>>> that >>>> area, it would be interesting if reverting it fixes anything. >>> >>> Yep, agreed. If this revert kernel doesn't work, we're likely >>> down to a >>> git bisect, Bruno. >>> >>>> Btw - thanks a lot for testing -rc kernels, much appreciated! >>> >>> Indeed! >> >> Could you please try this patch on top of Takashi's? Thanks again! >> >> >> Daniel >> >> [2 0001-ALSA-snd-usb-Fix-URB-cancellation-at-stream-start.patch >> <text/x-patch (7bit)>] >>> From 6617bb2463ae3fad21390b59cc2a71f96b9e9ca8 Mon Sep 17 00:00:00 >>> 2001 >> From: Daniel Mack <zonque(a)gmail.com> >> Date: Wed, 29 Aug 2012 13:17:05 +0200 >> Subject: [PATCH] ALSA: snd-usb: Fix URB cancellation at stream start >> >> Commit e9ba389c5 ("ALSA: usb-audio: Fix scheduling-while-atomic bug >> in >> PCM capture stream") fixed a scheduling-while-atomic bug that >> happened >> when snd_usb_endpoint_start was called from the trigger callback, >> which >> is an atmic context. However, the patch breaks the idea of the >> endpoints >> reference counting, which is the reason why the driver has been >> refactored lately. >> >> Revert that commit and let snd_usb_endpoint_start() take care of >> the URB >> cancellation again. As this function is called from both atomic and >> non-atomic context, add a flag to denote whether the function may >> sleep. >> >> Signed-off-by: Daniel Mack <zonque(a)gmail.com> >> Cc: stable(a)kernel.org [3.5+] >> --- >> sound/usb/endpoint.c | 10 ++++++++-- >> sound/usb/endpoint.h | 2 +- >> sound/usb/pcm.c | 13 +++++-------- >> 3 files changed, 14 insertions(+), 11 deletions(-) >> >> diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c >> index c411812..678456c 100644 >> --- a/sound/usb/endpoint.c >> +++ b/sound/usb/endpoint.c >> @@ -799,7 +799,9 @@ int snd_usb_endpoint_set_params(struct >> snd_usb_endpoint *ep, >> /** >> * snd_usb_endpoint_start: start an snd_usb_endpoint >> * >> - * @ep: the endpoint to start >> + * @ep: the endpoint to start >> + * @can_sleep: flag indicating whether the operation is executed in >> + * non-atomic context >> * >> * A call to this function will increment the use count of the >> endpoint. >> * In case it is not already running, the URBs for this endpoint >> will be >> @@ -809,7 +811,7 @@ int snd_usb_endpoint_set_params(struct >> snd_usb_endpoint *ep, >> * >> * Returns an error if the URB submission failed, 0 in all other >> cases. >> */ >> -int snd_usb_endpoint_start(struct snd_usb_endpoint *ep) >> +int snd_usb_endpoint_start(struct snd_usb_endpoint *ep, int >> can_sleep) >> { >> int err; >> unsigned int i; >> @@ -821,6 +823,10 @@ int snd_usb_endpoint_start(struct >> snd_usb_endpoint *ep) >> if (++ep->use_count != 1) >> return 0; >> >> + /* just to be sure */ >> + deactivate_urbs(ep, 0, can_sleep); >> + wait_clear_urbs(ep); > > It'd be safer to protect the call of wait_clear_urbs() when > can_sleep=0. > > > thanks, > > Takashi > > > ------------------------------ > > Message: 3 > Date: Wed, 29 Aug 2012 15:32:34 +0200 > From: Daniel Mack <zonque(a)gmail.com> > To: Takashi Iwai <tiwai(a)suse.de> > Cc: Bruno Wolff III <bruno(a)wolff.to>, alsa-devel(a)alsa-project.org, > linux-kernel(a)vger.kernel.org, Josh Boyer <jwboyer(a)redhat.com> > Subject: Re: [alsa-devel] Logitech USB headset not working in 3.6-rc3 > Message-ID: <503E19F2.3080302(a)gmail.com> > Content-Type: text/plain; charset="iso-8859-1" > > On 29.08.2012 15:29, Takashi Iwai wrote: >> At Wed, 29 Aug 2012 13:26:25 +0200, >> Daniel Mack wrote: >>> >>> [1 <text/plain; ISO-8859-1 (7bit)>] >>> On 25.08.2012 14:17, Josh Boyer wrote: >>>> On Sat, Aug 25, 2012 at 02:13:58PM +0200, Daniel Mack wrote: >>>>> On 25.08.2012 14:07, Bruno Wolff III wrote: >>>>>> On Sat, Aug 25, 2012 at 14:02:51 +0200, >>>>>> Daniel Mack <zonque(a)gmail.com> wrote: >>>>>>> >>>>>>> Can you revert commit e9ba389c5 ("ALSA: usb-audio: Fix >>>>>>> scheduling-while-atomic bug in PCM capture stream") and see if >>>>>>> that >>>>>> >>>>>> I can try that, but it takes a long time to build a new kernel >>>>>> on my >>>>>> old hardware. >>>>>> >>>>>>> helps? If not, can you summarize again which kernels still >>>>>>> work for you >>>>>>> and which don't? >>>>>> >>>>>> The latest kernel that works is 3.6.0-0.rc2.git1.2.fc18. The >>>>>> earliest that >>>>>> doesn't work is 3.6.0-0.rc2.git2.1.fc18. >>>>>> >>>>> >>>>> The report you sent doesn't look like it could be caused by >>>>> e9ba389c5. >>>>> It fixes a kernel Ooops. But as it is the only relevant patch in >>>>> that >>>>> area, it would be interesting if reverting it fixes anything. >>>> >>>> Yep, agreed. If this revert kernel doesn't work, we're likely >>>> down to a >>>> git bisect, Bruno. >>>> >>>>> Btw - thanks a lot for testing -rc kernels, much appreciated! >>>> >>>> Indeed! >>> >>> Could you please try this patch on top of Takashi's? Thanks again! >>> >>> >>> Daniel >>> >>> [2 0001-ALSA-snd-usb-Fix-URB-cancellation-at-stream-start.patch >>> <text/x-patch (7bit)>] >>>> From 6617bb2463ae3fad21390b59cc2a71f96b9e9ca8 Mon Sep 17 00:00:00 >>>> 2001 >>> From: Daniel Mack <zonque(a)gmail.com> >>> Date: Wed, 29 Aug 2012 13:17:05 +0200 >>> Subject: [PATCH] ALSA: snd-usb: Fix URB cancellation at stream start >>> >>> Commit e9ba389c5 ("ALSA: usb-audio: Fix scheduling-while-atomic >>> bug in >>> PCM capture stream") fixed a scheduling-while-atomic bug that >>> happened >>> when snd_usb_endpoint_start was called from the trigger callback, >>> which >>> is an atmic context. However, the patch breaks the idea of the >>> endpoints >>> reference counting, which is the reason why the driver has been >>> refactored lately. >>> >>> Revert that commit and let snd_usb_endpoint_start() take care of >>> the URB >>> cancellation again. As this function is called from both atomic and >>> non-atomic context, add a flag to denote whether the function may >>> sleep. >>> >>> Signed-off-by: Daniel Mack <zonque(a)gmail.com> >>> Cc: stable(a)kernel.org [3.5+] >>> --- >>> sound/usb/endpoint.c | 10 ++++++++-- >>> sound/usb/endpoint.h | 2 +- >>> sound/usb/pcm.c | 13 +++++-------- >>> 3 files changed, 14 insertions(+), 11 deletions(-) >>> >>> diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c >>> index c411812..678456c 100644 >>> --- a/sound/usb/endpoint.c >>> +++ b/sound/usb/endpoint.c >>> @@ -799,7 +799,9 @@ int snd_usb_endpoint_set_params(struct >>> snd_usb_endpoint *ep, >>> /** >>> * snd_usb_endpoint_start: start an snd_usb_endpoint >>> * >>> - * @ep: the endpoint to start >>> + * @ep: the endpoint to start >>> + * @can_sleep: flag indicating whether the operation is executed in >>> + * non-atomic context >>> * >>> * A call to this function will increment the use count of the >>> endpoint. >>> * In case it is not already running, the URBs for this endpoint >>> will be >>> @@ -809,7 +811,7 @@ int snd_usb_endpoint_set_params(struct >>> snd_usb_endpoint *ep, >>> * >>> * Returns an error if the URB submission failed, 0 in all other >>> cases. >>> */ >>> -int snd_usb_endpoint_start(struct snd_usb_endpoint *ep) >>> +int snd_usb_endpoint_start(struct snd_usb_endpoint *ep, int >>> can_sleep) >>> { >>> int err; >>> unsigned int i; >>> @@ -821,6 +823,10 @@ int snd_usb_endpoint_start(struct >>> snd_usb_endpoint *ep) >>> if (++ep->use_count != 1) >>> return 0; >>> >>> + /* just to be sure */ >>> + deactivate_urbs(ep, 0, can_sleep); >>> + wait_clear_urbs(ep); >> >> It'd be safer to protect the call of wait_clear_urbs() when >> can_sleep=0. > > Right. New patch attached. > >

1 0

[alsa-devel] [PATCH V2 0/6] ARM/ASoC: Davinci: Add Device Tree Support
by Hebbar, Gururaja 29 Aug '12

29 Aug '12

This patch-set is a cumulative of below tasks 1. Split asp header into platform and audio specific Davinci driver is shared by few OMAP platforms (like TI81xx, AM335x). Splitting asp header into Davinci platform specific and Audio specific helps to share them across platforms. 2. Add DT support for Davinci Audio Module (McASP, machine, pcm & Codec) This patch was tested on AM18x Board (Tested to check if the commits doesn't break on compile or runtime) and is based on repo at http://git.kernel.org/?p=linux/kernel/git/broonie/sound.git; a=shortlog;h=refs/heads/for-3.7 (v3.6-rc2) Note: Matt Porter from TI is working on DMA engine conversion of DaVinci EDMA support and DT conversion of DMA parts will be taken up post that is complete. Since Audio requires DMA to work, this patch set does not yet provide complete functionality required to use sound on DT-based platforms, but is a step towards that direction. Changes from V1: - Instanciate seudo-device (davinci-pcm) directly from DAI driver rather than having a separate virtual-device registered - add more explanation to DT parameters - Change DT parameter from "ti,codec-clock" to "ti,codec-clock-rate" - use standard DT GPIO reference by phandle to populate gpio based DT parameters - Dont return err if some DT parameters are missing. They will be treated as 0. - Through Error warning if num-serializer != "serial-dir" array size - Coding Style correction Hebbar, Gururaja (6): ASoC: davinci: davinci-pcm does not need to be a plaform_driver ARM: Davinci: Remove references to davinci pcm ASoC/ARM: Davinci: McASP: split asp header into platform and audio specific ASoC: Davinci: McASP: add device tree support for McASP ASoC: Davinci: machine: Add device tree binding ASoC: tlv320aic3x: Add device tree bindings .../bindings/sound/davinci-evm-audio.txt | 63 ++++++ .../bindings/sound/davinci-mcasp-audio.txt | 44 +++++ .../devicetree/bindings/sound/tlv320aic3x.txt | 20 ++ arch/arm/mach-davinci/asp.h | 49 +++++ arch/arm/mach-davinci/davinci.h | 3 +- arch/arm/mach-davinci/devices-da8xx.c | 8 +- arch/arm/mach-davinci/devices.c | 11 - arch/arm/mach-davinci/dm355.c | 2 +- arch/arm/mach-davinci/dm365.c | 2 +- arch/arm/mach-davinci/dm644x.c | 2 +- arch/arm/mach-davinci/dm646x.c | 2 +- arch/arm/mach-davinci/include/mach/da8xx.h | 2 +- .../linux/platform_data/davinci_asp.h | 73 ++----- sound/soc/codecs/tlv320aic3x.c | 31 +++ sound/soc/davinci/davinci-evm.c | 203 +++++++++++++++++--- sound/soc/davinci/davinci-i2s.c | 13 +- sound/soc/davinci/davinci-mcasp.c | 134 +++++++++++++- sound/soc/davinci/davinci-mcasp.h | 3 +- sound/soc/davinci/davinci-pcm.c | 24 +-- sound/soc/davinci/davinci-pcm.h | 6 +- sound/soc/davinci/davinci-sffsdr.c | 2 +- sound/soc/davinci/davinci-vcif.c | 8 + 22 files changed, 573 insertions(+), 132 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/davinci-evm-audio.txt create mode 100644 Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt create mode 100644 Documentation/devicetree/bindings/sound/tlv320aic3x.txt create mode 100644 arch/arm/mach-davinci/asp.h rename arch/arm/mach-davinci/include/mach/asp.h => include/linux/platform_data/davinci_asp.h (56%)

3 16

Re: [alsa-devel] [PATCHv2] sound: fix emu8000 DRAM sized 512 KiB too small
by Takashi Iwai 28 Aug '12

28 Aug '12

At Mon, 27 Aug 2012 22:25:21 -0400, David Flater wrote: > > v2: Fixed result still wrong in the case of 512 KiB DRAM. Oops. > > Applicable to 3.5.3 mainline. > > In emu8000.c, size_dram determines the amount of memory on the sound card by > doing write/readback tests starting at 512 KiB and incrementing by 512 KiB. > On success, detected_size is updated to the successful address and testing > continues. On failure, the loop is immediately exited. The resulting > detected_size is 512 KiB too small except in two special cases: > > 1. If there is no memory, the initial 0 value of detected_size is used, which > is correct. > 2. If the address space wraps around, detected_size is updated before the > bailout, so the result is correct. > > The patch corrects all cases and was tested with an AWE64 Gold. Before: > EMU8000 [0x620]: 3584 Kb on-board memory detected > asfxload 4GMGSMT.SF2 (4174814 B) fails. > After: > EMU8000 [0x620]: 4096 Kb on-board memory detected > asfxload 4GMGSMT.SF2 succeeds. > > I do not have a card with 512 KiB to test with, but by forcibly enabling the > added conditional I verified on the AWE64 Gold that it detects 512 KiB > (successfully reading from the first memory location) and does not hang the > card. > > C.f. Bug 46451 https://bugzilla.kernel.org/show_bug.cgi?id=46451 > > Signed-off-by: David Flater <dave(a)flaterco.com> Thanks, applied. Takashi > --- > > --- linux-3.5.3-nameless/sound/isa/sb/emu8000.c.orig 2012-08-25 22:32:13.000000000 -0400 > +++ linux-3.5.3-nameless/sound/isa/sb/emu8000.c 2012-08-27 22:06:15.729510037 -0400 > @@ -417,9 +417,6 @@ size_dram(struct snd_emu8000 *emu) > EMU8000_SMLD_READ(emu); /* discard stale data */ > if (EMU8000_SMLD_READ(emu) != UNIQUE_ID2) > break; /* no memory at this address */ > - > - detected_size = size; > - > snd_emu8000_read_wait(emu); > > /* > @@ -432,6 +429,18 @@ size_dram(struct snd_emu8000 *emu) > if (EMU8000_SMLD_READ(emu) != UNIQUE_ID1) > break; /* we must have wrapped around */ > snd_emu8000_read_wait(emu); > + > + /* Otherwise, it's valid memory. */ > + detected_size = size + 512 * 1024; > + } > + > + /* Distinguish 512 KiB from 0. */ > + if (detected_size == 0) { > + snd_emu8000_read_wait(emu); > + EMU8000_SMALR_WRITE(emu, EMU8000_DRAM_OFFSET); > + EMU8000_SMLD_READ(emu); /* discard stale data */ > + if (EMU8000_SMLD_READ(emu) == UNIQUE_ID1) > + detected_size = 512 * 1024; > } > > /* wait until FULL bit in SMAxW register is false */ > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo(a)vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ > -- To unsubscribe from this list: send the line "unsubscribe alsa-devel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

1 0