From: Daniel Vetter <daniel@ffwll.ch>
To: guangming.cao@mediatek.com
Cc: "Sumit Semwal" <sumit.semwal@linaro.org>,
"Benjamin Gaignard" <benjamin.gaignard@linaro.org>,
"Liam Mark" <lmark@codeaurora.org>,
"Laura Abbott" <labbott@redhat.com>,
"Brian Starkey" <Brian.Starkey@arm.com>,
"John Stultz" <john.stultz@linaro.org>,
"Christian König" <christian.koenig@amd.com>,
"Matthias Brugger" <matthias.bgg@gmail.com>,
"open list:DMA-BUF HEAPS FRAMEWORK" <linux-media@vger.kernel.org>,
"open list:DMA-BUF HEAPS FRAMEWORK"
<dri-devel@lists.freedesktop.org>,
"moderated list:DMA-BUF HEAPS FRAMEWORK"
<linaro-mm-sig@lists.linaro.org>,
"open list" <linux-kernel@vger.kernel.org>,
"moderated list:ARM/Mediatek SoC support"
<linux-arm-kernel@lists.infradead.org>,
"moderated list:ARM/Mediatek SoC support"
<linux-mediatek@lists.infradead.org>,
wsd_upstream@mediatek.com, isaacm@codeaurora.org,
sspatil@google.com, hridya@google.com
Subject: Re: [PATCH] dma-buf: Add support for mapping buffers with DMA attributes
Date: Tue, 31 Aug 2021 14:47:03 +0200 [thread overview]
Message-ID: <YS4kx3thdJOu3uHX@phenom.ffwll.local> (raw)
In-Reply-To: <20210830023911.4410-1-guangming.cao@mediatek.com>
On Mon, Aug 30, 2021 at 10:39:11AM +0800, guangming.cao@mediatek.com wrote:
> From: Guangming Cao <Guangming.Cao@mediatek.com>
>
> When mapping the memory represented by a dma-buf into a device's
> address space, it might be desireable to map the memory with
> certain DMA attributes. Thus, introduce the dma_mapping_attrs
> field in the dma_buf_attachment structure so that when
> the memory is mapped with dma_buf_map_attachment, it is mapped
> with the desired DMA attributes.
>
> Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
> Signed-off-by: Sandeep Patil <sspatil@google.com>
> Signed-off-by: Guangming Cao <Guangming.Cao@mediatek.com>
Can you pls include the code that's going to use this here too?
At a glance all the attributes you might want to set are supposed to be
under the control of the exporter, not the importer.
-Daniel
> ---
> drivers/dma-buf/heaps/cma_heap.c | 6 ++++--
> drivers/dma-buf/heaps/system_heap.c | 6 ++++--
> include/linux/dma-buf.h | 3 +++
> 3 files changed, 11 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/dma-buf/heaps/cma_heap.c b/drivers/dma-buf/heaps/cma_heap.c
> index 0c05b79870f9..2c9feb3bfc3e 100644
> --- a/drivers/dma-buf/heaps/cma_heap.c
> +++ b/drivers/dma-buf/heaps/cma_heap.c
> @@ -99,9 +99,10 @@ static struct sg_table *cma_heap_map_dma_buf(struct dma_buf_attachment *attachme
> {
> struct dma_heap_attachment *a = attachment->priv;
> struct sg_table *table = &a->table;
> + int attrs = attachment->dma_map_attrs;
> int ret;
>
> - ret = dma_map_sgtable(attachment->dev, table, direction, 0);
> + ret = dma_map_sgtable(attachment->dev, table, direction, attrs);
> if (ret)
> return ERR_PTR(-ENOMEM);
> a->mapped = true;
> @@ -113,9 +114,10 @@ static void cma_heap_unmap_dma_buf(struct dma_buf_attachment *attachment,
> enum dma_data_direction direction)
> {
> struct dma_heap_attachment *a = attachment->priv;
> + int attrs = attachment->dma_map_attrs;
>
> a->mapped = false;
> - dma_unmap_sgtable(attachment->dev, table, direction, 0);
> + dma_unmap_sgtable(attachment->dev, table, direction, attrs);
> }
>
> static int cma_heap_dma_buf_begin_cpu_access(struct dma_buf *dmabuf,
> diff --git a/drivers/dma-buf/heaps/system_heap.c b/drivers/dma-buf/heaps/system_heap.c
> index 23a7e74ef966..fc7b1e02988e 100644
> --- a/drivers/dma-buf/heaps/system_heap.c
> +++ b/drivers/dma-buf/heaps/system_heap.c
> @@ -130,9 +130,10 @@ static struct sg_table *system_heap_map_dma_buf(struct dma_buf_attachment *attac
> {
> struct dma_heap_attachment *a = attachment->priv;
> struct sg_table *table = a->table;
> + int attrs = attachment->dma_map_attrs;
> int ret;
>
> - ret = dma_map_sgtable(attachment->dev, table, direction, 0);
> + ret = dma_map_sgtable(attachment->dev, table, direction, attrs);
> if (ret)
> return ERR_PTR(ret);
>
> @@ -145,9 +146,10 @@ static void system_heap_unmap_dma_buf(struct dma_buf_attachment *attachment,
> enum dma_data_direction direction)
> {
> struct dma_heap_attachment *a = attachment->priv;
> + int attrs = attachment->dma_map_attrs;
>
> a->mapped = false;
> - dma_unmap_sgtable(attachment->dev, table, direction, 0);
> + dma_unmap_sgtable(attachment->dev, table, direction, attrs);
> }
>
> static int system_heap_dma_buf_begin_cpu_access(struct dma_buf *dmabuf,
> diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
> index efdc56b9d95f..4d650731766e 100644
> --- a/include/linux/dma-buf.h
> +++ b/include/linux/dma-buf.h
> @@ -379,6 +379,8 @@ struct dma_buf_attach_ops {
> * @importer_ops: importer operations for this attachment, if provided
> * dma_buf_map/unmap_attachment() must be called with the dma_resv lock held.
> * @importer_priv: importer specific attachment data.
> + * @dma_map_attrs: DMA attributes to be used when the exporter maps the buffer
> + * through dma_buf_map_attachment.
> *
> * This structure holds the attachment information between the dma_buf buffer
> * and its user device(s). The list contains one attachment struct per device
> @@ -399,6 +401,7 @@ struct dma_buf_attachment {
> const struct dma_buf_attach_ops *importer_ops;
> void *importer_priv;
> void *priv;
> + unsigned long dma_map_attrs;
> };
>
> /**
> --
> 2.17.1
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
next prev parent reply other threads:[~2021-08-31 12:47 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-30 2:39 [PATCH] dma-buf: Add support for mapping buffers with DMA attributes guangming.cao
2021-08-31 12:47 ` Daniel Vetter [this message]
2021-10-18 6:25 ` guangming.cao
-- strict thread matches above, loose matches on Subject: below --
2021-08-10 2:02 [PATCH] dma_heap: enable map_attrs when (un)map_attachment guangming.cao
2021-08-26 6:42 ` [PATCH] dma-buf: Add support for mapping buffers with DMA attributes guangming.cao
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=YS4kx3thdJOu3uHX@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=Brian.Starkey@arm.com \
--cc=benjamin.gaignard@linaro.org \
--cc=christian.koenig@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=guangming.cao@mediatek.com \
--cc=hridya@google.com \
--cc=isaacm@codeaurora.org \
--cc=john.stultz@linaro.org \
--cc=labbott@redhat.com \
--cc=linaro-mm-sig@lists.linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=lmark@codeaurora.org \
--cc=matthias.bgg@gmail.com \
--cc=sspatil@google.com \
--cc=sumit.semwal@linaro.org \
--cc=wsd_upstream@mediatek.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).