From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751246AbcGMLPD (ORCPT ); Wed, 13 Jul 2016 07:15:03 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:55453 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751114AbcGMLOx (ORCPT ); Wed, 13 Jul 2016 07:14:53 -0400 X-AuditID: cbfec7f5-f792a6d000001302-98-5786229f06c0 From: Krzysztof Kozlowski To: Andrew Morton Cc: linux-kernel@vger.kernel.org, hch@infradead.org, Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , Bart Van Assche , Doug Ledford , Sean Hefty , Hal Rosenstock , linux-rdma@vger.kernel.org Subject: [PATCH v6.1] infiniband: dma-mapping: Use unsigned long for dma_attrs Date: Wed, 13 Jul 2016 13:14:26 +0200 Message-id: <1468408466-7369-1-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1468399300-5399-17-git-send-email-k.kozlowski@samsung.com> References: <1468399300-5399-17-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrPLMWRmVeSWpSXmKPExsVy+t/xK7rzldrCDZb2a1jMWb+GzWLjjPWs Fgd/tjFavDz/gdVi4+aJjBanJyxisnj9wtDi8q45bBbPDvWyWDSv38DiwOWxc9Zddo/NK7Q8 Fu95yeRxYsZvFo/3+66yefRtWcXoMW3NeSaPz5vkAjiiuGxSUnMyy1KL9O0SuDKO3//LUjBb uuJD50rGBsYrol2MHBwSAiYSkycWdzFyApliEhfurWfrYuTiEBJYyijxdtIPRginkUli94cX LCBVbALGEpuXL2EDsUUEdCVWPd/FDFLELHCPSWLuj+vsIAlhAT+Jn1/esINsYBFQlfh1lhsk zCvgJnH020lGiG1yEiePTWYFsTkFPCRuXDwDNl9IwF2i5e1s5gmMvAsYGVYxiqaWJhcUJ6Xn GukVJ+YWl+al6yXn525ihATj1x2MS49ZHWIU4GBU4uFdIdgaLsSaWFZcmXuIUYKDWUmEd5tC W7gQb0piZVVqUX58UWlOavEhRmkOFiVx3pm73ocICaQnlqRmp6YWpBbBZJk4OKUaGCs2Wlkc vBcz2dFCXcMgclWTbrHy/KvbBCR5Ov7pMzU41vdMndf09XAvw+zaPI3qxT4TzNQb+A0/+i3u nORo0pOwVI1p0+OPJzMdXZKYrpU8nWntslered3uKZPD2I5t0IlTvcbRxLmb8bHn78Yf3jmf gnI9H5f6yD5PEJP5uKn+yfJZwk7FSizFGYmGWsxFxYkACcQ46EICAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Split out subsystem specific changes for easier reviews. This will be squashed with main commit. Signed-off-by: Krzysztof Kozlowski --- Update only to this patch from the set. Changes since v6: 1. Rename attrs->dma_attrs arguments in map/unmap functions (suggested by Bart Van Assche). --- drivers/infiniband/core/umem.c | 7 +++---- include/rdma/ib_verbs.h | 13 +++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c index fe4d2e1a8b58..c68746ce6624 100644 --- a/drivers/infiniband/core/umem.c +++ b/drivers/infiniband/core/umem.c @@ -37,7 +37,6 @@ #include #include #include -#include #include #include @@ -92,12 +91,12 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, unsigned long npages; int ret; int i; - DEFINE_DMA_ATTRS(attrs); + unsigned long dma_attrs = 0; struct scatterlist *sg, *sg_list_start; int need_release = 0; if (dmasync) - dma_set_attr(DMA_ATTR_WRITE_BARRIER, &attrs); + dma_attrs |= DMA_ATTR_WRITE_BARRIER; if (!size) return ERR_PTR(-EINVAL); @@ -215,7 +214,7 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, umem->sg_head.sgl, umem->npages, DMA_BIDIRECTIONAL, - &attrs); + dma_attrs); if (umem->nmap <= 0) { ret = -ENOMEM; diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 156673a80704..ae9cfcac20f4 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -2910,7 +2910,7 @@ static inline void ib_dma_unmap_single(struct ib_device *dev, static inline u64 ib_dma_map_single_attrs(struct ib_device *dev, void *cpu_addr, size_t size, enum dma_data_direction direction, - struct dma_attrs *attrs) + unsigned long attrs) { return dma_map_single_attrs(dev->dma_device, cpu_addr, size, direction, attrs); @@ -2919,7 +2919,7 @@ static inline u64 ib_dma_map_single_attrs(struct ib_device *dev, static inline void ib_dma_unmap_single_attrs(struct ib_device *dev, u64 addr, size_t size, enum dma_data_direction direction, - struct dma_attrs *attrs) + unsigned long attrs) { return dma_unmap_single_attrs(dev->dma_device, addr, size, direction, attrs); @@ -2997,17 +2997,18 @@ static inline void ib_dma_unmap_sg(struct ib_device *dev, static inline int ib_dma_map_sg_attrs(struct ib_device *dev, struct scatterlist *sg, int nents, enum dma_data_direction direction, - struct dma_attrs *attrs) + unsigned long dma_attrs) { - return dma_map_sg_attrs(dev->dma_device, sg, nents, direction, attrs); + return dma_map_sg_attrs(dev->dma_device, sg, nents, direction, + dma_attrs); } static inline void ib_dma_unmap_sg_attrs(struct ib_device *dev, struct scatterlist *sg, int nents, enum dma_data_direction direction, - struct dma_attrs *attrs) + unsigned long dma_attrs) { - dma_unmap_sg_attrs(dev->dma_device, sg, nents, direction, attrs); + dma_unmap_sg_attrs(dev->dma_device, sg, nents, direction, dma_attrs); } /** * ib_sg_dma_address - Return the DMA address from a scatter/gather entry -- 1.9.1