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 17/31] ia64/sba_iommu: remove sba_sg_address
Date: Wed, 12 Aug 2015 09:05:36 +0200 [thread overview]
Message-ID: <1439363150-8661-18-git-send-email-hch@lst.de> (raw)
In-Reply-To: <1439363150-8661-1-git-send-email-hch@lst.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/ia64/hp/common/sba_iommu.c | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
index 344387a..9e5aa8e 100644
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
@@ -248,8 +248,6 @@ static int reserve_sba_gart = 1;
static SBA_INLINE void sba_mark_invalid(struct ioc *, dma_addr_t, size_t);
static SBA_INLINE void sba_free_range(struct ioc *, dma_addr_t, size_t);
-#define sba_sg_address(sg) sg_virt((sg))
-
#ifdef FULL_VALID_PDIR
static u64 prefetch_spill_page;
#endif
@@ -397,7 +395,7 @@ sba_dump_sg( struct ioc *ioc, struct scatterlist *startsg, int nents)
while (nents-- > 0) {
printk(KERN_DEBUG " %d : DMA %08lx/%05x CPU %p\n", nents,
startsg->dma_address, startsg->dma_length,
- sba_sg_address(startsg));
+ sg_virt(startsg));
startsg = sg_next(startsg);
}
}
@@ -409,7 +407,7 @@ sba_check_sg( struct ioc *ioc, struct scatterlist *startsg, int nents)
int the_nents = nents;
while (the_nents-- > 0) {
- if (sba_sg_address(the_sg) == 0x0UL)
+ if (sg_virt(the_sg) == 0x0UL)
sba_dump_sg(NULL, startsg, nents);
the_sg = sg_next(the_sg);
}
@@ -1243,11 +1241,11 @@ sba_fill_pdir(
if (dump_run_sg)
printk(" %2d : %08lx/%05x %p\n",
nents, startsg->dma_address, cnt,
- sba_sg_address(startsg));
+ sg_virt(startsg));
#else
DBG_RUN_SG(" %d : %08lx/%05x %p\n",
nents, startsg->dma_address, cnt,
- sba_sg_address(startsg));
+ sg_virt(startsg));
#endif
/*
** Look for the start of a new DMA stream
@@ -1267,7 +1265,7 @@ sba_fill_pdir(
** Look for a VCONTIG chunk
*/
if (cnt) {
- unsigned long vaddr = (unsigned long) sba_sg_address(startsg);
+ unsigned long vaddr = (unsigned long) sg_virt(startsg);
ASSERT(pdirp);
/* Since multiple Vcontig blocks could make up
@@ -1335,7 +1333,7 @@ sba_coalesce_chunks(struct ioc *ioc, struct device *dev,
int idx;
while (nents > 0) {
- unsigned long vaddr = (unsigned long) sba_sg_address(startsg);
+ unsigned long vaddr = (unsigned long) sg_virt(startsg);
/*
** Prepare for first/next DMA stream
@@ -1380,7 +1378,7 @@ sba_coalesce_chunks(struct ioc *ioc, struct device *dev,
**
** append the next transaction?
*/
- vaddr = (unsigned long) sba_sg_address(startsg);
+ vaddr = (unsigned long) sg_virt(startsg);
if (vcontig_end == vaddr)
{
vcontig_len += startsg->length;
@@ -1479,7 +1477,7 @@ static int sba_map_sg_attrs(struct device *dev, struct scatterlist *sglist,
if (likely((ioc->dma_mask & ~to_pci_dev(dev)->dma_mask) == 0)) {
for_each_sg(sglist, sg, nents, filled) {
sg->dma_length = sg->length;
- sg->dma_address = virt_to_phys(sba_sg_address(sg));
+ sg->dma_address = virt_to_phys(sg_virt(sg));
}
return filled;
}
@@ -1487,7 +1485,7 @@ static int sba_map_sg_attrs(struct device *dev, struct scatterlist *sglist,
/* Fast path single entry scatterlists. */
if (nents == 1) {
sglist->dma_length = sglist->length;
- sglist->dma_address = sba_map_single_attrs(dev, sba_sg_address(sglist), sglist->length, dir, attrs);
+ sglist->dma_address = sba_map_single_attrs(dev, sg_virt(sglist), sglist->length, dir, attrs);
return 1;
}
@@ -1563,7 +1561,7 @@ static void sba_unmap_sg_attrs(struct device *dev, struct scatterlist *sglist,
#endif
DBG_RUN_SG("%s() START %d entries, %p,%x\n",
- __func__, nents, sba_sg_address(sglist), sglist->length);
+ __func__, nents, sg_virt(sglist), sglist->length);
#ifdef ASSERT_PDIR_SANITY
ioc = GET_IOC(dev);
--
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 ` [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 ` Christoph Hellwig [this message]
2015-08-12 7:05 ` [PATCH 18/31] nios2: " 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-18-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).