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

[alsa-devel] [PATCH] ASoC: PXA: Fix oops in __pxa2xx_pcm_prepare
by Vasily Khoruzhick 03 Apr '11

03 Apr '11

pxa2xx_pcm_hw_free frees dma channel and sets prtd->dma_ch to -1, but does not set prtd->params to NULL, so if pxa2xx_pcm_hw_params will be called immediately, it leaves prtd->dma_ch initialized with -1, and it results in oops in __pxa2xx_pcm_prepare. This bug is triggered via SDL. This patch adds check for prtd->dma_ch to __pxa2xx_pcm_prepare and cleans prtd->params, so now it works properly. Signed-off-by: Vasily Khoruzhick <anarsoul(a)gmail.com> --- sound/arm/pxa2xx-pcm-lib.c | 3 +++ sound/soc/pxa/pxa2xx-pcm.c | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/sound/arm/pxa2xx-pcm-lib.c b/sound/arm/pxa2xx-pcm-lib.c index 8808b82..52b1e17 100644 --- a/sound/arm/pxa2xx-pcm-lib.c +++ b/sound/arm/pxa2xx-pcm-lib.c @@ -140,6 +140,9 @@ int __pxa2xx_pcm_prepare(struct snd_pcm_substream *substream) if (!prtd || !prtd->params) return 0; + if (prtd->dma_ch == -1) + return -EIO; + DCSR(prtd->dma_ch) &= ~DCSR_RUN; DCSR(prtd->dma_ch) = 0; DCMD(prtd->dma_ch) = 0; diff --git a/sound/soc/pxa/pxa2xx-pcm.c b/sound/soc/pxa/pxa2xx-pcm.c index 02fb664..2ce0b2d 100644 --- a/sound/soc/pxa/pxa2xx-pcm.c +++ b/sound/soc/pxa/pxa2xx-pcm.c @@ -65,6 +65,7 @@ static int pxa2xx_pcm_hw_free(struct snd_pcm_substream *substream) if (prtd->dma_ch >= 0) { pxa_free_dma(prtd->dma_ch); prtd->dma_ch = -1; + prtd->params = NULL; } return 0; -- 1.7.4.1

2 2

[alsa-devel] [PATCH] ASoC: Remove special casing for registerless widgets
by Mark Brown 02 Apr '11

02 Apr '11

Since we recently explicitly set the register for registerless widgets to no register there is no longer any need to special case power updates for them, we can allow them to be handled with the register compression code as other widgets are. As this is the only remaining user of dapm_generic_apply_power() and dapm_update_bits() also remove those functions. Noticed-by: Lu Guanqun <guanqun.lu(a)intel.com> Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- Compile tested only currently, sending it out now as part of discussion with Lu Guanqun. sound/soc/soc-dapm.c | 100 -------------------------------------------------- 1 files changed, 0 insertions(+), 100 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index b11d011..c9196d6 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -322,45 +322,6 @@ static int dapm_connect_mixer(struct snd_soc_dapm_context *dapm, return -ENODEV; } -/* update dapm codec register bits */ -static int dapm_update_bits(struct snd_soc_dapm_widget *widget) -{ - int change, power; - unsigned int old, new; - struct snd_soc_codec *codec = widget->codec; - struct snd_soc_dapm_context *dapm = widget->dapm; - struct snd_soc_card *card = dapm->card; - - /* check for valid widgets */ - if (widget->reg < 0 || widget->id == snd_soc_dapm_input || - widget->id == snd_soc_dapm_output || - widget->id == snd_soc_dapm_hp || - widget->id == snd_soc_dapm_mic || - widget->id == snd_soc_dapm_line || - widget->id == snd_soc_dapm_spk) - return 0; - - power = widget->power; - if (widget->invert) - power = (power ? 0:1); - - old = snd_soc_read(codec, widget->reg); - new = (old & ~(0x1 << widget->shift)) | (power << widget->shift); - - change = old != new; - if (change) { - pop_dbg(dapm->dev, card->pop_time, - "pop test %s : %s in %d ms\n", - widget->name, widget->power ? "on" : "off", - card->pop_time); - pop_wait(card->pop_time); - snd_soc_write(codec, widget->reg, new); - } - dev_dbg(dapm->dev, "reg %x old %x new %x change %d\n", widget->reg, - old, new, change); - return change; -} - /* create new dapm mixer control */ static int dapm_new_mixer(struct snd_soc_dapm_context *dapm, struct snd_soc_dapm_widget *w) @@ -644,57 +605,6 @@ int dapm_reg_event(struct snd_soc_dapm_widget *w, } EXPORT_SYMBOL_GPL(dapm_reg_event); -/* Standard power change method, used to apply power changes to most - * widgets. - */ -static int dapm_generic_apply_power(struct snd_soc_dapm_widget *w) -{ - int ret; - - /* call any power change event handlers */ - if (w->event) - dev_dbg(w->dapm->dev, "power %s event for %s flags %x\n", - w->power ? "on" : "off", - w->name, w->event_flags); - - /* power up pre event */ - if (w->power && w->event && - (w->event_flags & SND_SOC_DAPM_PRE_PMU)) { - ret = w->event(w, NULL, SND_SOC_DAPM_PRE_PMU); - if (ret < 0) - return ret; - } - - /* power down pre event */ - if (!w->power && w->event && - (w->event_flags & SND_SOC_DAPM_PRE_PMD)) { - ret = w->event(w, NULL, SND_SOC_DAPM_PRE_PMD); - if (ret < 0) - return ret; - } - - dapm_update_bits(w); - - /* power up post event */ - if (w->power && w->event && - (w->event_flags & SND_SOC_DAPM_POST_PMU)) { - ret = w->event(w, - NULL, SND_SOC_DAPM_POST_PMU); - if (ret < 0) - return ret; - } - - /* power down post event */ - if (!w->power && w->event && - (w->event_flags & SND_SOC_DAPM_POST_PMD)) { - ret = w->event(w, NULL, SND_SOC_DAPM_POST_PMD); - if (ret < 0) - return ret; - } - - return 0; -} - /* Generic check to see if a widget should be powered. */ static int dapm_generic_check_power(struct snd_soc_dapm_widget *w) @@ -981,16 +891,6 @@ static void dapm_seq_run(struct snd_soc_dapm_context *dapm, NULL, SND_SOC_DAPM_POST_PMD); break; - case snd_soc_dapm_input: - case snd_soc_dapm_output: - case snd_soc_dapm_hp: - case snd_soc_dapm_mic: - case snd_soc_dapm_line: - case snd_soc_dapm_spk: - /* No register support currently */ - ret = dapm_generic_apply_power(w); - break; - default: /* Queue it up for application */ cur_sort = sort[w->id]; -- 1.7.4.1

2 4

[alsa-devel] [PATCH 1/2] ASoC: remove dapm_update_bits()
by Lu Guanqun 02 Apr '11

02 Apr '11

dapm_update_bits() is only called in dapm_generic_apply_power(). And in turn, dapm_generic_apply_power() is only called in dapm_seq_run() when w->id is snd_soc_dapm_{input|output|hp|line|mic}. Under these cases, dapm_update_bits() is rather useless, because the below tests are always true: /* check for valid widgets */ if (widget->reg < 0 || widget->id == snd_soc_dapm_input || widget->id == snd_soc_dapm_output || widget->id == snd_soc_dapm_hp || widget->id == snd_soc_dapm_mic || widget->id == snd_soc_dapm_line || widget->id == snd_soc_dapm_spk) return 0; Therefore, we better omit this function for simplicity. Signed-off-by: Lu Guanqun <guanqun.lu(a)intel.com> --- sound/soc/soc-dapm.c | 41 ----------------------------------------- 1 files changed, 0 insertions(+), 41 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 81c4052..d511bbe 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -322,45 +322,6 @@ static int dapm_connect_mixer(struct snd_soc_dapm_context *dapm, return -ENODEV; } -/* update dapm codec register bits */ -static int dapm_update_bits(struct snd_soc_dapm_widget *widget) -{ - int change, power; - unsigned int old, new; - struct snd_soc_codec *codec = widget->codec; - struct snd_soc_dapm_context *dapm = widget->dapm; - struct snd_soc_card *card = dapm->card; - - /* check for valid widgets */ - if (widget->reg < 0 || widget->id == snd_soc_dapm_input || - widget->id == snd_soc_dapm_output || - widget->id == snd_soc_dapm_hp || - widget->id == snd_soc_dapm_mic || - widget->id == snd_soc_dapm_line || - widget->id == snd_soc_dapm_spk) - return 0; - - power = widget->power; - if (widget->invert) - power = (power ? 0:1); - - old = snd_soc_read(codec, widget->reg); - new = (old & ~(0x1 << widget->shift)) | (power << widget->shift); - - change = old != new; - if (change) { - pop_dbg(dapm->dev, card->pop_time, - "pop test %s : %s in %d ms\n", - widget->name, widget->power ? "on" : "off", - card->pop_time); - pop_wait(card->pop_time); - snd_soc_write(codec, widget->reg, new); - } - dev_dbg(dapm->dev, "reg %x old %x new %x change %d\n", widget->reg, - old, new, change); - return change; -} - /* create new dapm mixer control */ static int dapm_new_mixer(struct snd_soc_dapm_context *dapm, struct snd_soc_dapm_widget *w) @@ -673,8 +634,6 @@ static int dapm_generic_apply_power(struct snd_soc_dapm_widget *w) return ret; } - dapm_update_bits(w); - /* power up post event */ if (w->power && w->event && (w->event_flags & SND_SOC_DAPM_POST_PMU)) { -- 1.7.2.3

2 4

[alsa-devel] Multiple sound problems with ALC888 (1025:013f) on Acer Aspire 5930
by Elisavet Vorgia 02 Apr '11

02 Apr '11

Hi All, I have sound issues with my laptop, I cannot get 5.1 sound and jack sensing does not work (but works on Windows 7; dual-boot). I have an Acer Aspire 5930 (chipset: ALC888) running Ubuntu 10.10 (64-bit). I have tested with Alsa 1.0.23 (which comes with Ubuntu 10.10) and also compiled Alsa 1.0.24. Here is the Alsa-info with Alsa 1.0.24 (latest), and "model=auto", http://www.alsa-project.org/db/?f=2cbab ... 31dc6a7d70 <http://www.alsa-project.org/db/?f=2cbab995516f4b56a7faecf537f61f31dc6a7d70> Here is alsa-info with "model=acer-aspire-6530g", http://www.alsa-project.org/db/?f=40992 ... 17160cde64 <http://www.alsa-project.org/db/?f=409923a3d8f042804e61f21c7b8ae917160cde64> However, on Linux, 1. the sound volume is too low compared to Windows 7. For example, 50% on the volume bar in Ubuntu is roughly equivalent to 10% in Windows 7. 2. the subwoofer control bar in Sound Preferences Settings seems to control the master volume bar. 3. it seems that only 2 speakers actually work (Front Left and Front Right) as tested with speaker-test -c6 -twav 4. when I plug in the headphones jack the internal speakers don't get muted, instead I have combined sound output. I tried to change the model from auto to "acer" (tested all the acer and the 6stack-dig models and settled down to acer-aspire-6530g as a popular suggestion) but it didn't change much. (You'll find the alsa-info.txt as an attachment to this message.) Is there any possible solution or suggestion for this problem? I am happy to try out patches. Thanks, Elisavet

2 1

[alsa-devel] export pcm_debug_name?
by Eliot Blennerhassett 01 Apr '11

01 Apr '11

Currently defined locally in pcm_lib.c, this function would be useful for debug output from drivers too? Any objection to exporting this function? > static void pcm_debug_name(struct snd_pcm_substream *substream, > char *name, size_t len) > { > snprintf(name, len, "pcmC%dD%d%c:%d", > substream->pcm->card->number, > substream->pcm->device, > substream->stream ? 'c' : 'p', > substream->number); > } -- Eliot Blennerhassett AudioScience Inc.

2 3

[alsa-devel] Resource temporarily unavailable
by Nikhil 01 Apr '11

01 Apr '11

Hi all, when I use the function " r = snd_pcm_readi(alsa.icard, buf+readpos , left);" I got error "Resource temporarily unavailable". Please tel me how to solve the issue.My sound card not busy.. Thanks Nikhil

1 0

Re: [alsa-devel] Linux 2.6.38 freeze because of sound/core/pcm_lib.c commit 59ff878ffb26bc0be812ca8295799164f413ae88
by Clemens Ladisch 01 Apr '11

01 Apr '11

Christopher K. wrote: > Kernel 2.6.38 has been freezing ever since rc1 on my asus p7p55d. > After booting up, the kernel seems to use a lot of cpu-time and after > 20-30 seconds > the system comes to a complete halt. > > I just finished bisecting 2.6.37 - 2.6.38-rc1 and found this commit to > be responsible: > > 59ff878ffb26bc0be812ca8295799164f413ae88 Please try this patch: --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -425,6 +425,8 @@ static int snd_pcm_hw_params(struct snd_ runtime->no_period_wakeup = (params->info & SNDRV_PCM_INFO_NO_PERIOD_WAKEUP) && (params->flags & SNDRV_PCM_HW_PARAMS_NO_PERIOD_WAKEUP); + runtime->hw_ptr_buffer_jiffies = + max(1uL, (runtime->buffer_size * HZ) / runtime->rate); bits = snd_pcm_format_physical_width(runtime->format); runtime->sample_bits = bits; @@ -866,8 +868,6 @@ static void snd_pcm_post_start(struct sn struct snd_pcm_runtime *runtime = substream->runtime; snd_pcm_trigger_tstamp(substream); runtime->hw_ptr_jiffies = jiffies; - runtime->hw_ptr_buffer_jiffies = (runtime->buffer_size * HZ) / - runtime->rate; runtime->status->state = state; if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK && runtime->silence_size > 0)

3 6