From: Christoph Hellwig <hch@lst.de>
To: Robin Murphy <robin.murphy@arm.com>
Cc: Joerg Roedel <joro@8bytes.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>,
Tom Lendacky <thomas.lendacky@amd.com>,
iommu@lists.linux-foundation.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 09/25] iommu/dma: Squash __iommu_dma_{map,unmap}_page helpers
Date: Tue, 30 Apr 2019 06:51:58 -0400 [thread overview]
Message-ID: <20190430105214.24628-10-hch@lst.de> (raw)
In-Reply-To: <20190430105214.24628-1-hch@lst.de>
From: Robin Murphy <robin.murphy@arm.com>
The remaining internal callsites don't care about having prototypes
compatible with the relevant dma_map_ops callbacks, so the extra
level of indirection just wastes space and complictaes things.
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/iommu/dma-iommu.c | 25 +++++++------------------
1 file changed, 7 insertions(+), 18 deletions(-)
diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c
index eafc11daa868..82fb208017fb 100644
--- a/drivers/iommu/dma-iommu.c
+++ b/drivers/iommu/dma-iommu.c
@@ -698,18 +698,6 @@ static void iommu_dma_sync_sg_for_device(struct device *dev,
arch_sync_dma_for_device(dev, sg_phys(sg), sg->length, dir);
}
-static dma_addr_t __iommu_dma_map_page(struct device *dev, struct page *page,
- unsigned long offset, size_t size, int prot)
-{
- return __iommu_dma_map(dev, page_to_phys(page) + offset, size, prot);
-}
-
-static void __iommu_dma_unmap_page(struct device *dev, dma_addr_t handle,
- size_t size, enum dma_data_direction dir, unsigned long attrs)
-{
- __iommu_dma_unmap(dev, handle, size);
-}
-
static dma_addr_t iommu_dma_map_page(struct device *dev, struct page *page,
unsigned long offset, size_t size, enum dma_data_direction dir,
unsigned long attrs)
@@ -955,7 +943,8 @@ static void *iommu_dma_alloc(struct device *dev, size_t size,
if (!addr)
return NULL;
- *handle = __iommu_dma_map_page(dev, page, 0, iosize, ioprot);
+ *handle = __iommu_dma_map(dev, page_to_phys(page), iosize,
+ ioprot);
if (*handle == DMA_MAPPING_ERROR) {
if (coherent)
__free_pages(page, get_order(size));
@@ -972,7 +961,7 @@ static void *iommu_dma_alloc(struct device *dev, size_t size,
if (!page)
return NULL;
- *handle = __iommu_dma_map_page(dev, page, 0, iosize, ioprot);
+ *handle = __iommu_dma_map(dev, page_to_phys(page), iosize, ioprot);
if (*handle == DMA_MAPPING_ERROR) {
dma_release_from_contiguous(dev, page,
size >> PAGE_SHIFT);
@@ -986,7 +975,7 @@ static void *iommu_dma_alloc(struct device *dev, size_t size,
arch_dma_prep_coherent(page, iosize);
memset(addr, 0, size);
} else {
- __iommu_dma_unmap_page(dev, *handle, iosize, 0, attrs);
+ __iommu_dma_unmap(dev, *handle, iosize);
dma_release_from_contiguous(dev, page,
size >> PAGE_SHIFT);
}
@@ -1025,12 +1014,12 @@ static void iommu_dma_free(struct device *dev, size_t size, void *cpu_addr,
* Hence how dodgy the below logic looks...
*/
if (dma_in_atomic_pool(cpu_addr, size)) {
- __iommu_dma_unmap_page(dev, handle, iosize, 0, 0);
+ __iommu_dma_unmap(dev, handle, iosize);
dma_free_from_pool(cpu_addr, size);
} else if (attrs & DMA_ATTR_FORCE_CONTIGUOUS) {
struct page *page = vmalloc_to_page(cpu_addr);
- __iommu_dma_unmap_page(dev, handle, iosize, 0, attrs);
+ __iommu_dma_unmap(dev, handle, iosize);
dma_release_from_contiguous(dev, page, size >> PAGE_SHIFT);
dma_common_free_remap(cpu_addr, size, VM_USERMAP);
} else if (is_vmalloc_addr(cpu_addr)){
@@ -1041,7 +1030,7 @@ static void iommu_dma_free(struct device *dev, size_t size, void *cpu_addr,
__iommu_dma_free(dev, area->pages, iosize, &handle);
dma_common_free_remap(cpu_addr, size, VM_USERMAP);
} else {
- __iommu_dma_unmap_page(dev, handle, iosize, 0, 0);
+ __iommu_dma_unmap(dev, handle, iosize);
__free_pages(virt_to_page(cpu_addr), get_order(size));
}
}
--
2.20.1
next prev parent reply other threads:[~2019-04-30 10:54 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-30 10:51 implement generic dma_map_ops for IOMMUs v4 Christoph Hellwig
2019-04-30 10:51 ` [PATCH 01/25] arm64/iommu: handle non-remapped addresses in ->mmap and ->get_sgtable Christoph Hellwig
2019-05-03 11:33 ` Catalin Marinas
2019-05-07 6:37 ` Christoph Hellwig
2019-05-07 9:05 ` Will Deacon
2019-04-30 10:51 ` [PATCH 02/25] dma-mapping: add a Kconfig symbol to indicated arch_dma_prep_coherent presence Christoph Hellwig
2019-05-03 11:36 ` Catalin Marinas
2019-04-30 10:51 ` [PATCH 03/25] iommu/dma: Cleanup dma-iommu.h Christoph Hellwig
2019-04-30 10:51 ` [PATCH 04/25] iommu/dma: Remove the flush_page callback Christoph Hellwig
2019-05-03 11:43 ` Catalin Marinas
2019-05-03 11:44 ` Catalin Marinas
2019-04-30 10:51 ` [PATCH 05/25] iommu/dma: Use for_each_sg in iommu_dma_alloc Christoph Hellwig
2019-04-30 10:51 ` [PATCH 06/25] iommu/dma: move the arm64 wrappers to common code Christoph Hellwig
2019-05-03 11:45 ` Catalin Marinas
2019-04-30 10:51 ` [PATCH 07/25] iommu/dma: Move __iommu_dma_map Christoph Hellwig
2019-04-30 10:51 ` [PATCH 08/25] iommu/dma: Move domain lookup into __iommu_dma_{map,unmap} Christoph Hellwig
2019-04-30 10:51 ` Christoph Hellwig [this message]
2019-04-30 10:51 ` [PATCH 10/25] iommu/dma: Factor out remapped pages lookup Christoph Hellwig
2019-04-30 10:52 ` [PATCH 11/25] iommu/dma: Refactor the page array remapping allocator Christoph Hellwig
2019-04-30 10:52 ` [PATCH 12/25] iommu/dma: Remove __iommu_dma_free Christoph Hellwig
2019-04-30 10:52 ` [PATCH 13/25] iommu/dma: Refactor iommu_dma_free Christoph Hellwig
2019-04-30 10:52 ` [PATCH 14/25] iommu/dma: Refactor iommu_dma_alloc Christoph Hellwig
2019-04-30 10:52 ` [PATCH 15/25] iommu/dma: Don't remap CMA unnecessarily Christoph Hellwig
2019-04-30 10:52 ` [PATCH 16/25] iommu/dma: Merge the CMA and alloc_pages allocation paths Christoph Hellwig
2019-04-30 10:52 ` [PATCH 17/25] iommu/dma: Split iommu_dma_free Christoph Hellwig
2019-04-30 10:52 ` [PATCH 18/25] iommu/dma: Cleanup variable naming in iommu_dma_alloc Christoph Hellwig
2019-04-30 10:52 ` [PATCH 19/25] iommu/dma: Refactor iommu_dma_alloc, part 2 Christoph Hellwig
2019-04-30 10:52 ` [PATCH 20/25] iommu/dma: Refactor iommu_dma_get_sgtable Christoph Hellwig
2019-04-30 10:52 ` [PATCH 21/25] iommu/dma: Refactor iommu_dma_mmap Christoph Hellwig
2019-04-30 10:52 ` [PATCH 22/25] iommu/dma: Don't depend on CONFIG_DMA_DIRECT_REMAP Christoph Hellwig
2019-04-30 10:52 ` [PATCH 23/25] iommu/dma: Switch copyright boilerplace to SPDX Christoph Hellwig
2019-04-30 10:52 ` [PATCH 24/25] arm64: switch copyright boilerplace to SPDX in dma-mapping.c Christoph Hellwig
2019-05-03 11:45 ` Catalin Marinas
2019-04-30 10:52 ` [PATCH 25/25] arm64: trim includes " Christoph Hellwig
2019-05-03 11:46 ` Catalin Marinas
2019-05-02 13:22 ` implement generic dma_map_ops for IOMMUs v4 Christoph Hellwig
2019-05-03 11:47 ` Catalin Marinas
2019-05-03 11:59 ` Christoph Hellwig
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=20190430105214.24628-10-hch@lst.de \
--to=hch@lst.de \
--cc=catalin.marinas@arm.com \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robin.murphy@arm.com \
--cc=thomas.lendacky@amd.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;
as well as URLs for NNTP newsgroup(s).