From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751411AbcGMLSu (ORCPT ); Wed, 13 Jul 2016 07:18:50 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:31643 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750890AbcGMLSl (ORCPT ); Wed, 13 Jul 2016 07:18:41 -0400 X-AuditID: cbfec7f4-f796c6d000001486-4d-57862364a6ac Subject: Re: [PATCH v6.1] infiniband: dma-mapping: Use unsigned long for dma_attrs To: Andrew Morton References: <1468399300-5399-17-git-send-email-k.kozlowski@samsung.com> <1468408466-7369-1-git-send-email-k.kozlowski@samsung.com> Cc: linux-kernel@vger.kernel.org, hch@infradead.org, Bartlomiej Zolnierkiewicz , Bart Van Assche , Doug Ledford , Sean Hefty , Hal Rosenstock , linux-rdma@vger.kernel.org From: Krzysztof Kozlowski Message-id: <57862362.4050608@samsung.com> Date: Wed, 13 Jul 2016 13:17:54 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.8.0 MIME-version: 1.0 In-reply-to: <1468408466-7369-1-git-send-email-k.kozlowski@samsung.com> Content-type: text/plain; charset=windows-1252 Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrOLMWRmVeSWpSXmKPExsVy+t/xq7opym3hBlOPSVrMWb+GzWLjjPWs Fgd/tjFavDz/gdVi4+aJjBanJyxisnj9wtDi8q45bBbPDvWyWDSv38DiwOWxc9Zddo/NK7Q8 Fu95yeRxYsZvFo/3+66yefRtWcXoMW3NeSaPz5vkAjiiuGxSUnMyy1KL9O0SuDImTP3OWrBA tOLw4wb2BsbrAl2MHBwSAiYS0zqsuxg5gUwxiQv31rN1MXJxCAksZZR4tWotK4TzjFHi+IJu JpAqYYEQiSs/F4HZIgK6Eque72KGKGphlJi8/jkTiMMssJZJYmfPKXaQKjYBY4nNy5ewgdi8 AloSr34sBbNZBFQlDq/4CTZJVCBCYtb2H0wQNYISPybfYwGxOQXcJS5/ecIIciqzgJ7E/Yta IGFmAXmJzWveMk9gFJiFpGMWQtUsJFULGJlXMYqmliYXFCel5xrqFSfmFpfmpesl5+duYoRE x5cdjIuPWR1iFOBgVOLhZRRpDRdiTSwrrsw9xCjBwawkwiuu1BYuxJuSWFmVWpQfX1Sak1p8 iFGag0VJnHfurvchQgLpiSWp2ampBalFMFkmDk6pBkapTacP9izbul9T4cm0eYsOvJOV+55z vz59seuWxLjP/2vuvP4lX/xAZ+ffzvUimzouz3lZpC7fd+16o/kp0cN7Hzq+7a84YuDbdMv4 lIW/d0tP8Jq/ao/erVrvwqJodbk/ftaWV6U1DqZcPX1KLNN+aidv/7LsnaZscs0xnd4OvmXL Fu112fVIiaU4I9FQi7moOBEAkeQ9sYoCAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 07/13/2016 01:14 PM, Krzysztof Kozlowski wrote: > 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) Oh crap, I didn't rename it everywhere. Let me do a respin... BR, Krzysztof