From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751909AbcGML4i (ORCPT ); Wed, 13 Jul 2016 07:56:38 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:33856 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750883AbcGML4g (ORCPT ); Wed, 13 Jul 2016 07:56:36 -0400 X-AuditID: cbfec7f4-f796c6d000001486-7f-57862c6bea76 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.2] infiniband: dma-mapping: Use unsigned long for dma_attrs Date: Wed, 13 Jul 2016 13:56:02 +0200 Message-id: <1468410962-13820-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+NgFtrILMWRmVeSWpSXmKPExsVy+t/xy7rZOm3hBts+6VrMWb+GzWLjjPWs Fgd/tjFavDz/gdVi4+aJjBanJyxisnj9wtDi8q45bBbPDvWyWDSv38DiwOWxc9Zddo/NK7Q8 Fu95yeRxYsZvFo/3+66yefRtWcXoMW3NeSaPz5vkAjiiuGxSUnMyy1KL9O0SuDLedi9jKlgq U/H6y2uWBsYNYl2MnBwSAiYSR2/+ZoewxSQu3FvP1sXIxSEksJRR4vSNKawQTiOTxP2jG1lA qtgEjCU2L1/CBmKLCOhKrHq+ixmkiFngHpPE3B/XwUYJC/hJfDrSyAhiswioSmw48gjM5hVw l3i1fCkbxDo5iZPHJrOC2JwCHhI3Lp4BWyAEVNPydjbzBEbeBYwMqxhFU0uTC4qT0nMN9YoT c4tL89L1kvNzNzFCAvLLDsbFx6wOMQpwMCrx8DKKtIYLsSaWFVfmHmKU4GBWEuFl124LF+JN SaysSi3Kjy8qzUktPsQozcGiJM47d9f7ECGB9MSS1OzU1ILUIpgsEwenVANjqa9yuvgDAzVp Iwcevee3HGMEZMLceaSESk6sfy3pXO23u0v1fVp996lvD5aozVnlaFzq6vr8k+TEEznLvi14 sejlxUMnkj8tsWzykDBXL3rtM9Fne9Hr04XVpesvdR7jyV+txPXW+03ENr6gwzdXLOkM07e8 UD5lQ8ldaVHBrh+7s/dfer5ZiaU4I9FQi7moOBEA5J0rbkQCAAA= 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 Cc: Bart Van Assche --- This is an update only to this patch from the set. Changes since v6.1: 1. Rename attrs->dma_attrs everywhere. 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 | 17 +++++++++-------- 2 files changed, 12 insertions(+), 12 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..94a0bc5b5bdd 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -2910,19 +2910,19 @@ 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 dma_attrs) { return dma_map_single_attrs(dev->dma_device, cpu_addr, size, - direction, attrs); + direction, dma_attrs); } 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 dma_attrs) { return dma_unmap_single_attrs(dev->dma_device, addr, size, - direction, attrs); + direction, dma_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