From: Krzysztof Kozlowski <k.kozlowski@samsung.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, hch@infradead.org,
Krzysztof Kozlowski <k.kozlowski@samsung.com>,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
Tony Luck <tony.luck@intel.com>,
Fenghua Yu <fenghua.yu@intel.com>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
linux-ia64@vger.kernel.org
Subject: [PATCH v6 28/46] ia64: dma-mapping: Use unsigned long for dma_attrs
Date: Wed, 13 Jul 2016 10:41:19 +0200 [thread overview]
Message-ID: <1468399300-5399-28-git-send-email-k.kozlowski@samsung.com> (raw)
In-Reply-To: <1468399300-5399-27-git-send-email-k.kozlowski@samsung.com>
Split out subsystem specific changes for easier reviews. This will be
squashed with main commit.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
---
arch/ia64/hp/common/sba_iommu.c | 22 +++++++++++-----------
arch/ia64/include/asm/machvec.h | 1 -
arch/ia64/kernel/pci-swiotlb.c | 4 ++--
arch/ia64/sn/pci/pci_dma.c | 12 ++++++------
4 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
index a6d6190c9d24..630ee8073899 100644
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
@@ -919,7 +919,7 @@ sba_mark_invalid(struct ioc *ioc, dma_addr_t iova, size_t byte_cnt)
static dma_addr_t sba_map_page(struct device *dev, struct page *page,
unsigned long poff, size_t size,
enum dma_data_direction dir,
- struct dma_attrs *attrs)
+ unsigned long attrs)
{
struct ioc *ioc;
void *addr = page_address(page) + poff;
@@ -1005,7 +1005,7 @@ static dma_addr_t sba_map_page(struct device *dev, struct page *page,
static dma_addr_t sba_map_single_attrs(struct device *dev, void *addr,
size_t size, enum dma_data_direction dir,
- struct dma_attrs *attrs)
+ unsigned long attrs)
{
return sba_map_page(dev, virt_to_page(addr),
(unsigned long)addr & ~PAGE_MASK, size, dir, attrs);
@@ -1046,7 +1046,7 @@ sba_mark_clean(struct ioc *ioc, dma_addr_t iova, size_t size)
* See Documentation/DMA-API-HOWTO.txt
*/
static void sba_unmap_page(struct device *dev, dma_addr_t iova, size_t size,
- enum dma_data_direction dir, struct dma_attrs *attrs)
+ enum dma_data_direction dir, unsigned long attrs)
{
struct ioc *ioc;
#if DELAYED_RESOURCE_CNT > 0
@@ -1115,7 +1115,7 @@ static void sba_unmap_page(struct device *dev, dma_addr_t iova, size_t size,
}
void sba_unmap_single_attrs(struct device *dev, dma_addr_t iova, size_t size,
- enum dma_data_direction dir, struct dma_attrs *attrs)
+ enum dma_data_direction dir, unsigned long attrs)
{
sba_unmap_page(dev, iova, size, dir, attrs);
}
@@ -1130,7 +1130,7 @@ void sba_unmap_single_attrs(struct device *dev, dma_addr_t iova, size_t size,
*/
static void *
sba_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
- gfp_t flags, struct dma_attrs *attrs)
+ gfp_t flags, unsigned long attrs)
{
struct ioc *ioc;
void *addr;
@@ -1175,7 +1175,7 @@ sba_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
* device to map single to get an iova mapping.
*/
*dma_handle = sba_map_single_attrs(&ioc->sac_only_dev->dev, addr,
- size, 0, NULL);
+ size, 0, 0);
return addr;
}
@@ -1191,9 +1191,9 @@ sba_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
* See Documentation/DMA-API-HOWTO.txt
*/
static void sba_free_coherent(struct device *dev, size_t size, void *vaddr,
- dma_addr_t dma_handle, struct dma_attrs *attrs)
+ dma_addr_t dma_handle, unsigned long attrs)
{
- sba_unmap_single_attrs(dev, dma_handle, size, 0, NULL);
+ sba_unmap_single_attrs(dev, dma_handle, size, 0, 0);
free_pages((unsigned long) vaddr, get_order(size));
}
@@ -1442,7 +1442,7 @@ sba_coalesce_chunks(struct ioc *ioc, struct device *dev,
static void sba_unmap_sg_attrs(struct device *dev, struct scatterlist *sglist,
int nents, enum dma_data_direction dir,
- struct dma_attrs *attrs);
+ unsigned long attrs);
/**
* sba_map_sg - map Scatter/Gather list
* @dev: instance of PCI owned by the driver that's asking.
@@ -1455,7 +1455,7 @@ static void sba_unmap_sg_attrs(struct device *dev, struct scatterlist *sglist,
*/
static int sba_map_sg_attrs(struct device *dev, struct scatterlist *sglist,
int nents, enum dma_data_direction dir,
- struct dma_attrs *attrs)
+ unsigned long attrs)
{
struct ioc *ioc;
int coalesced, filled = 0;
@@ -1551,7 +1551,7 @@ static int sba_map_sg_attrs(struct device *dev, struct scatterlist *sglist,
*/
static void sba_unmap_sg_attrs(struct device *dev, struct scatterlist *sglist,
int nents, enum dma_data_direction dir,
- struct dma_attrs *attrs)
+ unsigned long attrs)
{
#ifdef ASSERT_PDIR_SANITY
struct ioc *ioc;
diff --git a/arch/ia64/include/asm/machvec.h b/arch/ia64/include/asm/machvec.h
index 9c39bdfc2da8..ed7f09089f12 100644
--- a/arch/ia64/include/asm/machvec.h
+++ b/arch/ia64/include/asm/machvec.h
@@ -22,7 +22,6 @@ struct pci_bus;
struct task_struct;
struct pci_dev;
struct msi_desc;
-struct dma_attrs;
typedef void ia64_mv_setup_t (char **);
typedef void ia64_mv_cpu_init_t (void);
diff --git a/arch/ia64/kernel/pci-swiotlb.c b/arch/ia64/kernel/pci-swiotlb.c
index 939260aeac98..2933208c0285 100644
--- a/arch/ia64/kernel/pci-swiotlb.c
+++ b/arch/ia64/kernel/pci-swiotlb.c
@@ -16,7 +16,7 @@ EXPORT_SYMBOL(swiotlb);
static void *ia64_swiotlb_alloc_coherent(struct device *dev, size_t size,
dma_addr_t *dma_handle, gfp_t gfp,
- struct dma_attrs *attrs)
+ unsigned long attrs)
{
if (dev->coherent_dma_mask != DMA_BIT_MASK(64))
gfp |= GFP_DMA;
@@ -25,7 +25,7 @@ static void *ia64_swiotlb_alloc_coherent(struct device *dev, size_t size,
static void ia64_swiotlb_free_coherent(struct device *dev, size_t size,
void *vaddr, dma_addr_t dma_addr,
- struct dma_attrs *attrs)
+ unsigned long attrs)
{
swiotlb_free_coherent(dev, size, vaddr, dma_addr);
}
diff --git a/arch/ia64/sn/pci/pci_dma.c b/arch/ia64/sn/pci/pci_dma.c
index 8f59907007cb..6b78fc953c4b 100644
--- a/arch/ia64/sn/pci/pci_dma.c
+++ b/arch/ia64/sn/pci/pci_dma.c
@@ -77,7 +77,7 @@ EXPORT_SYMBOL(sn_dma_set_mask);
*/
static void *sn_dma_alloc_coherent(struct device *dev, size_t size,
dma_addr_t * dma_handle, gfp_t flags,
- struct dma_attrs *attrs)
+ unsigned long attrs)
{
void *cpuaddr;
unsigned long phys_addr;
@@ -138,7 +138,7 @@ static void *sn_dma_alloc_coherent(struct device *dev, size_t size,
* any associated IOMMU mappings.
*/
static void sn_dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,
- dma_addr_t dma_handle, struct dma_attrs *attrs)
+ dma_addr_t dma_handle, unsigned long attrs)
{
struct pci_dev *pdev = to_pci_dev(dev);
struct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev);
@@ -176,7 +176,7 @@ static void sn_dma_free_coherent(struct device *dev, size_t size, void *cpu_addr
static dma_addr_t sn_dma_map_page(struct device *dev, struct page *page,
unsigned long offset, size_t size,
enum dma_data_direction dir,
- struct dma_attrs *attrs)
+ unsigned long attrs)
{
void *cpu_addr = page_address(page) + offset;
dma_addr_t dma_addr;
@@ -218,7 +218,7 @@ static dma_addr_t sn_dma_map_page(struct device *dev, struct page *page,
*/
static void sn_dma_unmap_page(struct device *dev, dma_addr_t dma_addr,
size_t size, enum dma_data_direction dir,
- struct dma_attrs *attrs)
+ unsigned long attrs)
{
struct pci_dev *pdev = to_pci_dev(dev);
struct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev);
@@ -240,7 +240,7 @@ static void sn_dma_unmap_page(struct device *dev, dma_addr_t dma_addr,
*/
static void sn_dma_unmap_sg(struct device *dev, struct scatterlist *sgl,
int nhwentries, enum dma_data_direction dir,
- struct dma_attrs *attrs)
+ unsigned long attrs)
{
int i;
struct pci_dev *pdev = to_pci_dev(dev);
@@ -273,7 +273,7 @@ static void sn_dma_unmap_sg(struct device *dev, struct scatterlist *sgl,
*/
static int sn_dma_map_sg(struct device *dev, struct scatterlist *sgl,
int nhwentries, enum dma_data_direction dir,
- struct dma_attrs *attrs)
+ unsigned long attrs)
{
unsigned long phys_addr;
struct scatterlist *saved_sg = sgl, *sg;
--
1.9.1
next prev parent reply other threads:[~2016-07-13 8:44 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-13 8:39 [PATCH v6 00/46] dma-mapping: Use unsigned long for dma_attrs Krzysztof Kozlowski
2016-07-13 8:40 ` [PATCH v6 01/46] [media] mtk-vcodec: Remove unused dma_attrs Krzysztof Kozlowski
2016-07-13 8:40 ` [PATCH v6 02/46] dma-mapping: Use unsigned long for dma_attrs Krzysztof Kozlowski
2016-07-13 8:40 ` [PATCH v6 03/46] alpha: " Krzysztof Kozlowski
2016-07-13 8:40 ` [PATCH v6 04/46] arc: " Krzysztof Kozlowski
2016-07-13 8:40 ` [PATCH v6 05/46] ARM: " Krzysztof Kozlowski
2016-07-13 8:40 ` [PATCH v6 06/46] arm64: " Krzysztof Kozlowski
2016-07-13 8:40 ` [PATCH v6 07/46] avr32: " Krzysztof Kozlowski
2016-07-13 8:40 ` [PATCH v6 08/46] blackfin: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 09/46] c6x: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 10/46] cris: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 11/46] frv: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 12/46] drm/exynos: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 13/46] drm/mediatek: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 14/46] drm/msm: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 15/46] drm/nouveau: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 16/46] drm/rockship: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 17/46] infiniband: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 18/46] iommu: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 19/46] [media] " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 20/46] xen: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 21/46] swiotlb: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 22/46] powerpc: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 23/46] video: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 24/46] x86: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 25/46] iommu: intel: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 26/46] h8300: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 27/46] hexagon: " Krzysztof Kozlowski
2016-07-13 8:41 ` Krzysztof Kozlowski [this message]
2016-07-13 8:41 ` [PATCH v6 29/46] m68k: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 30/46] metag: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 31/46] microblaze: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 32/46] mips: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 33/46] mn10300: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 34/46] nios2: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 35/46] openrisc: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 36/46] parisc: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 37/46] misc: mic: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 38/46] s390: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 39/46] sh: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 40/46] sparc: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 41/46] tile: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 42/46] unicore32: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 43/46] xtensa: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 44/46] remoteproc: qcom: " Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 45/46] dma-mapping: Remove dma_get_attr Krzysztof Kozlowski
2016-07-13 8:41 ` [PATCH v6 46/46] dma-mapping: Document the DMA attributes next to the declaration Krzysztof Kozlowski
2016-07-13 16:51 ` [PATCH v6 44/46] remoteproc: qcom: Use unsigned long for dma_attrs Bjorn Andersson
2016-07-13 10:37 ` [PATCH v6 17/46] infiniband: dma-mapping: " Bart Van Assche
2016-07-13 10:47 ` Krzysztof Kozlowski
2016-07-13 10:56 ` Bart Van Assche
2016-07-13 11:03 ` Krzysztof Kozlowski
2016-07-13 11:14 ` [PATCH v6.1] " Krzysztof Kozlowski
2016-07-13 11:17 ` Krzysztof Kozlowski
2016-07-13 11:56 ` [PATCH v6.2] " Krzysztof Kozlowski
2016-07-13 12:29 ` Bart Van Assche
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=1468399300-5399-28-git-send-email-k.kozlowski@samsung.com \
--to=k.kozlowski@samsung.com \
--cc=akpm@linux-foundation.org \
--cc=b.zolnierkie@samsung.com \
--cc=fenghua.yu@intel.com \
--cc=hch@infradead.org \
--cc=konrad.wilk@oracle.com \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tony.luck@intel.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;
as well as URLs for NNTP newsgroup(s).