From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arthur Marsh <arthur.marsh@internode.on.net>
Subject: Re: lock-up when loading desktop
Date: Tue, 14 Oct 2014 17:31:48 +1030
Message-ID: <543CCA5C.50102@internode.on.net>
References: <543B2438.1050002@internode.on.net>	<s5ha950zeyi.wl-tiwai@suse.de>	<543BB942.5060602@internode.on.net>	<s5h7g04ywgg.wl-tiwai@suse.de>	<543BCDE9.7010308@internode.on.net>	<s5h38asyrld.wl-tiwai@suse.de>	<543C153A.4060607@internode.on.net>
 <s5hk343y9ew.wl-tiwai@suse.de> <543C97EC.4040000@internode.on.net>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"; Format="flowed"
Content-Transfer-Encoding: 7bit
Return-path: <alsa-devel-bounces@alsa-project.org>
Received: from ipmail05.adl6.internode.on.net (ipmail05.adl6.internode.on.net
 [150.101.137.143])
 by alsa0.perex.cz (Postfix) with ESMTP id A92602604A2
 for <alsa-devel@alsa-project.org>; Tue, 14 Oct 2014 09:01:54 +0200 (CEST)
In-Reply-To: <543C97EC.4040000@internode.on.net>
List-Unsubscribe: <http://mailman.alsa-project.org/mailman/options/alsa-devel>,
 <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe>
List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel/>
List-Post: <mailto:alsa-devel@alsa-project.org>
List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help>
List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>,
 <mailto:alsa-devel-request@alsa-project.org?subject=subscribe>
Errors-To: alsa-devel-bounces@alsa-project.org
Sender: alsa-devel-bounces@alsa-project.org
To: Takashi Iwai <tiwai@suse.de>
Cc: alsa-devel@alsa-project.org
List-Id: alsa-devel@alsa-project.org



Arthur Marsh wrote, on 14/10/14 13:56:
>> ---
>> diff --git a/sound/pci/emu10k1/emu10k1_callback.c
>> b/sound/pci/emu10k1/emu10k1_callback.c
>> index 3f3ef38d9b6e..874cd76c7b7f 100644
>> --- a/sound/pci/emu10k1/emu10k1_callback.c
>> +++ b/sound/pci/emu10k1/emu10k1_callback.c
>> @@ -85,6 +85,8 @@ snd_emu10k1_ops_setup(struct snd_emux *emux)
>>    * get more voice for pcm
>>    *
>>    * terminate most inactive voice and give it as a pcm voice.
>> + *
>> + * voice_lock is already held.
>>    */
>>   int
>>   snd_emu10k1_synth_get_voice(struct snd_emu10k1 *hw)
>> @@ -92,12 +94,10 @@ snd_emu10k1_synth_get_voice(struct snd_emu10k1 *hw)
>>       struct snd_emux *emu;
>>       struct snd_emux_voice *vp;
>>       struct best_voice best[V_END];
>> -    unsigned long flags;
>>       int i;
>>
>>       emu = hw->synth;
>>
>> -    spin_lock_irqsave(&emu->voice_lock, flags);
>>       lookup_voices(emu, hw, best, 1); /* no OFF voices */
>>       for (i = 0; i < V_END; i++) {
>>           if (best[i].voice >= 0) {
>> @@ -113,11 +113,9 @@ snd_emu10k1_synth_get_voice(struct snd_emu10k1 *hw)
>>               vp->emu->num_voices--;
>>               vp->ch = -1;
>>               vp->state = SNDRV_EMUX_ST_OFF;
>> -            spin_unlock_irqrestore(&emu->voice_lock, flags);
>>               return ch;
>>           }
>>       }
>> -    spin_unlock_irqrestore(&emu->voice_lock, flags);
>>
>>       /* not found */
>>       return -ENOMEM;
>>
>
> I'll apply the above patch only first and report the results.
>
> Thanks again,
>
> Arthur.

With only the above emu10k1_callback.c patch and not the pcm_native.c 
patch, I experience a lock-up when running alsa-info.sh

Regards,

Arthur.