From: Krzysztof Kozlowski <k.kozlowski@samsung.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, hch@infradead.org,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
Bart Van Assche <bart.vanassche@sandisk.com>,
Doug Ledford <dledford@redhat.com>,
Sean Hefty <sean.hefty@intel.com>,
Hal Rosenstock <hal.rosenstock@gmail.com>,
linux-rdma@vger.kernel.org
Subject: Re: [PATCH v6.1] infiniband: dma-mapping: Use unsigned long for dma_attrs
Date: Wed, 13 Jul 2016 13:17:54 +0200 [thread overview]
Message-ID: <57862362.4050608@samsung.com> (raw)
In-Reply-To: <1468408466-7369-1-git-send-email-k.kozlowski@samsung.com>
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 <k.kozlowski@samsung.com>
>
> ---
>
> 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 <linux/sched.h>
> #include <linux/export.h>
> #include <linux/hugetlb.h>
> -#include <linux/dma-attrs.h>
> #include <linux/slab.h>
> #include <rdma/ib_umem_odp.h>
>
> @@ -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
next prev parent reply other threads:[~2016-07-13 11:18 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 ` [PATCH v6 28/46] ia64: " Krzysztof Kozlowski
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 [this message]
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=57862362.4050608@samsung.com \
--to=k.kozlowski@samsung.com \
--cc=akpm@linux-foundation.org \
--cc=b.zolnierkie@samsung.com \
--cc=bart.vanassche@sandisk.com \
--cc=dledford@redhat.com \
--cc=hal.rosenstock@gmail.com \
--cc=hch@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=sean.hefty@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).