From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
To: Julien Grall <julien.grall@citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
<xen-devel@lists.xensource.com>, <linux@arm.linux.org.uk>,
<Ian.Campbell@citrix.com>, <will.deacon@arm.com>,
<linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>, <ben-linux@fluff.org>,
<kgene.kim@samsung.com>, <linux-samsung-soc@vger.kernel.org>
Subject: Re: [Xen-devel] [PATCH v5 02/13] arm: introduce a global dma_ops pointer
Date: Thu, 5 Sep 2013 17:39:43 +0100 [thread overview]
Message-ID: <alpine.DEB.2.02.1309051736130.6397@kaball.uk.xensource.com> (raw)
In-Reply-To: <5224A47A.3010704@citrix.com>
On Mon, 2 Sep 2013, Julien Grall wrote:
> On 08/29/2013 07:32 PM, Stefano Stabellini wrote:
> > Initially set dma_ops to arm_dma_ops.
> >
> >
> > Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> > Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> > CC: will.deacon@arm.com
> > CC: linux@arm.linux.org.uk
> >
> >
> > Changes in v3:
> > - keep using arm_dma_ops in dmabounce.
> > ---
> > arch/arm/include/asm/dma-mapping.h | 3 ++-
> > arch/arm/mm/dma-mapping.c | 3 +++
> > 2 files changed, 5 insertions(+), 1 deletions(-)
> >
> > diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h
> > index 0982206..7d6e4f9 100644
> > --- a/arch/arm/include/asm/dma-mapping.h
> > +++ b/arch/arm/include/asm/dma-mapping.h
> > @@ -13,6 +13,7 @@
> > #include <asm/cacheflush.h>
> >
> > #define DMA_ERROR_CODE (~0)
> > +extern struct dma_map_ops *dma_ops;
>
> Hi,
>
> I tried to build your swiotlb patch series for the Arndale. I have a compilation
> error because dma_ops is already used in samsung sound driver (sound/soc/samsung/dma.c).
>
> This small fix allow me to built this serie for the Arndale.
> Do I need to send it separately?
This looks like a good fix, I'll append it to the series
> =======================================================================
> commit 73d4ceded87f52fa958b92d8d8d65be485e90857
> Author: Julien Grall <julien.grall@linaro.org>
> Date: Mon Sep 2 15:36:35 2013 +0100
>
> ASoC: Samsung: Rename dma_ops by samsung_dma_ops
>
> The commit "arm: introduce a global dma_ops pointer" introduce compilation issue
> when CONFIG_SND_SOC_SAMSUNG is enabled.
>
> sound/soc/samsung/dma.c:345:27: error: conflicting types for 'dma_ops'
> /local/home/julien/works/arndale/linux/arch/arm/include/asm/dma-mapping.h:16:28:
> note: previous declaration of 'dma_ops' was here
>
> Signed-off-by: Julien Grall <julien.grall@linaro.org>
>
> diff --git a/sound/soc/samsung/dma.c b/sound/soc/samsung/dma.c
> index ddea134..c341603 100644
> --- a/sound/soc/samsung/dma.c
> +++ b/sound/soc/samsung/dma.c
> @@ -342,7 +342,7 @@ static int dma_mmap(struct snd_pcm_substream *substream,
> runtime->dma_bytes);
> }
>
> -static struct snd_pcm_ops dma_ops = {
> +static struct snd_pcm_ops samsung_dma_ops = {
> .open = dma_open,
> .close = dma_close,
> .ioctl = snd_pcm_lib_ioctl,
> @@ -429,7 +429,7 @@ out:
> }
>
> static struct snd_soc_platform_driver samsung_asoc_platform = {
> - .ops = &dma_ops,
> + .ops = &samsung_dma_ops,
> .pcm_new = dma_new,
> .pcm_free = dma_free_dma_buffers,
> };
>
> --
> Julien Grall
>
next prev parent reply other threads:[~2013-09-05 16:52 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-29 18:31 [PATCH v5 0/13] enable swiotlb-xen on arm and arm64 Stefano Stabellini
2013-08-29 18:32 ` [PATCH v5 01/13] arm: make SWIOTLB available Stefano Stabellini
2013-08-29 18:32 ` [PATCH v5 02/13] arm: introduce a global dma_ops pointer Stefano Stabellini
2013-09-02 14:45 ` [Xen-devel] " Julien Grall
2013-09-05 16:39 ` Stefano Stabellini [this message]
2013-08-29 18:32 ` [PATCH v5 03/13] arm64: define DMA_ERROR_CODE Stefano Stabellini
2013-09-05 16:05 ` Catalin Marinas
2013-09-05 16:54 ` Stefano Stabellini
2013-08-29 18:32 ` [PATCH v5 04/13] arm64: do not initialize arm64_swiotlb if dma_ops is already set Stefano Stabellini
2013-08-29 18:32 ` [PATCH v5 05/13] xen/arm,arm64: move Xen initialization earlier Stefano Stabellini
2013-09-05 16:20 ` Catalin Marinas
2013-09-05 16:59 ` Stefano Stabellini
2013-09-06 8:58 ` Ian Campbell
2013-09-06 14:09 ` Catalin Marinas
2013-09-06 14:23 ` Konrad Rzeszutek Wilk
2013-09-06 14:53 ` Stefano Stabellini
2013-08-29 18:32 ` [PATCH v5 06/13] xen: introduce XENMEM_exchange_and_pin and XENMEM_unpin Stefano Stabellini
2013-08-29 18:32 ` [PATCH v5 07/13] xen: make xen_create_contiguous_region return the dma address Stefano Stabellini
2013-08-30 13:45 ` Konrad Rzeszutek Wilk
2013-08-29 18:32 ` [PATCH v5 08/13] swiotlb-xen: support autotranslate guests Stefano Stabellini
2013-08-30 13:46 ` Konrad Rzeszutek Wilk
2013-08-29 18:32 ` [PATCH v5 09/13] xen/arm,arm64: enable SWIOTLB_XEN Stefano Stabellini
2013-08-29 18:32 ` [PATCH v5 10/13] swiotlb-xen: introduce xen_swiotlb_set_dma_mask Stefano Stabellini
2013-08-29 18:32 ` [PATCH v5 11/13] xen: introduce xen_alloc/free_coherent_pages Stefano Stabellini
2013-09-05 16:09 ` Catalin Marinas
2013-09-05 16:43 ` Stefano Stabellini
2013-09-06 14:14 ` Catalin Marinas
2013-09-06 14:59 ` Stefano Stabellini
2013-09-06 15:59 ` Catalin Marinas
2013-09-06 16:09 ` Stefano Stabellini
2013-09-06 16:20 ` Catalin Marinas
2013-09-06 16:52 ` Stefano Stabellini
2013-09-09 15:51 ` Catalin Marinas
2013-09-09 16:46 ` Stefano Stabellini
2013-09-11 9:36 ` Catalin Marinas
2013-09-11 17:34 ` Stefano Stabellini
2013-09-12 13:53 ` Catalin Marinas
2013-09-12 14:44 ` Stefano Stabellini
2013-09-12 15:04 ` Catalin Marinas
2013-08-29 18:32 ` [PATCH v5 12/13] swiotlb-xen: use xen_alloc/free_coherent_pages Stefano Stabellini
2013-08-30 13:53 ` Konrad Rzeszutek Wilk
2013-09-05 16:50 ` Stefano Stabellini
2013-09-06 14:17 ` Konrad Rzeszutek Wilk
2013-09-06 15:04 ` Stefano Stabellini
2013-08-29 18:32 ` [PATCH v5 13/13] swiotlb: don't assume that io_tlb_start-io_tlb_end is coherent Stefano Stabellini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.02.1309051736130.6397@kaball.uk.xensource.com \
--to=stefano.stabellini@eu.citrix.com \
--cc=Ian.Campbell@citrix.com \
--cc=ben-linux@fluff.org \
--cc=julien.grall@citrix.com \
--cc=kgene.kim@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=will.deacon@arm.com \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®