From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932426Ab2F2QS7 (ORCPT ); Fri, 29 Jun 2012 12:18:59 -0400 Received: from cantor2.suse.de ([195.135.220.15]:56319 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932249Ab2F2QS5 (ORCPT ); Fri, 29 Jun 2012 12:18:57 -0400 Date: Fri, 29 Jun 2012 18:18:56 +0200 Message-ID: From: Takashi Iwai To: Lars-Peter Clausen Cc: Laxman Dewangan , "lrg@ti.com" , "broonie@opensource.wolfsonmicro.com" , Stephen Warren , "perex@perex.cz" , "clemens@ladisch.de" , "alsa-devel@alsa-project.org" , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH 0/3] ASoC: Move pcm writecombine dma buffer allocation to core In-Reply-To: <4FEDD29C.8040209@metafoo.de> References: <1340965398-20872-1-git-send-email-ldewangan@nvidia.com> <4FEDC3F8.8000501@nvidia.com> <4FEDD29C.8040209@metafoo.de> User-Agent: Wanderlust/2.15.6 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.7 Emacs/23.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At Fri, 29 Jun 2012 18:06:52 +0200, Lars-Peter Clausen wrote: > > On 06/29/2012 05:04 PM, Laxman Dewangan wrote: > > [...] > > > > > >> +/* allocate the coherent DMA pages */ > >> +static void *snd_malloc_dev_pages(struct device *dev, size_t size, > >> dma_addr_t *dma) > >> +{ > >> + return __snd_malloc_dev_pages(dev, size, dma, dma_alloc_coherent); > > > > This does not get compiled in ARM because dma_alloc_coherant is macro > > defined as > > > > #define dma_alloc_coherent(d, s, h, f) dma_alloc_attrs(d, s, h, f, NULL) > > > > static inline void *dma_alloc_attrs(struct device *dev, size_t size, > > dma_addr_t *dma_handle, gfp_t flag, > > struct dma_attrs *attrs) > > > > > > I fixed this by > > static void *_dma_alloc_coherent(struct device *dev, size_t size, > > dma_addr_t *dma_handle, gfp_t flag) > > { > > return dma_alloc_coherent(dev, size, dma_handle, flag); > > } > > > > /* allocate the coherent DMA pages */ > > static void *snd_malloc_dev_pages(struct device *dev, size_t size, > > dma_addr_t *dma) > > { > > return _snd_malloc_dev_pages(dev, size, dma, _dma_alloc_coherent); > > } > > I think all dma_alloc_* functions use dma_alloc_attrs internally these days. > I think it might be a better idea just to use dma_alloc_attrs in > __snd_malloc_dev_pages and just pass a dma_attrs struct instead of a function. > > Something like: > > static void *__snd_malloc_dev_pages(struct device *dev, size_t size, > dma_addr_t *dma, struct dma_attrs *attrs) > { > .... > res = dma_alloc_attrs(dev, PAGE_SIZE << pg, dma, gfp_flags, attrs); > .... > } > > > static void *snd_malloc_dev_pages(struct device *dev, size_t size, > dma_addr_t *dma) > { > return __snd_malloc_dev_pages(dev, size, dma, NULL); > } > > static void *snd_malloc_dev_wc_pages(struct device *dev, size_t size, > dma_addr_t *dma) > { > DEFINE_DMA_ATTRS(attrs); > dma_set_attr(DMA_ATTR_WRITE_COMBINE, &attrs); > > return __snd_malloc_dev_pages(dev, size, dma, &attrs); > } > > Same applies for freeing the memory again. Yes, that'd be cleaner. But I prefer the code still workable on 3.5-base kernel, which makes easier to test and merge for 3.6, at first. So, let's clean up these indirect calls once after all things are settled down at 3.6-rc1. It can be applied even before 3.6-rc2. Takashi