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 11/31] sparc/iommu: handle page-less SG entries
Date: Wed, 12 Aug 2015 09:05:30 +0200 [thread overview]
Message-ID: <1439363150-8661-12-git-send-email-hch@lst.de> (raw)
In-Reply-To: <1439363150-8661-1-git-send-email-hch@lst.de>
Use sg_phys() instead of __pa(sg_virt(sg)) so that we don't
require a kernel virtual address.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/sparc/kernel/iommu.c | 2 +-
arch/sparc/kernel/iommu_common.h | 4 +---
arch/sparc/kernel/pci_sun4v.c | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/arch/sparc/kernel/iommu.c b/arch/sparc/kernel/iommu.c
index 5320689..2ad89d2 100644
--- a/arch/sparc/kernel/iommu.c
+++ b/arch/sparc/kernel/iommu.c
@@ -486,7 +486,7 @@ static int dma_4u_map_sg(struct device *dev, struct scatterlist *sglist,
continue;
}
/* Allocate iommu entries for that segment */
- paddr = (unsigned long) SG_ENT_PHYS_ADDRESS(s);
+ paddr = sg_phys(s);
npages = iommu_num_pages(paddr, slen, IO_PAGE_SIZE);
entry = iommu_tbl_range_alloc(dev, &iommu->tbl, npages,
&handle, (unsigned long)(-1), 0);
diff --git a/arch/sparc/kernel/iommu_common.h b/arch/sparc/kernel/iommu_common.h
index b40cec2..8e2c211 100644
--- a/arch/sparc/kernel/iommu_common.h
+++ b/arch/sparc/kernel/iommu_common.h
@@ -33,15 +33,13 @@
*/
#define IOMMU_PAGE_SHIFT 13
-#define SG_ENT_PHYS_ADDRESS(SG) (__pa(sg_virt((SG))))
-
static inline int is_span_boundary(unsigned long entry,
unsigned long shift,
unsigned long boundary_size,
struct scatterlist *outs,
struct scatterlist *sg)
{
- unsigned long paddr = SG_ENT_PHYS_ADDRESS(outs);
+ unsigned long paddr = sg_phys(outs);
int nr = iommu_num_pages(paddr, outs->dma_length + sg->length,
IO_PAGE_SIZE);
diff --git a/arch/sparc/kernel/pci_sun4v.c b/arch/sparc/kernel/pci_sun4v.c
index d2fe57d..a7a6e41 100644
--- a/arch/sparc/kernel/pci_sun4v.c
+++ b/arch/sparc/kernel/pci_sun4v.c
@@ -370,7 +370,7 @@ static int dma_4v_map_sg(struct device *dev, struct scatterlist *sglist,
continue;
}
/* Allocate iommu entries for that segment */
- paddr = (unsigned long) SG_ENT_PHYS_ADDRESS(s);
+ paddr = sg_phys(s);
npages = iommu_num_pages(paddr, slen, IO_PAGE_SIZE);
entry = iommu_tbl_range_alloc(dev, &iommu->tbl, npages,
&handle, (unsigned long)(-1), 0);
--
1.9.1
next prev parent reply other threads:[~2015-08-12 7:09 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 ` [PATCH 02/31] scatterlist: use sg_phys() Christoph Hellwig
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 ` Christoph Hellwig [this message]
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-12-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).