linux-mips
[Top] [All Lists]

Re: [PATCH 3/5] ALSA: pcm - fix page conversion on non-coherent MIPS arc

To: Takashi Iwai <tiwai@suse.de>
Subject: Re: [PATCH 3/5] ALSA: pcm - fix page conversion on non-coherent MIPS arch
From: Wu Zhangjin <wuzhangjin@gmail.com>
Date: Fri, 27 Nov 2009 11:52:58 +0800
Cc: alsa-devel@alsa-project.org, Ralf Baechle <ralf@linux-mips.org>, Thomas Bogendoerfer <tsbogend@alpha.franken.de>, linux-mips@linux-mips.org, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Kumar Gala <galak@gate.crashing.org>, Becky Bruce <beckyb@kernel.crashing.org>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:reply-to:to:cc :in-reply-to:references:content-type:organization:date:message-id :mime-version:x-mailer:content-transfer-encoding; bh=LuYNJ5m8THcc0LXLYGcXkvvKeQT4sjyQbHaFqr3haPw=; b=W+toIRFdDjVqxOHfg45EHLjOMtRARB6DrsqQAJ1XBvVzQe0tYl4w354N7IXg5WsMJZ v/UENjAdmBLFzzauHIwOw6HFKS0Hk/eA9tD0NMBgqxFCB/ryfNGRRHtAuYhHJdOFJkHZ +UUWmIyOSrkRGo4+QPnfq8n+jmld/6alSx+Ns=
Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:reply-to:to:cc:in-reply-to:references:content-type :organization:date:message-id:mime-version:x-mailer :content-transfer-encoding; b=s/UVoDm6Bc3Cp5oYuqXXUHz5E1XBBr8izataBDPuQEQPvt/dzw9RSbqnb+73KvvSID uTAbADy2w7cc+zmFUspNaONgZNlDBBZ4y+F+43RxM1yFOnjN3uOZqpbRvrMEH1BHvuQ0 cJKJveqjs+VRajdto0zJyPgrViibDmyF3wxzw=
In-reply-to: <1259248388-20095-4-git-send-email-tiwai@suse.de>
Organization: DSLab, Lanzhou University, China
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <1259248388-20095-1-git-send-email-tiwai@suse.de> <1259248388-20095-2-git-send-email-tiwai@suse.de> <1259248388-20095-3-git-send-email-tiwai@suse.de> <1259248388-20095-4-git-send-email-tiwai@suse.de>
Reply-to: wuzhangjin@gmail.com
Sender: linux-mips-bounce@linux-mips.org
On Thu, 2009-11-26 at 16:13 +0100, Takashi Iwai wrote:
> The non-coherent MIPS arch doesn't give the correct address by a simple
> virt_to_page() for pages allocated via dma_alloc_coherent().
> 
> Original patch by Wu Zhangjin <wuzj@lemote.com>.  A proper check of the
> buffer allocation type was added to avoid the wrong conversion.
> 
> Note that this doesn't fix perfectly: the pages should be marked with
> proper pgprot value.  This will be done in a future implementation like
> the conversion to dma_mmap_coherent().
> 
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> ---
>  sound/core/pcm_native.c |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)
> 
> diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
> index c906be2..e48c5f6 100644
> --- a/sound/core/pcm_native.c
> +++ b/sound/core/pcm_native.c
> @@ -3066,6 +3066,10 @@ static inline struct page *
>  snd_pcm_default_page_ops(struct snd_pcm_substream *substream, unsigned long 
> ofs)
>  {
>       void *vaddr = substream->runtime->dma_area + ofs;
> +#if defined(CONFIG_MIPS) && defined(CONFIG_DMA_NONCOHERENT)
> +     if (substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV)
> +             return virt_to_page(CAC_ADDR(vaddr));
> +#endif
>       return virt_to_page(vaddr);
>  }

Works well on Loongson family machines, thanks!

Regards,
        Wu Zhangjin


<Prev in Thread] Current Thread [Next in Thread>