From: Christoph Hellwig <hch@lst.de>
To: torvalds@linux-foundation.org, axboe@kernel.dk
Cc: dan.j.williams@intel.com, vgupta@synopsys.com,
hskinnemoen@gmail.com, egtvedt@samfundet.no, realmz6@gmail.com,
dhowells@redhat.com, monstr@monstr.eu, x86@kernel.org,
dwmw2@infradead.org, alex.williamson@redhat.com,
grundler@parisc-linux.org, linux-kernel@vger.kernel.org,
linux-arch@vger.kernel.org, linux-alpha@vger.kernel.org,
linux-ia64@vger.kernel.org, linux-metag@vger.kernel.org,
linux-mips@linux-mips.org, linux-parisc@vger.kernel.org,
linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org,
sparclinux@vger.kernel.org, linux-xtensa@linux-xtensa.org,
linux-nvdimm@ml01.01.org, linux-media@vger.kernel.org
Subject: [PATCH 02/31] scatterlist: use sg_phys()
Date: Wed, 12 Aug 2015 09:05:21 +0200 [thread overview]
Message-ID: <1439363150-8661-3-git-send-email-hch@lst.de> (raw)
In-Reply-To: <1439363150-8661-1-git-send-email-hch@lst.de>
From: Dan Williams <dan.j.williams@intel.com>
Coccinelle cleanup to replace open coded sg to physical address
translations. This is in preparation for introducing scatterlists that
reference __pfn_t.
// sg_phys.cocci: convert usage page_to_phys(sg_page(sg)) to sg_phys(sg)
// usage: make coccicheck COCCI=sg_phys.cocci MODE=patch
virtual patch
@@
struct scatterlist *sg;
@@
- page_to_phys(sg_page(sg)) + sg->offset
+ sg_phys(sg)
@@
struct scatterlist *sg;
@@
- page_to_phys(sg_page(sg))
+ sg_phys(sg) & PAGE_MASK
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---
arch/arm/mm/dma-mapping.c | 2 +-
arch/microblaze/kernel/dma.c | 3 +--
drivers/iommu/intel-iommu.c | 4 ++--
drivers/iommu/iommu.c | 2 +-
drivers/staging/android/ion/ion_chunk_heap.c | 4 ++--
5 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index cba12f3..3d3d6aa 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -1520,7 +1520,7 @@ static int __map_sg_chunk(struct device *dev, struct scatterlist *sg,
return -ENOMEM;
for (count = 0, s = sg; count < (size >> PAGE_SHIFT); s = sg_next(s)) {
- phys_addr_t phys = page_to_phys(sg_page(s));
+ phys_addr_t phys = sg_phys(s) & PAGE_MASK;
unsigned int len = PAGE_ALIGN(s->offset + s->length);
if (!is_coherent &&
diff --git a/arch/microblaze/kernel/dma.c b/arch/microblaze/kernel/dma.c
index bf4dec2..c89da63 100644
--- a/arch/microblaze/kernel/dma.c
+++ b/arch/microblaze/kernel/dma.c
@@ -61,8 +61,7 @@ static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl,
/* FIXME this part of code is untested */
for_each_sg(sgl, sg, nents, i) {
sg->dma_address = sg_phys(sg);
- __dma_sync(page_to_phys(sg_page(sg)) + sg->offset,
- sg->length, direction);
+ __dma_sync(sg_phys(sg), sg->length, direction);
}
return nents;
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 0649b94..3541d65 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -2097,7 +2097,7 @@ static int __domain_mapping(struct dmar_domain *domain, unsigned long iov_pfn,
sg_res = aligned_nrpages(sg->offset, sg->length);
sg->dma_address = ((dma_addr_t)iov_pfn << VTD_PAGE_SHIFT) + sg->offset;
sg->dma_length = sg->length;
- pteval = page_to_phys(sg_page(sg)) | prot;
+ pteval = (sg_phys(sg) & PAGE_MASK) | prot;
phys_pfn = pteval >> VTD_PAGE_SHIFT;
}
@@ -3623,7 +3623,7 @@ static int intel_nontranslate_map_sg(struct device *hddev,
for_each_sg(sglist, sg, nelems, i) {
BUG_ON(!sg_page(sg));
- sg->dma_address = page_to_phys(sg_page(sg)) + sg->offset;
+ sg->dma_address = sg_phys(sg);
sg->dma_length = sg->length;
}
return nelems;
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index f286090..049df49 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -1408,7 +1408,7 @@ size_t default_iommu_map_sg(struct iommu_domain *domain, unsigned long iova,
min_pagesz = 1 << __ffs(domain->ops->pgsize_bitmap);
for_each_sg(sg, s, nents, i) {
- phys_addr_t phys = page_to_phys(sg_page(s)) + s->offset;
+ phys_addr_t phys = sg_phys(s);
/*
* We are mapping on IOMMU page boundaries, so offset within
diff --git a/drivers/staging/android/ion/ion_chunk_heap.c b/drivers/staging/android/ion/ion_chunk_heap.c
index 5474615..f7b6ef9 100644
--- a/drivers/staging/android/ion/ion_chunk_heap.c
+++ b/drivers/staging/android/ion/ion_chunk_heap.c
@@ -81,7 +81,7 @@ static int ion_chunk_heap_allocate(struct ion_heap *heap,
err:
sg = table->sgl;
for (i -= 1; i >= 0; i--) {
- gen_pool_free(chunk_heap->pool, page_to_phys(sg_page(sg)),
+ gen_pool_free(chunk_heap->pool, sg_phys(sg) & PAGE_MASK,
sg->length);
sg = sg_next(sg);
}
@@ -109,7 +109,7 @@ static void ion_chunk_heap_free(struct ion_buffer *buffer)
DMA_BIDIRECTIONAL);
for_each_sg(table->sgl, sg, table->nents, i) {
- gen_pool_free(chunk_heap->pool, page_to_phys(sg_page(sg)),
+ gen_pool_free(chunk_heap->pool, sg_phys(sg) & PAGE_MASK,
sg->length);
}
chunk_heap->allocated -= allocated_size;
--
1.9.1
next prev parent reply other threads:[~2015-08-12 7:08 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-12 7:05 RFC: prepare for struct scatterlist entries without page backing Christoph Hellwig
2015-08-12 7:05 ` [PATCH 01/31] scatterlist: add sg_pfn and sg_has_page helpers Christoph Hellwig
2015-08-12 7:05 ` Christoph Hellwig [this message]
2015-08-12 7:05 ` [PATCH 03/31] dma-debug: handle page-less SG entries Christoph Hellwig
2015-08-12 7:05 ` [PATCH 04/31] x86/pci-nommu: " Christoph Hellwig
2015-08-12 7:05 ` [PATCH 05/31] x86/pci-calgary: " Christoph Hellwig
2015-08-12 7:05 ` [PATCH 06/31] alpha/pci-noop: " Christoph Hellwig
2015-08-12 7:05 ` [PATCH 07/31] alpha/pci_iommu: " Christoph Hellwig
2015-08-12 7:05 ` [PATCH 08/31] c6x: " Christoph Hellwig
2015-08-12 7:05 ` [PATCH 09/31] ia64/pci_dma: " Christoph Hellwig
2015-08-12 7:05 ` [PATCH 10/31] powerpc/iommu: " Christoph Hellwig
2015-08-12 7:05 ` [PATCH 11/31] sparc/iommu: " Christoph Hellwig
2015-08-12 7:05 ` [PATCH 12/31] mn10300: " Christoph Hellwig
2015-08-12 7:05 ` [PATCH 13/31] sparc/ldc: " Christoph Hellwig
2015-08-12 7:05 ` [PATCH 14/31] sparc32/io-unit: " Christoph Hellwig
2015-08-12 7:05 ` [PATCH 15/31] sparc32/iommu: " Christoph Hellwig
2015-08-12 7:05 ` [PATCH 16/31] s390: " Christoph Hellwig
2015-08-12 11:51 ` Sebastian Ott
2015-08-12 7:05 ` [PATCH 17/31] ia64/sba_iommu: remove sba_sg_address Christoph Hellwig
2015-08-12 7:05 ` [PATCH 18/31] nios2: handle page-less SG entries Christoph Hellwig
2015-08-12 7:05 ` [PATCH 19/31] arc: " Christoph Hellwig
2015-08-12 10:28 ` Vineet Gupta
2015-08-12 7:05 ` [PATCH 20/31] avr32: " Christoph Hellwig
2015-08-12 9:36 ` Hans-Christian Egtvedt
2015-08-12 7:05 ` [PATCH 21/31] blackfin: " Christoph Hellwig
2015-08-12 7:05 ` [PATCH 22/31] metag: " Christoph Hellwig
2015-08-12 7:05 ` [PATCH 23/31] sh: " Christoph Hellwig
2015-08-12 7:05 ` [PATCH 24/31] xtensa: " Christoph Hellwig
2015-08-12 7:05 ` [PATCH 25/31] frv: " Christoph Hellwig
2015-08-12 7:05 ` [PATCH 26/31] openrisc: " Christoph Hellwig
2015-08-12 7:05 ` [PATCH 27/31] mips: " Christoph Hellwig
2015-08-12 7:05 ` [PATCH 28/31] powerpc: " Christoph Hellwig
2015-08-12 7:05 ` [PATCH 29/31] parisc: " Christoph Hellwig
2015-08-12 16:01 ` Linus Torvalds
2015-08-13 14:31 ` Christoph Hellwig
2015-08-14 3:30 ` Dan Williams
2015-08-14 3:59 ` James Bottomley
2015-08-14 4:11 ` David Miller
2015-08-14 16:17 ` Dan Williams
2015-08-12 7:05 ` [PATCH 30/31] intel-iommu: " Christoph Hellwig
2015-08-12 9:51 ` David Woodhouse
2015-08-12 7:05 ` [PATCH 31/31] dma-mapping-common: skip kmemleak checks for " Christoph Hellwig
2015-08-12 16:05 ` Linus Torvalds
2015-08-13 14:33 ` Christoph Hellwig
2015-08-12 16:26 ` Catalin Marinas
2015-08-12 12:42 ` RFC: prepare for struct scatterlist entries without page backing Boaz Harrosh
2015-08-12 23:37 ` Julian Calaby
2015-08-13 14:35 ` Christoph Hellwig
2015-08-13 23:40 ` Julian Calaby
2015-08-13 14:40 ` Christoph Hellwig
2015-08-13 15:42 ` Boaz Harrosh
2015-08-12 17:00 ` James Bottomley
2015-08-12 17:56 ` Grant Grundler
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=1439363150-8661-3-git-send-email-hch@lst.de \
--to=hch@lst.de \
--cc=alex.williamson@redhat.com \
--cc=axboe@kernel.dk \
--cc=dan.j.williams@intel.com \
--cc=dhowells@redhat.com \
--cc=dwmw2@infradead.org \
--cc=egtvedt@samfundet.no \
--cc=grundler@parisc-linux.org \
--cc=hskinnemoen@gmail.com \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-metag@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-nvdimm@ml01.01.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-xtensa@linux-xtensa.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=monstr@monstr.eu \
--cc=realmz6@gmail.com \
--cc=sparclinux@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=vgupta@synopsys.com \
--cc=x86@kernel.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).