From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932967AbXGZNEd (ORCPT ); Thu, 26 Jul 2007 09:04:33 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752737AbXGZNEY (ORCPT ); Thu, 26 Jul 2007 09:04:24 -0400 Received: from cantor2.suse.de ([195.135.220.15]:34995 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751866AbXGZNEX (ORCPT ); Thu, 26 Jul 2007 09:04:23 -0400 Date: Thu, 26 Jul 2007 15:04:22 +0200 Message-ID: From: Takashi Iwai To: Sam Ravnborg Cc: Meelis Roos , Linux Kernel list , sparclinux@vger.kernel.org Subject: Re: ALSA & missing dma_*_coherent on sparc32 In-Reply-To: <20070726125834.GA4041@uranus.ravnborg.org> References: <20070726125834.GA4041@uranus.ravnborg.org> User-Agent: Wanderlust/2.15.5 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.7 (=?ISO-8859-4?Q?Sanj=F2?=) APEL/10.6 MULE XEmacs/21.5 (beta27) (fiddleheads) (+CVS-20060704) (i386-suse-linux) 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 X-Mailing-List: linux-kernel@vger.kernel.org At Thu, 26 Jul 2007 14:58:34 +0200, Sam Ravnborg wrote: > > On Thu, Jul 26, 2007 at 02:15:43PM +0200, Takashi Iwai wrote: > > At Thu, 26 Jul 2007 15:02:51 +0300 (EEST), > > Meelis Roos wrote: > > > > > > > > ERROR: "dma_free_coherent" [sound/core/snd-page-alloc.ko] undefined! > > > > > ERROR: "dma_alloc_coherent" [sound/core/snd-page-alloc.ko] undefined! > > > > > > > > Could you show .config? Does it have CONFIG_HAS_DMA? > > > > > > No, CONFIG_NO_DMA=y - and this was recently changed on sparc32 IIRC. > > > > OK, then could you try the patch below? > > Hi Takashi-san. > > Can I ask you to introdue use of the -y syntax for composite objects. > This would simplify soucd/core/Makefile > > The below would then become: > > > > -snd-page-alloc-objs := memalloc.o sgbuf.o > > +snd-page-alloc-y := memalloc.o > > +snd-page-alloc-$(CONFIG_HAS_DMA) += sgbuf.o > > > > snd-rawmidi-objs := rawmidi.o > > snd-timer-objs := timer.o > > Ask if you have questions. Ah, a nice feature. Thanks for hints! The below is the revised version. Takashi [ALSA] Fix build error without CONFIG_HAS_DMA The recent change of include/asm-generic/dma-mapping-broken.h breaks the build without CONFIG_HAS_DMA. This patch is an ad hoc fix. Signed-off-by: Takashi Iwai --- diff -r 4750a3aa4b2c core/Makefile --- a/sound/core/Makefile Thu Jul 26 11:49:22 2007 +0200 +++ b/sound/core/Makefile Thu Jul 26 15:03:09 2007 +0200 @@ -14,7 +14,8 @@ snd-pcm-objs := pcm.o pcm_native.o pcm_l snd-pcm-objs := pcm.o pcm_native.o pcm_lib.o pcm_timer.o pcm_misc.o \ pcm_memory.o -snd-page-alloc-objs := memalloc.o sgbuf.o +snd-page-alloc-y := memalloc.o +snd-page-alloc-$(CONFIG_HAS_DMA) += sgbuf.o snd-rawmidi-objs := rawmidi.o snd-timer-objs := timer.o diff -r 4750a3aa4b2c core/memalloc.c --- a/sound/core/memalloc.c Thu Jul 26 11:49:22 2007 +0200 +++ b/sound/core/memalloc.c Thu Jul 26 15:03:09 2007 +0200 @@ -205,6 +205,7 @@ void snd_free_pages(void *ptr, size_t si * */ +#ifdef CONFIG_HAS_DMA /* allocate the coherent DMA pages */ static void *snd_malloc_dev_pages(struct device *dev, size_t size, dma_addr_t *dma) { @@ -238,6 +239,7 @@ static void snd_free_dev_pages(struct de dec_snd_pages(pg); dma_free_coherent(dev, PAGE_SIZE << pg, ptr, dma); } +#endif /* CONFIG_HAS_DMA */ #ifdef CONFIG_SBUS @@ -311,12 +313,14 @@ int snd_dma_alloc_pages(int type, struct dmab->area = snd_malloc_sbus_pages(device, size, &dmab->addr); break; #endif +#ifdef CONFIG_HAS_DMA case SNDRV_DMA_TYPE_DEV: dmab->area = snd_malloc_dev_pages(device, size, &dmab->addr); break; case SNDRV_DMA_TYPE_DEV_SG: snd_malloc_sgbuf_pages(device, size, dmab, NULL); break; +#endif default: printk(KERN_ERR "snd-malloc: invalid device type %d\n", type); dmab->area = NULL; @@ -382,12 +386,14 @@ void snd_dma_free_pages(struct snd_dma_b snd_free_sbus_pages(dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr); break; #endif +#ifdef CONFIG_HAS_DMA case SNDRV_DMA_TYPE_DEV: snd_free_dev_pages(dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr); break; case SNDRV_DMA_TYPE_DEV_SG: snd_free_sgbuf_pages(dmab); break; +#endif default: printk(KERN_ERR "snd-malloc: invalid device type %d\n", dmab->dev.type); }