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

Re: [alsa-devel] Crash 2.6.32.x, Echo 3G, Alsa, SCSI
by Clemens Ladisch 03 Jun '10

03 Jun '10

Frederick V Heitkamp wrote: > Repeatable Hard Crash. > What else do I need to provide? > > [ 5484.995249] WriteControlReg: not written, no change > [ 5485.069621] divide error: 0000 [#1] pcm_hw_params ok > [ 5485.070159] Prepare rate=44100 format=2 channels=2 > [ 5485.070161] set_audio_format[14] = 5 > [ 5485.070166] Prepare rate=44100 format=2 channels=2 > [ 5485.070167] set_audio_format[14] = 5 > [ 5485.070003] PREEMPT SMP > ... > [ 5485.070003] EIP is at pcm_pointer+0x37/0x70 [snd_echo3g] > ... > [ 5485.965788] [<c10041c0>] ? do_divide_error+0x0/0x90 > [ 5485.980619] [<f87aa037>] ? pcm_pointer+0x37/0x70 [snd_echo3g] > [ 5485.998047] [<c104764e>] ? run_timer_softirq+0x17e/0x2e0 > [ 5486.014175] [<f87ac9bf>] ? snd_echo_interrupt+0x11f/0x240 [snd_echo3g] > [ 5486.033940] [<c107a5d5>] ? handle_IRQ_event+0x45/0x190 bytes_to_frames() divides by runtime->frame_bits which is not set until after the hw_params callback has succeeded, but the corresponding chip->substream[] entry is set in that callback, by init_engine(). It should probably have been set in the prepare callback. Frederick, please try the patch below. Takashi, is there any reason why the runtime-> fields are initialized after the hw_params callback? Regards, Clemens --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -403,12 +403,6 @@ if (err < 0) goto _error; - if (substream->ops->hw_params != NULL) { - err = substream->ops->hw_params(substream, params); - if (err < 0) - goto _error; - } - runtime->access = params_access(params); runtime->format = params_format(params); runtime->subformat = params_subformat(params); @@ -446,6 +440,13 @@ runtime->boundary *= 2; snd_pcm_timer_resolution_change(substream); + + if (substream->ops->hw_params != NULL) { + err = substream->ops->hw_params(substream, params); + if (err < 0) + goto _error; + } + runtime->status->state = SNDRV_PCM_STATE_SETUP; pm_qos_remove_requirement(PM_QOS_CPU_DMA_LATENCY,

6 10

[alsa-devel] Trouble compiling alsa-driver-1.0.23 on Fedora 13
by Uros Bizjak 02 Jun '10

02 Jun '10

Hello! Trying to compile alsa-driver-1.0.23 on Fedora 13, I got following failure: gmake -C /lib/modules/2.6.33.5-112.fc13.x86_64/source SUBDIRS=/home/uros/alsa-driver-1.0.23 CPP="gcc -E" CC="gcc" modules gmake[1]: Entering directory `/usr/src/kernels/2.6.33.5-112.fc13.x86_64' Makefile:535: /usr/src/kernels/2.6.33.5-112.fc13.x86_64/arch//Makefile: No such file or directory gmake[1]: *** No rule to make target `/usr/src/kernels/2.6.33.5-112.fc13.x86_64/arch//Makefile'. Stop. gmake[1]: Leaving directory `/usr/src/kernels/2.6.33.5-112.fc13.x86_64' gmake: *** [compile] Error 2 I have installed required kernel-devel package. Am I missing something else to successfully compile alsa-kernel drivers? Thanks, Uros.

4 5

[PATCH] Ensure codec patch files are checked for the correct codec ID Signed-off-by: David Henningsson <diwic@ubuntu.com>
by David Henningsson 02 Jun '10

02 Jun '10

--- sound/pci/hda/hda_hwdep.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/sound/pci/hda/hda_hwdep.c b/sound/pci/hda/hda_hwdep.c index a1fc837..0e2cb27 100644 --- a/sound/pci/hda/hda_hwdep.c +++ b/sound/pci/hda/hda_hwdep.c @@ -649,7 +649,9 @@ static void parse_codec_mode(char *buf, struct hda_bus *bus, *codecp = NULL; if (sscanf(buf, "%i %i %i", &vendorid, &subid, &caddr) == 3) { list_for_each_entry(codec, &bus->codec_list, list) { - if (codec->addr == caddr) { + if (codec->vendor_id == vendorid && + codec->subsystem_id == subid && + codec->addr == caddr) { *codecp = codec; break; } -- 1.7.0.4 --------------020601030309080805090208--

1 0

[PATCH] Ensure codec patch files are checked for the correct codec ID Signed-off-by: David Henningsson <diwic@ubuntu.com>
by David Henningsson 02 Jun '10

02 Jun '10

--- sound/pci/hda/hda_hwdep.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/sound/pci/hda/hda_hwdep.c b/sound/pci/hda/hda_hwdep.c index a1fc837..0e2cb27 100644 --- a/sound/pci/hda/hda_hwdep.c +++ b/sound/pci/hda/hda_hwdep.c @@ -649,7 +649,9 @@ static void parse_codec_mode(char *buf, struct hda_bus *bus, *codecp = NULL; if (sscanf(buf, "%i %i %i", &vendorid, &subid, &caddr) == 3) { list_for_each_entry(codec, &bus->codec_list, list) { - if (codec->addr == caddr) { + if (codec->vendor_id == vendorid && + codec->subsystem_id == subid && + codec->addr == caddr) { *codecp = codec; break; } -- 1.7.0.4 --------------000400040903050100030008--

1 0

Re: [alsa-devel] [PATCH] AsoC/s6000: use resource_size for {request/release}_mem_region and ioremap
by Mark Brown 02 Jun '10

02 Jun '10

On Wed, Jun 02, 2010 at 06:49:53PM +0800, Wan ZongShun wrote: > The size calculation is end - start + 1. But,sometimes, the '1' can > be forgotten carelessly, witch will have potential risk, so use resource_size > for {request/release}_mem_region and ioremap here should be good habit. > > Signed-off-by: Wan ZongShun <mcuos.com(a)gmail.com> CCing in Daniel who wrote the S6000 support. Daniel, do you want to add an entry to MAINTAINERS for this stuff or are you happy without having stuff run past you? > --- > sound/soc/s6000/s6000-i2s.c | 38 +++++++++++++++++--------------------- > 1 files changed, 17 insertions(+), 21 deletions(-) > > diff --git a/sound/soc/s6000/s6000-i2s.c b/sound/soc/s6000/s6000-i2s.c > index 5b9ac17..59e3fa7 100644 > --- a/sound/soc/s6000/s6000-i2s.c > +++ b/sound/soc/s6000/s6000-i2s.c > @@ -451,16 +451,15 @@ static int __devinit s6000_i2s_probe(struct platform_device *pdev) > goto err_release_none; > } > > - region = request_mem_region(scbmem->start, > - scbmem->end - scbmem->start + 1, > - pdev->name); > + region = request_mem_region(scbmem->start, resource_size(scbmem), > + pdev->name); > if (!region) { > dev_err(&pdev->dev, "I2S SCB region already claimed\n"); > ret = -EBUSY; > goto err_release_none; > } > > - mmio = ioremap(scbmem->start, scbmem->end - scbmem->start + 1); > + mmio = ioremap(scbmem->start, resource_size(scbmem)); > if (!mmio) { > dev_err(&pdev->dev, "can't ioremap SCB region\n"); > ret = -ENOMEM; > @@ -474,9 +473,8 @@ static int __devinit s6000_i2s_probe(struct platform_device *pdev) > goto err_release_map; > } > > - region = request_mem_region(sifmem->start, > - sifmem->end - sifmem->start + 1, > - pdev->name); > + region = request_mem_region(sifmem->start, resource_size(sifmem), > + pdev->name); > if (!region) { > dev_err(&pdev->dev, "I2S SIF region already claimed\n"); > ret = -EBUSY; > @@ -490,8 +488,8 @@ static int __devinit s6000_i2s_probe(struct platform_device *pdev) > goto err_release_sif; > } > > - region = request_mem_region(dma1->start, dma1->end - dma1->start + 1, > - pdev->name); > + region = request_mem_region(dma1->start, resource_size(dma1), > + pdev->name); > if (!region) { > dev_err(&pdev->dev, "I2S DMA region already claimed\n"); > ret = -EBUSY; > @@ -500,9 +498,8 @@ static int __devinit s6000_i2s_probe(struct platform_device *pdev) > > dma2 = platform_get_resource(pdev, IORESOURCE_DMA, 1); > if (dma2) { > - region = request_mem_region(dma2->start, > - dma2->end - dma2->start + 1, > - pdev->name); > + region = request_mem_region(dma2->start, resource_size(dma2), > + pdev->name); > if (!region) { > dev_err(&pdev->dev, > "I2S DMA region already claimed\n"); > @@ -561,15 +558,15 @@ err_release_dev: > kfree(dev); > err_release_dma2: > if (dma2) > - release_mem_region(dma2->start, dma2->end - dma2->start + 1); > + release_mem_region(dma2->start, resource_size(dma2)); > err_release_dma1: > - release_mem_region(dma1->start, dma1->end - dma1->start + 1); > + release_mem_region(dma1->start, resource_size(dma1)); > err_release_sif: > - release_mem_region(sifmem->start, (sifmem->end - sifmem->start) + 1); > + release_mem_region(sifmem->start, resource_size(sifmem)); > err_release_map: > iounmap(mmio); > err_release_scb: > - release_mem_region(scbmem->start, (scbmem->end - scbmem->start) + 1); > + release_mem_region(scbmem->start, resource_size(scbmem)); > err_release_none: > return ret; > } > @@ -590,19 +587,18 @@ static void __devexit s6000_i2s_remove(struct platform_device *pdev) > kfree(dev); > > region = platform_get_resource(pdev, IORESOURCE_DMA, 0); > - release_mem_region(region->start, region->end - region->start + 1); > + release_mem_region(region->start, resource_size(region)); > > region = platform_get_resource(pdev, IORESOURCE_DMA, 1); > if (region) > - release_mem_region(region->start, > - region->end - region->start + 1); > + release_mem_region(region->start, resource_size(region)); > > region = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - release_mem_region(region->start, (region->end - region->start) + 1); > + release_mem_region(region->start, resource_size(region)); > > iounmap(mmio); > region = platform_get_resource(pdev, IORESOURCE_IO, 0); > - release_mem_region(region->start, (region->end - region->start) + 1); > + release_mem_region(region->start, resource_size(region)); > } > > static struct platform_driver s6000_i2s_driver = { > -- > 1.6.3.3

4 9

[alsa-devel] ASoC updates for 2.6.35
by Mark Brown 02 Jun '10

02 Jun '10

The following changes since commit 1fab79b8a1bf0d46a7c7e6a1c06dbed1803f403c: Merge branch 'for-2.6.36' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc (2010-05-31 18:13:20 +0200) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.35 Simple Kconfig fixes, should only affect the relevant platforms. Sascha Hauer (2): ASoC: Add missing Kconfig entry for Phytec boards ASoC: MX31ads sound support should depend on MACH_MX31ADS_WM1133_EV1 sound/soc/imx/Kconfig | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-)

2 1

Re: [alsa-devel] [PATCH v2 2/4]AsoC/nuc900: patch for modifing the ac97 delays to minimum
by Liam Girdwood 02 Jun '10

02 Jun '10

On Wed, 2010-06-02 at 13:57 +0800, Wan ZongShun wrote: > This patch is to modify the ac97 delays to minimum, all these 1000 micro > seconds delays seem over spec for the AC97 interface. > > I deleted some unnecessary delays here and changed the AC97 cold and warm reset > delays from 1000ms to 100ms. > I think you mean "from 1000µs to 100µs" here as ms is milliseconds. Liam -- Freelance Developer, SlimLogic Ltd ASoC and Voltage Regulator Maintainer. http://www.slimlogic.co.uk

2 2

Re: [alsa-devel] [PATCH v2 1/3]AsoC/nuc900: patch for SUBSTREAM_TYPE', 'PCM_TX' and 'PCM_RX' removal
by Wan ZongShun 02 Jun '10

02 Jun '10

I am sorry for wrong subject. It should be [PATCH v2 1/4]. > This patch is to remove the 'SUBSTREAM_TYPE','PCM_TX' and 'PCM_RX' definition. > > There is no need to redefine SNDRV_PCM_STREAM_PLAYBACK as PCM_TX, > the SUBSTREAM_TYPE(substream) can be deleted too, the playback or record can be > judged by 'if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)' directly rather > than 'if (PCM_TX == stype)', which makes the codes easy to read. > > Signed-off-by: Wan ZongShun<mcuos.com(a)gmail.com> > > --- > sound/soc/nuc900/nuc900-ac97.c | 6 +++--- > sound/soc/nuc900/nuc900-auido.h | 4 ---- > sound/soc/nuc900/nuc900-pcm.c | 18 ++++++++++-------- > 3 files changed, 13 insertions(+), 15 deletions(-)

1 0

[alsa-devel] [PATCH] regression 2.6.35-rc1+ hda realtek missing beep 10ec0883
by David Fries 02 Jun '10

02 Jun '10

From: David Fries <david(a)fries.net> The PC-Spekaer Beep control worked in 2.6.34, but not 2.6.35-rc1, this is the patch that modified that behavior. "ALSA: hda - Add parse customize define function for Realtek codecs" regression in commit da00c24493bf6ae3772dfe7343dca033ebc75955. Debug output (after this patch), HDA Intel 0000:00:14.2: PCI INT A -> GSI 16 (level, low) -> IRQ 16 SKU: Nid=0x0 sku_cfg=0x0000140d SKU: port_connectivity=0x0 SKU: enable_pcbeep=0x0 SKU: check_sum=0x00000000 SKU: customization=0x00000000 SKU: external_amp=0x1 SKU: platform_type=0x1 SKU: swap=0x0 SKU: override=0x1 hda_codec: ALC883: BIOS auto-probing. autoconfig: line_outs=1 (0x14/0x0/0x0/0x0/0x0) speaker_outs=0 (0x0/0x0/0x0/0x0/0x0) hp_outs=0 (0x0/0x0/0x0/0x0/0x0) mono: mono_out=0x0 dig-out=0x1e/0x0 inputs: mic=0x18, fmic=0x0, line=0x1a, fline=0x0, cd=0x1c, aux=0x0 realtek: Enabling init ASM_ID=0x140d CODEC_ID=10ec0883 input: HDA Digital PCBeep as /devices/pci0000:00/0000:00:14.2/input/input16 Signed-off-by: David Fries <david(a)fries.net> Cc: Kailang Yang <kailang(a)realtek.com> Cc: Takashi Iwai <tiwai(a)suse.de> --- My patch restores both the Beep volume and mute. I'll let someone else determine if this is the correct solution or not. sound/pci/hda/patch_realtek.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 17d4548..c31c8b9 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -10611,7 +10611,7 @@ static int patch_alc882(struct hda_codec *codec) set_capture_mixer(codec); - if (spec->cdefine.enable_pcbeep) + if (spec->cdefine.enable_pcbeep || codec->vendor_id == 0x10ec0883) set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT); if (board_config == ALC882_AUTO) -- 1.7.1

1 0

Re: [alsa-devel] [RFC PATCH 2/5] OMAP3: McBSP: Change the way how the FIFO is handled
by Peter Ujfalusi 02 Jun '10

02 Jun '10

On Monday 31 May 2010 20:41:12 ext Nishanth Menon wrote: > On 05/31/2010 11:16 AM, Peter Ujfalusi wrote: > > Use the actual FIFO size in words as buffer_size on OMAP2. > > Change the threshold configuration to use 1 based numbering, when > > specifying the allowed threshold maximum or the McBSP threshold value. > > Set the default maximum threshold to (buffer_size - 0x10) intialy. > > > >> From users of McBSP, now it is expected to use this method. > > > > Asking for threshold 1 means that the value written to threshold > > registers are going to be 0, which means 1 word threshold. > > just a 2cent minor comment: maybe omap_mcbsp_platform_data needs > structure documentation.. it might be difficult for folks to figure that > out from commit ID itself.. I can add comments in the mach-omap2/mcbsp.c like this: > > > Signed-off-by: Peter Ujfalusi<peter.ujfalusi(a)nokia.com> > > --- > > > > arch/arm/mach-omap2/mcbsp.c | 10 +++++----- > > arch/arm/plat-omap/mcbsp.c | 10 ++++++---- > > 2 files changed, 11 insertions(+), 9 deletions(-) > > > > diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c > > index 016fe60..9139958 100644 > > --- a/arch/arm/mach-omap2/mcbsp.c > > +++ b/arch/arm/mach-omap2/mcbsp.c > > @@ -132,7 +132,7 @@ static struct omap_mcbsp_platform_data > > omap34xx_mcbsp_pdata[] = { > > > > .rx_irq = INT_24XX_MCBSP1_IRQ_RX, > > .tx_irq = INT_24XX_MCBSP1_IRQ_TX, > > .ops =&omap2_mcbsp_ops, > > > > - .buffer_size = 0x6F, > > + .buffer_size = 0x80, + .buffer_size = 0x80, /* The FIFO has 128 locations */ > > > > }, > > { > > > > .phys_base = OMAP34XX_MCBSP2_BASE, > > > > @@ -142,7 +142,7 @@ static struct omap_mcbsp_platform_data > > omap34xx_mcbsp_pdata[] = { > > > > .rx_irq = INT_24XX_MCBSP2_IRQ_RX, > > .tx_irq = INT_24XX_MCBSP2_IRQ_TX, > > .ops =&omap2_mcbsp_ops, > > > > - .buffer_size = 0x3FF, > > + .buffer_size = 0x500, + .buffer_size = 0x500, /* The FIFO has 1024 + 256 locations */ > > > > }, > > { > > > > .phys_base = OMAP34XX_MCBSP3_BASE, > > > > @@ -152,7 +152,7 @@ static struct omap_mcbsp_platform_data > > omap34xx_mcbsp_pdata[] = { > > > > .rx_irq = INT_24XX_MCBSP3_IRQ_RX, > > .tx_irq = INT_24XX_MCBSP3_IRQ_TX, > > .ops =&omap2_mcbsp_ops, > > > > - .buffer_size = 0x6F, > > + .buffer_size = 0x80, + .buffer_size = 0x80, /* The FIFO has 128 locations */ > > > > }, > > { > > > > .phys_base = OMAP34XX_MCBSP4_BASE, > > > > @@ -161,7 +161,7 @@ static struct omap_mcbsp_platform_data > > omap34xx_mcbsp_pdata[] = { > > > > .rx_irq = INT_24XX_MCBSP4_IRQ_RX, > > .tx_irq = INT_24XX_MCBSP4_IRQ_TX, > > .ops =&omap2_mcbsp_ops, > > > > - .buffer_size = 0x6F, > > + .buffer_size = 0x80, > > > > }, > > { > > > > .phys_base = OMAP34XX_MCBSP5_BASE, > > > > @@ -170,7 +170,7 @@ static struct omap_mcbsp_platform_data > > omap34xx_mcbsp_pdata[] = { > > > > .rx_irq = INT_24XX_MCBSP5_IRQ_RX, > > .tx_irq = INT_24XX_MCBSP5_IRQ_TX, > > .ops =&omap2_mcbsp_ops, > > > > - .buffer_size = 0x6F, > > + .buffer_size = 0x80, > > > > }, > > > > }; > > #define OMAP34XX_MCBSP_PDATA_SZ ARRAY_SIZE(omap34xx_mcbsp_pdata) > > > > diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c > > index 51d8abf..6462968 100644 > > --- a/arch/arm/plat-omap/mcbsp.c > > +++ b/arch/arm/plat-omap/mcbsp.c > > @@ -497,7 +497,8 @@ void omap_mcbsp_set_tx_threshold(unsigned int id, u16 > > threshold) > > > > } > > mcbsp = id_to_mcbsp_ptr(id); > > > > - MCBSP_WRITE(mcbsp, THRSH2, threshold); > > + if (threshold&& threshold<= mcbsp->max_tx_thres) > > + MCBSP_WRITE(mcbsp, THRSH2, threshold - 1); > > > > } > > EXPORT_SYMBOL(omap_mcbsp_set_tx_threshold); > > > > @@ -519,7 +520,8 @@ void omap_mcbsp_set_rx_threshold(unsigned int id, u16 > > threshold) > > > > } > > mcbsp = id_to_mcbsp_ptr(id); > > > > - MCBSP_WRITE(mcbsp, THRSH1, threshold); > > + if (threshold&& threshold<= mcbsp->max_rx_thres) > > + MCBSP_WRITE(mcbsp, THRSH1, threshold - 1); > > > > } > > EXPORT_SYMBOL(omap_mcbsp_set_rx_threshold); > > > > @@ -1696,8 +1698,8 @@ static inline void __devinit > > omap34xx_device_init(struct omap_mcbsp *mcbsp) > > > > { > > > > mcbsp->dma_op_mode = MCBSP_DMA_MODE_ELEMENT; > > if (cpu_is_omap34xx()) { > > > > - mcbsp->max_tx_thres = max_thres(mcbsp); > > - mcbsp->max_rx_thres = max_thres(mcbsp); > > + mcbsp->max_tx_thres = max_thres(mcbsp) - 0x10; > > + mcbsp->max_rx_thres = max_thres(mcbsp) - 0x10; > > > > /* > > > > * REVISIT: Set dmap_op_mode to THRESHOLD as default > > * for mcbsp2 instances. Is this sufficient? -- Péter

2 1