Linux IOMMU Development
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Robin Murphy <robin.murphy@arm.com>
Cc: Tom Murphy <tmurphy@arista.com>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will.deacon@arm.com>,
	linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH 03/24] iommu/dma: Remove the flush_page callback
Date: Mon, 20 May 2019 09:29:27 +0200	[thread overview]
Message-ID: <20190520072948.11412-4-hch@lst.de> (raw)
In-Reply-To: <20190520072948.11412-1-hch@lst.de>

We now have a arch_dma_prep_coherent architecture hook that is used
for the generic DMA remap allocator, and we should use the same
interface for the dma-iommu code.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
---
 arch/arm64/mm/dma-mapping.c | 8 +-------
 drivers/iommu/dma-iommu.c   | 8 +++-----
 include/linux/dma-iommu.h   | 3 +--
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
index 674860e3e478..10a8852c8b6a 100644
--- a/arch/arm64/mm/dma-mapping.c
+++ b/arch/arm64/mm/dma-mapping.c
@@ -104,12 +104,6 @@ arch_initcall(arm64_dma_init);
 #include <linux/platform_device.h>
 #include <linux/amba/bus.h>
 
-/* Thankfully, all cache ops are by VA so we can ignore phys here */
-static void flush_page(struct device *dev, const void *virt, phys_addr_t phys)
-{
-	__dma_flush_area(virt, PAGE_SIZE);
-}
-
 static void *__iommu_alloc_attrs(struct device *dev, size_t size,
 				 dma_addr_t *handle, gfp_t gfp,
 				 unsigned long attrs)
@@ -186,7 +180,7 @@ static void *__iommu_alloc_attrs(struct device *dev, size_t size,
 		struct page **pages;
 
 		pages = iommu_dma_alloc(dev, iosize, gfp, attrs, ioprot,
-					handle, flush_page);
+					handle);
 		if (!pages)
 			return NULL;
 
diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c
index 129c4badf9ae..aac12433ffef 100644
--- a/drivers/iommu/dma-iommu.c
+++ b/drivers/iommu/dma-iommu.c
@@ -22,6 +22,7 @@
 #include <linux/acpi_iort.h>
 #include <linux/device.h>
 #include <linux/dma-iommu.h>
+#include <linux/dma-noncoherent.h>
 #include <linux/gfp.h>
 #include <linux/huge_mm.h>
 #include <linux/iommu.h>
@@ -560,8 +561,6 @@ void iommu_dma_free(struct device *dev, struct page **pages, size_t size,
  * @attrs: DMA attributes for this allocation
  * @prot: IOMMU mapping flags
  * @handle: Out argument for allocated DMA handle
- * @flush_page: Arch callback which must ensure PAGE_SIZE bytes from the
- *		given VA/PA are visible to the given non-coherent device.
  *
  * If @size is less than PAGE_SIZE, then a full CPU page will be allocated,
  * but an IOMMU which supports smaller pages might not map the whole thing.
@@ -570,8 +569,7 @@ void iommu_dma_free(struct device *dev, struct page **pages, size_t size,
  *	   or NULL on failure.
  */
 struct page **iommu_dma_alloc(struct device *dev, size_t size, gfp_t gfp,
-		unsigned long attrs, int prot, dma_addr_t *handle,
-		void (*flush_page)(struct device *, const void *, phys_addr_t))
+		unsigned long attrs, int prot, dma_addr_t *handle)
 {
 	struct iommu_domain *domain = iommu_get_dma_domain(dev);
 	struct iommu_dma_cookie *cookie = domain->iova_cookie;
@@ -615,7 +613,7 @@ struct page **iommu_dma_alloc(struct device *dev, size_t size, gfp_t gfp,
 		 */
 		sg_miter_start(&miter, sgt.sgl, sgt.orig_nents, SG_MITER_FROM_SG);
 		while (sg_miter_next(&miter))
-			flush_page(dev, miter.addr, page_to_phys(miter.page));
+			arch_dma_prep_coherent(miter.page, PAGE_SIZE);
 		sg_miter_stop(&miter);
 	}
 
diff --git a/include/linux/dma-iommu.h b/include/linux/dma-iommu.h
index dfb83f9c24dc..e1ef265b578b 100644
--- a/include/linux/dma-iommu.h
+++ b/include/linux/dma-iommu.h
@@ -44,8 +44,7 @@ int dma_info_to_prot(enum dma_data_direction dir, bool coherent,
  * the arch code to take care of attributes and cache maintenance
  */
 struct page **iommu_dma_alloc(struct device *dev, size_t size, gfp_t gfp,
-		unsigned long attrs, int prot, dma_addr_t *handle,
-		void (*flush_page)(struct device *, const void *, phys_addr_t));
+		unsigned long attrs, int prot, dma_addr_t *handle);
 void iommu_dma_free(struct device *dev, struct page **pages, size_t size,
 		dma_addr_t *handle);
 
-- 
2.20.1

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

  parent reply	other threads:[~2019-05-20  7:31 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-20  7:29 implement generic dma_map_ops for IOMMUs v5 Christoph Hellwig
2019-05-20  7:29 ` [PATCH 01/24] arm64/iommu: handle non-remapped addresses in ->mmap and ->get_sgtable Christoph Hellwig
2019-05-22 12:54   ` Will Deacon
2019-05-20  7:29 ` [PATCH 02/24] iommu/dma: Cleanup dma-iommu.h Christoph Hellwig
2019-05-20  7:29 ` Christoph Hellwig [this message]
2019-05-20  7:29 ` [PATCH 04/24] iommu/dma: Use for_each_sg in iommu_dma_alloc Christoph Hellwig
2019-05-20  7:29 ` [PATCH 05/24] iommu/dma: move the arm64 wrappers to common code Christoph Hellwig
2019-05-20  7:29 ` [PATCH 06/24] iommu/dma: Move __iommu_dma_map Christoph Hellwig
2019-05-20  7:29 ` [PATCH 07/24] iommu/dma: Move domain lookup into __iommu_dma_{map, unmap} Christoph Hellwig
2019-05-22 13:34   ` Robin Murphy
2019-05-22 15:57     ` Christoph Hellwig
2019-07-29 12:12   ` Shameerali Kolothum Thodi
2019-07-29 13:13     ` Robin Murphy
2019-05-20  7:29 ` [PATCH 08/24] iommu/dma: Squash __iommu_dma_{map,unmap}_page helpers Christoph Hellwig
2019-05-20  7:29 ` [PATCH 09/24] iommu/dma: Factor out remapped pages lookup Christoph Hellwig
2019-05-20  7:29 ` [PATCH 10/24] iommu/dma: Refactor the page array remapping allocator Christoph Hellwig
2019-05-20  7:29 ` [PATCH 11/24] iommu/dma: Remove __iommu_dma_free Christoph Hellwig
2019-05-20  7:29 ` [PATCH 12/24] iommu/dma: Refactor iommu_dma_free Christoph Hellwig
2019-05-20  7:29 ` [PATCH 13/24] iommu/dma: Refactor iommu_dma_alloc Christoph Hellwig
2019-05-20  7:29 ` [PATCH 14/24] iommu/dma: Don't remap CMA unnecessarily Christoph Hellwig
2019-05-20  7:29 ` [PATCH 15/24] iommu/dma: Merge the CMA and alloc_pages allocation paths Christoph Hellwig
2019-05-20  7:29 ` [PATCH 16/24] iommu/dma: Split iommu_dma_free Christoph Hellwig
2019-05-20  7:29 ` [PATCH 17/24] iommu/dma: Cleanup variable naming in iommu_dma_alloc Christoph Hellwig
2019-05-20  7:29 ` [PATCH 18/24] iommu/dma: Refactor iommu_dma_alloc, part 2 Christoph Hellwig
2019-05-20  7:29 ` [PATCH 19/24] iommu/dma: Refactor iommu_dma_get_sgtable Christoph Hellwig
2019-05-20  7:29 ` [PATCH 20/24] iommu/dma: Refactor iommu_dma_mmap Christoph Hellwig
2019-05-22 17:11   ` Robin Murphy
2019-05-20  7:29 ` [PATCH 21/24] iommu/dma: Don't depend on CONFIG_DMA_DIRECT_REMAP Christoph Hellwig
2019-05-20  7:29 ` [PATCH 22/24] iommu/dma: Switch copyright boilerplace to SPDX Christoph Hellwig
2019-05-20  7:29 ` [PATCH 23/24] arm64: switch copyright boilerplace to SPDX in dma-mapping.c Christoph Hellwig
2019-05-20  7:29 ` [PATCH 24/24] arm64: trim includes " Christoph Hellwig
2019-05-27 15:37 ` implement generic dma_map_ops for IOMMUs v5 Joerg Roedel
2019-05-27 15:38   ` Christoph Hellwig
2019-05-27 15:45     ` Joerg Roedel

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=20190520072948.11412-4-hch@lst.de \
    --to=hch@lst.de \
    --cc=catalin.marinas@arm.com \
    --cc=iommu@lists.linux-foundation.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=robin.murphy@arm.com \
    --cc=tmurphy@arista.com \
    --cc=will.deacon@arm.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