From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
To: <xen-devel@lists.xensource.com>
Cc: <konrad.wilk@oracle.com>, <Ian.Campbell@citrix.com>,
<david.vrabel@citrix.com>, <linux-kernel@vger.kernel.org>,
<Stefano.Stabellini@eu.citrix.com>,
<linux-arm-kernel@lists.infradead.org>, <catalin.marinas@arm.com>,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Subject: [PATCH v8 07/13] xen: add a dma_addr_t dev_addr argument to xen_dma_map_page
Date: Mon, 10 Nov 2014 16:13:59 +0000 [thread overview]
Message-ID: <1415636045-24669-7-git-send-email-stefano.stabellini@eu.citrix.com> (raw)
In-Reply-To: <alpine.DEB.2.02.1411101607130.22875@kaball.uk.xensource.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
CC: david.vrabel@citrix.com
CC: konrad.wilk@oracle.com
---
arch/arm/include/asm/xen/page-coherent.h | 4 ++--
arch/arm64/include/asm/xen/page-coherent.h | 4 ++--
arch/x86/include/asm/xen/page-coherent.h | 4 ++--
drivers/xen/swiotlb-xen.c | 6 ++++--
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/arch/arm/include/asm/xen/page-coherent.h b/arch/arm/include/asm/xen/page-coherent.h
index d97b0b4..25d450c 100644
--- a/arch/arm/include/asm/xen/page-coherent.h
+++ b/arch/arm/include/asm/xen/page-coherent.h
@@ -29,8 +29,8 @@ static inline void xen_free_coherent_pages(struct device *hwdev, size_t size,
}
static inline void xen_dma_map_page(struct device *hwdev, struct page *page,
- unsigned long offset, size_t size, enum dma_data_direction dir,
- struct dma_attrs *attrs)
+ dma_addr_t dev_addr, unsigned long offset, size_t size,
+ enum dma_data_direction dir, struct dma_attrs *attrs)
{
__generic_dma_ops(hwdev)->map_page(hwdev, page, offset, size, dir, attrs);
}
diff --git a/arch/arm64/include/asm/xen/page-coherent.h b/arch/arm64/include/asm/xen/page-coherent.h
index dde3fc9..d7cd4c2 100644
--- a/arch/arm64/include/asm/xen/page-coherent.h
+++ b/arch/arm64/include/asm/xen/page-coherent.h
@@ -20,8 +20,8 @@ static inline void xen_free_coherent_pages(struct device *hwdev, size_t size,
}
static inline void xen_dma_map_page(struct device *hwdev, struct page *page,
- unsigned long offset, size_t size, enum dma_data_direction dir,
- struct dma_attrs *attrs)
+ dma_addr_t dev_addr, unsigned long offset, size_t size,
+ enum dma_data_direction dir, struct dma_attrs *attrs)
{
}
diff --git a/arch/x86/include/asm/xen/page-coherent.h b/arch/x86/include/asm/xen/page-coherent.h
index 7f02fe4..acd844c 100644
--- a/arch/x86/include/asm/xen/page-coherent.h
+++ b/arch/x86/include/asm/xen/page-coherent.h
@@ -22,8 +22,8 @@ static inline void xen_free_coherent_pages(struct device *hwdev, size_t size,
}
static inline void xen_dma_map_page(struct device *hwdev, struct page *page,
- unsigned long offset, size_t size, enum dma_data_direction dir,
- struct dma_attrs *attrs) { }
+ dma_addr_t dev_addr, unsigned long offset, size_t size,
+ enum dma_data_direction dir, struct dma_attrs *attrs) { }
static inline void xen_dma_unmap_page(struct device *hwdev, dma_addr_t handle,
size_t size, enum dma_data_direction dir,
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index ebd8f21..ad2c5eb 100644
--- a/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@ -403,7 +403,7 @@ dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page,
/* we are not interested in the dma_addr returned by
* xen_dma_map_page, only in the potential cache flushes executed
* by the function. */
- xen_dma_map_page(dev, page, offset, size, dir, attrs);
+ xen_dma_map_page(dev, page, dev_addr, offset, size, dir, attrs);
return dev_addr;
}
@@ -417,7 +417,7 @@ dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page,
return DMA_ERROR_CODE;
xen_dma_map_page(dev, pfn_to_page(map >> PAGE_SHIFT),
- map & ~PAGE_MASK, size, dir, attrs);
+ dev_addr, map & ~PAGE_MASK, size, dir, attrs);
dev_addr = xen_phys_to_bus(map);
/*
@@ -574,6 +574,7 @@ xen_swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl,
return 0;
}
xen_dma_map_page(hwdev, pfn_to_page(map >> PAGE_SHIFT),
+ dev_addr,
map & ~PAGE_MASK,
sg->length,
dir,
@@ -584,6 +585,7 @@ xen_swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl,
* xen_dma_map_page, only in the potential cache flushes executed
* by the function. */
xen_dma_map_page(hwdev, pfn_to_page(paddr >> PAGE_SHIFT),
+ dev_addr,
paddr & ~PAGE_MASK,
sg->length,
dir,
--
1.7.10.4
next prev parent reply other threads:[~2014-11-10 16:16 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-10 16:12 [PATCH v8 0/13] introduce GNTTABOP_cache_flush Stefano Stabellini
2014-11-10 16:13 ` [PATCH v8 01/13] xen/arm: remove handling of XENFEAT_grant_map_identity Stefano Stabellini
2014-11-10 16:13 ` [PATCH v8 02/13] xen/arm: remove outer_*_range call Stefano Stabellini
2014-11-10 16:13 ` [PATCH v8 03/13] xen/arm: if(pfn_valid(pfn)) call native dma_ops Stefano Stabellini
2014-11-10 18:41 ` Catalin Marinas
2014-11-11 11:07 ` Stefano Stabellini
2014-11-10 16:13 ` [PATCH v8 04/13] arm64: introduce is_device_dma_coherent Stefano Stabellini
2014-11-10 18:42 ` Catalin Marinas
2014-11-11 11:14 ` Stefano Stabellini
2014-11-10 16:13 ` [PATCH v8 05/13] arm: " Stefano Stabellini
2014-11-10 16:13 ` [PATCH v8 06/13] xen/arm: use is_device_dma_coherent Stefano Stabellini
2014-11-10 16:13 ` Stefano Stabellini [this message]
2014-11-10 18:24 ` [PATCH v8 07/13] xen: add a dma_addr_t dev_addr argument to xen_dma_map_page Catalin Marinas
2014-11-10 16:14 ` [PATCH v8 08/13] xen/arm: use hypercall to flush caches in map_page Stefano Stabellini
2014-11-10 18:27 ` Catalin Marinas
2014-11-10 16:14 ` [PATCH v8 09/13] xen/arm/arm64: merge xen/mm32.c into xen/mm.c Stefano Stabellini
2014-11-10 18:32 ` Catalin Marinas
2014-11-10 16:14 ` [PATCH v8 10/13] xen/arm/arm64: introduce xen_arch_need_swiotlb Stefano Stabellini
2014-11-10 18:34 ` Catalin Marinas
2014-11-11 11:52 ` Stefano Stabellini
2014-11-10 16:14 ` [PATCH v8 11/13] xen/arm: introduce GNTTABOP_cache_flush Stefano Stabellini
2014-11-10 16:14 ` [PATCH v8 12/13] swiotlb-xen: pass dev_addr to xen_dma_unmap_page and xen_dma_sync_single_for_cpu Stefano Stabellini
2014-11-10 16:14 ` [PATCH v8 13/13] swiotlb-xen: remove BUG_ON in xen_bus_to_phys Stefano Stabellini
2014-11-10 18:44 ` [PATCH v8 0/13] introduce GNTTABOP_cache_flush Catalin Marinas
2014-11-11 11:16 ` Stefano Stabellini
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=1415636045-24669-7-git-send-email-stefano.stabellini@eu.citrix.com \
--to=stefano.stabellini@eu.citrix.com \
--cc=Ian.Campbell@citrix.com \
--cc=catalin.marinas@arm.com \
--cc=david.vrabel@citrix.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=xen-devel@lists.xensource.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
all inboxes | Powered by JetHome®