From: Christoph Hellwig <hch@lst.de>
To: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Robin Murphy <robin.murphy@arm.com>,
linux-ia64@vger.kernel.org, iommu@lists.linux-foundation.org,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 4/5] dma-direct: use dma_direct_map_page to implement dma_direct_map_sg
Date: Tue, 4 Dec 2018 08:16:44 -0800 [thread overview]
Message-ID: <20181204161645.8038-5-hch@lst.de> (raw)
In-Reply-To: <20181204161645.8038-1-hch@lst.de>
No need to duplicate the mapping logic.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
kernel/dma/direct.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
index edb24f94ea1e..d45306473c90 100644
--- a/kernel/dma/direct.c
+++ b/kernel/dma/direct.c
@@ -217,6 +217,7 @@ static void dma_direct_sync_single_for_device(struct device *dev,
arch_sync_dma_for_device(dev, dma_to_phys(dev, addr), size, dir);
}
+#if defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE)
static void dma_direct_sync_sg_for_device(struct device *dev,
struct scatterlist *sgl, int nents, enum dma_data_direction dir)
{
@@ -229,6 +230,7 @@ static void dma_direct_sync_sg_for_device(struct device *dev,
for_each_sg(sgl, sg, nents, i)
arch_sync_dma_for_device(dev, sg_phys(sg), sg->length, dir);
}
+#endif
#if defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU) || \
defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU_ALL)
@@ -294,19 +296,13 @@ int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl, int nents,
struct scatterlist *sg;
for_each_sg(sgl, sg, nents, i) {
- BUG_ON(!sg_page(sg));
-
- sg_dma_address(sg) = phys_to_dma(dev, sg_phys(sg));
- if (unlikely(dev && !dma_capable(dev, sg_dma_address(sg),
- sg->length))) {
- report_addr(dev, sg_dma_address(sg), sg->length);
+ sg->dma_address = dma_direct_map_page(dev, sg_page(sg),
+ sg->offset, sg->length, dir, attrs);
+ if (sg->dma_address == DMA_MAPPING_ERROR)
return 0;
- }
sg_dma_len(sg) = sg->length;
}
- if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC))
- dma_direct_sync_sg_for_device(dev, sgl, nents, dir);
return nents;
}
--
2.19.1
next prev parent reply other threads:[~2018-12-04 16:17 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-04 16:16 merge swiotlb support into dma_direct_ops Christoph Hellwig
2018-12-04 16:16 ` [PATCH 1/5] swiotlb: remove SWIOTLB_MAP_ERROR Christoph Hellwig
2018-12-04 16:16 ` [PATCH 2/5] swiotlb: remove dma_mark_clean Christoph Hellwig
2018-12-04 16:16 ` [PATCH 3/5] dma-direct: improve addressability error reporting Christoph Hellwig
2018-12-04 16:16 ` Christoph Hellwig [this message]
2018-12-04 16:16 ` [PATCH 5/5] dma-direct: merge swiotlb_dma_ops into the dma_direct code 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=20181204161645.8038-5-hch@lst.de \
--to=hch@lst.de \
--cc=fenghua.yu@intel.com \
--cc=iommu@lists.linux-foundation.org \
--cc=konrad.wilk@oracle.com \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=robin.murphy@arm.com \
--cc=tony.luck@intel.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).