From: Stefano Stabellini <sstabellini@kernel.org> To: jgross@suse.com, boris.ostrovsky@oracle.com, konrad.wilk@oracle.com Cc: sstabellini@kernel.org, xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org, Stefano Stabellini <stefano.stabellini@xilinx.com> Subject: [PATCH 09/10] xen/arm: introduce phys/dma translations in xen_dma_sync_for_* Date: Wed, 20 May 2020 16:45:19 -0700 [thread overview] Message-ID: <20200520234520.22563-9-sstabellini@kernel.org> (raw) In-Reply-To: <alpine.DEB.2.21.2005201628330.27502@sstabellini-ThinkPad-T480s> From: Stefano Stabellini <stefano.stabellini@xilinx.com> Add phys_to_dma/dma_to_phys calls to xen_dma_sync_for_cpu, xen_dma_sync_for_device, and xen_arch_need_swiotlb. In xen_arch_need_swiotlb, take the opportunity to switch to the simpler pfn_valid check we use everywhere else. dma_cache_maint is fixed by the next patch. Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com> --- arch/arm/xen/mm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/xen/mm.c b/arch/arm/xen/mm.c index f2414ea40a79..7639251bcc79 100644 --- a/arch/arm/xen/mm.c +++ b/arch/arm/xen/mm.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only #include <linux/cpu.h> +#include <linux/dma-direct.h> #include <linux/dma-noncoherent.h> #include <linux/gfp.h> #include <linux/highmem.h> @@ -75,7 +76,7 @@ void xen_dma_sync_for_cpu(struct device *dev, dma_addr_t handle, phys_addr_t paddr, size_t size, enum dma_data_direction dir) { - if (pfn_valid(PFN_DOWN(handle))) + if (pfn_valid(PFN_DOWN(dma_to_phys(dev, handle)))) arch_sync_dma_for_cpu(paddr, size, dir); else if (dir != DMA_TO_DEVICE) dma_cache_maint(handle, size, GNTTAB_CACHE_INVAL); @@ -85,7 +86,7 @@ void xen_dma_sync_for_device(struct device *dev, dma_addr_t handle, phys_addr_t paddr, size_t size, enum dma_data_direction dir) { - if (pfn_valid(PFN_DOWN(handle))) + if (pfn_valid(PFN_DOWN(dma_to_phys(dev, handle)))) arch_sync_dma_for_device(paddr, size, dir); else if (dir == DMA_FROM_DEVICE) dma_cache_maint(handle, size, GNTTAB_CACHE_INVAL); @@ -97,8 +98,7 @@ bool xen_arch_need_swiotlb(struct device *dev, phys_addr_t phys, dma_addr_t dev_addr) { - unsigned int xen_pfn = XEN_PFN_DOWN(phys); - unsigned int bfn = XEN_PFN_DOWN(dev_addr); + unsigned int bfn = XEN_PFN_DOWN(dma_to_phys(dev, dev_addr)); /* * The swiotlb buffer should be used if @@ -115,7 +115,7 @@ bool xen_arch_need_swiotlb(struct device *dev, * require a bounce buffer because the device doesn't support coherent * memory and we are not able to flush the cache. */ - return (!hypercall_cflush && (xen_pfn != bfn) && + return (!hypercall_cflush && !pfn_valid(bfn) && !dev_is_dma_coherent(dev)); } -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Stefano Stabellini <sstabellini@kernel.org> To: jgross@suse.com, boris.ostrovsky@oracle.com, konrad.wilk@oracle.com Cc: xen-devel@lists.xenproject.org, sstabellini@kernel.org, linux-kernel@vger.kernel.org, Stefano Stabellini <stefano.stabellini@xilinx.com> Subject: [PATCH 09/10] xen/arm: introduce phys/dma translations in xen_dma_sync_for_* Date: Wed, 20 May 2020 16:45:19 -0700 [thread overview] Message-ID: <20200520234520.22563-9-sstabellini@kernel.org> (raw) In-Reply-To: <alpine.DEB.2.21.2005201628330.27502@sstabellini-ThinkPad-T480s> From: Stefano Stabellini <stefano.stabellini@xilinx.com> Add phys_to_dma/dma_to_phys calls to xen_dma_sync_for_cpu, xen_dma_sync_for_device, and xen_arch_need_swiotlb. In xen_arch_need_swiotlb, take the opportunity to switch to the simpler pfn_valid check we use everywhere else. dma_cache_maint is fixed by the next patch. Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com> --- arch/arm/xen/mm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/xen/mm.c b/arch/arm/xen/mm.c index f2414ea40a79..7639251bcc79 100644 --- a/arch/arm/xen/mm.c +++ b/arch/arm/xen/mm.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only #include <linux/cpu.h> +#include <linux/dma-direct.h> #include <linux/dma-noncoherent.h> #include <linux/gfp.h> #include <linux/highmem.h> @@ -75,7 +76,7 @@ void xen_dma_sync_for_cpu(struct device *dev, dma_addr_t handle, phys_addr_t paddr, size_t size, enum dma_data_direction dir) { - if (pfn_valid(PFN_DOWN(handle))) + if (pfn_valid(PFN_DOWN(dma_to_phys(dev, handle)))) arch_sync_dma_for_cpu(paddr, size, dir); else if (dir != DMA_TO_DEVICE) dma_cache_maint(handle, size, GNTTAB_CACHE_INVAL); @@ -85,7 +86,7 @@ void xen_dma_sync_for_device(struct device *dev, dma_addr_t handle, phys_addr_t paddr, size_t size, enum dma_data_direction dir) { - if (pfn_valid(PFN_DOWN(handle))) + if (pfn_valid(PFN_DOWN(dma_to_phys(dev, handle)))) arch_sync_dma_for_device(paddr, size, dir); else if (dir == DMA_FROM_DEVICE) dma_cache_maint(handle, size, GNTTAB_CACHE_INVAL); @@ -97,8 +98,7 @@ bool xen_arch_need_swiotlb(struct device *dev, phys_addr_t phys, dma_addr_t dev_addr) { - unsigned int xen_pfn = XEN_PFN_DOWN(phys); - unsigned int bfn = XEN_PFN_DOWN(dev_addr); + unsigned int bfn = XEN_PFN_DOWN(dma_to_phys(dev, dev_addr)); /* * The swiotlb buffer should be used if @@ -115,7 +115,7 @@ bool xen_arch_need_swiotlb(struct device *dev, * require a bounce buffer because the device doesn't support coherent * memory and we are not able to flush the cache. */ - return (!hypercall_cflush && (xen_pfn != bfn) && + return (!hypercall_cflush && !pfn_valid(bfn) && !dev_is_dma_coherent(dev)); } -- 2.17.1
next prev parent reply other threads:[~2020-05-20 23:45 UTC|newest] Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-05-20 23:45 [PATCH 00/10] fix swiotlb-xen for RPi4 Stefano Stabellini 2020-05-20 23:45 ` Stefano Stabellini 2020-05-20 23:45 ` [PATCH 01/10] swiotlb-xen: use vmalloc_to_page on vmalloc virt addresses Stefano Stabellini 2020-05-20 23:45 ` Stefano Stabellini 2020-05-21 8:01 ` Julien Grall 2020-05-21 8:01 ` Julien Grall 2020-05-22 3:54 ` Stefano Stabellini 2020-05-22 3:54 ` Stefano Stabellini 2020-05-22 18:11 ` Julien Grall 2020-05-22 18:11 ` Julien Grall 2020-05-22 20:36 ` Stefano Stabellini 2020-05-22 20:36 ` Stefano Stabellini 2020-05-20 23:45 ` [PATCH 02/10] swiotlb-xen: remove start_dma_addr Stefano Stabellini 2020-05-20 23:45 ` Stefano Stabellini 2020-05-21 8:05 ` Julien Grall 2020-05-21 8:05 ` Julien Grall 2020-05-22 3:55 ` Stefano Stabellini 2020-05-22 3:55 ` Stefano Stabellini 2020-05-22 18:16 ` Julien Grall 2020-05-22 18:16 ` Julien Grall 2020-05-22 20:47 ` Stefano Stabellini 2020-05-22 20:47 ` Stefano Stabellini 2020-05-20 23:45 ` [PATCH 03/10] swiotlb-xen: add struct device* parameter to xen_phys_to_bus Stefano Stabellini 2020-05-20 23:45 ` Stefano Stabellini 2020-05-20 23:45 ` [PATCH 04/10] swiotlb-xen: add struct device* parameter to xen_bus_to_phys Stefano Stabellini 2020-05-20 23:45 ` Stefano Stabellini 2020-05-20 23:45 ` [PATCH 05/10] swiotlb-xen: add struct device* parameter to xen_dma_sync_for_cpu Stefano Stabellini 2020-05-20 23:45 ` Stefano Stabellini 2020-05-20 23:45 ` [PATCH 06/10] swiotlb-xen: add struct device* parameter to xen_dma_sync_for_device Stefano Stabellini 2020-05-20 23:45 ` Stefano Stabellini 2020-05-20 23:45 ` [PATCH 07/10] swiotlb-xen: add struct device* parameter to is_xen_swiotlb_buffer Stefano Stabellini 2020-05-20 23:45 ` Stefano Stabellini 2020-05-20 23:45 ` [PATCH 08/10] swiotlb-xen: introduce phys_to_dma/dma_to_phys translations Stefano Stabellini 2020-05-20 23:45 ` Stefano Stabellini 2020-05-21 8:07 ` Julien Grall 2020-05-21 8:07 ` Julien Grall 2020-05-21 22:59 ` Boris Ostrovsky 2020-05-21 22:59 ` Boris Ostrovsky 2020-05-22 17:34 ` Stefano Stabellini 2020-05-22 17:34 ` Stefano Stabellini 2020-05-22 18:29 ` Boris Ostrovsky 2020-05-22 18:29 ` Boris Ostrovsky 2020-05-20 23:45 ` Stefano Stabellini [this message] 2020-05-20 23:45 ` [PATCH 09/10] xen/arm: introduce phys/dma translations in xen_dma_sync_for_* Stefano Stabellini 2020-05-21 8:18 ` Julien Grall 2020-05-21 8:18 ` Julien Grall 2020-05-21 20:08 ` Stefano Stabellini 2020-05-21 20:08 ` Stefano Stabellini 2020-05-21 20:17 ` Julien Grall 2020-05-21 20:17 ` Julien Grall 2020-05-20 23:45 ` [PATCH 10/10] xen/arm: call dma_to_phys on the dma_addr_t parameter of dma_cache_maint Stefano Stabellini 2020-05-20 23:45 ` Stefano Stabellini 2020-05-21 8:25 ` Julien Grall 2020-05-21 8:25 ` Julien Grall 2020-05-20 23:51 ` [PATCH 00/10] fix swiotlb-xen for RPi4 Roman Shaposhnik 2020-05-20 23:51 ` Roman Shaposhnik 2020-05-20 23:56 ` Stefano Stabellini 2020-05-20 23:56 ` Stefano Stabellini 2020-06-02 21:51 ` Stefano Stabellini 2020-06-02 21:51 ` Stefano Stabellini 2020-06-03 0:15 ` Boris Ostrovsky 2020-06-03 0:15 ` Boris Ostrovsky
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=20200520234520.22563-9-sstabellini@kernel.org \ --to=sstabellini@kernel.org \ --cc=boris.ostrovsky@oracle.com \ --cc=jgross@suse.com \ --cc=konrad.wilk@oracle.com \ --cc=linux-kernel@vger.kernel.org \ --cc=stefano.stabellini@xilinx.com \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.