From: Stefano Stabellini <sstabellini@kernel.org>
To: Christoph Hellwig <hch@lst.de>
Cc: Julien Grall <julien.grall@arm.com>,
Stefano Stabellini <sstabellini@kernel.org>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
x86@kernel.org, linux-kernel@vger.kernel.org,
iommu@lists.linux-foundation.org, xen-devel@lists.xenproject.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [Xen-devel] [PATCH 04/11] xen/arm: remove xen_dma_ops
Date: Thu, 29 Aug 2019 15:42:10 -0700 (PDT) [thread overview]
Message-ID: <alpine.DEB.2.21.1908281458070.8175@sstabellini-ThinkPad-T480s> (raw)
In-Reply-To: <20190826121944.515-5-hch@lst.de>
On Mon, 26 Aug 2019, Christoph Hellwig wrote:
> arm and arm64 can just use xen_swiotlb_dma_ops directly like x86, no
> need for a pointer indirection.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> Reviewed-by: Julien Grall <julien.grall@arm.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
> ---
> arch/arm/mm/dma-mapping.c | 3 ++-
> arch/arm/xen/mm.c | 4 ----
> arch/arm64/mm/dma-mapping.c | 3 ++-
> include/xen/arm/hypervisor.h | 2 --
> 4 files changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
> index 738097396445..2661cad36359 100644
> --- a/arch/arm/mm/dma-mapping.c
> +++ b/arch/arm/mm/dma-mapping.c
> @@ -35,6 +35,7 @@
> #include <asm/mach/map.h>
> #include <asm/system_info.h>
> #include <asm/dma-contiguous.h>
> +#include <xen/swiotlb-xen.h>
>
> #include "dma.h"
> #include "mm.h"
> @@ -2360,7 +2361,7 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,
>
> #ifdef CONFIG_XEN
> if (xen_initial_domain())
> - dev->dma_ops = xen_dma_ops;
> + dev->dma_ops = &xen_swiotlb_dma_ops;
> #endif
> dev->archdata.dma_ops_setup = true;
> }
> diff --git a/arch/arm/xen/mm.c b/arch/arm/xen/mm.c
> index 14210ebdea1a..9b3a6c0ca681 100644
> --- a/arch/arm/xen/mm.c
> +++ b/arch/arm/xen/mm.c
> @@ -163,16 +163,12 @@ void xen_destroy_contiguous_region(phys_addr_t pstart, unsigned int order)
> }
> EXPORT_SYMBOL_GPL(xen_destroy_contiguous_region);
>
> -const struct dma_map_ops *xen_dma_ops;
> -EXPORT_SYMBOL(xen_dma_ops);
> -
> int __init xen_mm_init(void)
> {
> struct gnttab_cache_flush cflush;
> if (!xen_initial_domain())
> return 0;
> xen_swiotlb_init(1, false);
> - xen_dma_ops = &xen_swiotlb_dma_ops;
>
> cflush.op = 0;
> cflush.a.dev_bus_addr = 0;
> diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
> index bd2b039f43a6..4b244a037349 100644
> --- a/arch/arm64/mm/dma-mapping.c
> +++ b/arch/arm64/mm/dma-mapping.c
> @@ -8,6 +8,7 @@
> #include <linux/cache.h>
> #include <linux/dma-noncoherent.h>
> #include <linux/dma-iommu.h>
> +#include <xen/swiotlb-xen.h>
>
> #include <asm/cacheflush.h>
>
> @@ -64,6 +65,6 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,
>
> #ifdef CONFIG_XEN
> if (xen_initial_domain())
> - dev->dma_ops = xen_dma_ops;
> + dev->dma_ops = &xen_swiotlb_dma_ops;
> #endif
> }
> diff --git a/include/xen/arm/hypervisor.h b/include/xen/arm/hypervisor.h
> index 2982571f7cc1..43ef24dd030e 100644
> --- a/include/xen/arm/hypervisor.h
> +++ b/include/xen/arm/hypervisor.h
> @@ -19,8 +19,6 @@ static inline enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
> return PARAVIRT_LAZY_NONE;
> }
>
> -extern const struct dma_map_ops *xen_dma_ops;
> -
> #ifdef CONFIG_XEN
> void __init xen_early_init(void);
> #else
> --
> 2.20.1
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply other threads:[~2019-08-29 22:42 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-26 12:19 [Xen-devel] swiotlb-xen cleanups v2 Christoph Hellwig
2019-08-26 12:19 ` [Xen-devel] [PATCH 01/11] xen/arm: use dma-noncoherent.h calls for xen-swiotlb cache maintainance Christoph Hellwig
2019-08-29 22:41 ` Stefano Stabellini
2019-08-26 12:19 ` [Xen-devel] [PATCH 02/11] xen/arm: use dev_is_dma_coherent Christoph Hellwig
2019-08-29 22:41 ` Stefano Stabellini
2019-08-26 12:19 ` [Xen-devel] [PATCH 03/11] xen/arm: simplify dma_cache_maint Christoph Hellwig
2019-08-27 6:37 ` Christoph Hellwig
2019-08-29 22:49 ` Stefano Stabellini
2019-08-29 22:41 ` Stefano Stabellini
2019-08-26 12:19 ` [Xen-devel] [PATCH 04/11] xen/arm: remove xen_dma_ops Christoph Hellwig
2019-08-29 22:42 ` Stefano Stabellini [this message]
2019-08-26 12:19 ` [Xen-devel] [PATCH 05/11] xen: remove the exports for xen_{create, destroy}_contiguous_region Christoph Hellwig
2019-08-29 22:42 ` Stefano Stabellini
2019-08-26 12:19 ` [Xen-devel] [PATCH 06/11] swiotlb-xen: always use dma-direct helpers to alloc coherent pages Christoph Hellwig
2019-08-29 22:46 ` Stefano Stabellini
2019-08-26 12:19 ` [Xen-devel] [PATCH 07/11] swiotlb-xen: use the same foreign page check everywhere Christoph Hellwig
2019-08-29 22:47 ` Stefano Stabellini
2019-08-26 12:19 ` [Xen-devel] [PATCH 08/11] swiotlb-xen: simplify cache maintainance Christoph Hellwig
2019-08-29 22:47 ` Stefano Stabellini
2019-08-26 12:19 ` [Xen-devel] [PATCH 09/11] swiotlb-xen: remove page-coherent.h Christoph Hellwig
2019-08-29 22:48 ` Stefano Stabellini
2019-08-26 12:19 ` [Xen-devel] [PATCH 10/11] swiotlb-xen: merge xen_unmap_single into xen_swiotlb_unmap_page Christoph Hellwig
2019-08-29 22:48 ` Stefano Stabellini
2019-08-26 12:19 ` [Xen-devel] [PATCH 11/11] arm64: use asm-generic/dma-mapping.h Christoph Hellwig
2019-08-29 22:48 ` Stefano Stabellini
2019-08-29 22:55 ` [Xen-devel] swiotlb-xen cleanups v2 Stefano Stabellini
-- strict thread matches above, loose matches on Subject: below --
2019-08-16 13:00 [Xen-devel] swiotlb-xen cleanups Christoph Hellwig
2019-08-16 13:00 ` [Xen-devel] [PATCH 04/11] xen/arm: remove xen_dma_ops Christoph Hellwig
2019-08-19 11:38 ` Julien Grall
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.21.1908281458070.8175@sstabellini-ThinkPad-T480s \
--to=sstabellini@kernel.org \
--cc=hch@lst.de \
--cc=iommu@lists.linux-foundation.org \
--cc=julien.grall@arm.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xenproject.org \
/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;
as well as URLs for NNTP newsgroup(s).