From: John Stultz <john.stultz@linaro.org>
To: lkml <linux-kernel@vger.kernel.org>
Cc: John Stultz <john.stultz@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
Sumit Semwal <sumit.semwal@linaro.org>,
"Andrew F. Davis" <afd@ti.com>,
Benjamin Gaignard <benjamin.gaignard@linaro.org>,
Liam Mark <lmark@codeaurora.org>,
Pratik Patel <pratikp@codeaurora.org>,
Laura Abbott <labbott@redhat.com>,
Brian Starkey <Brian.Starkey@arm.com>,
Chenbo Feng <fengc@google.com>,
Alistair Strachan <astrachan@google.com>,
Sandeep Patil <sspatil@google.com>,
Hridya Valsaraju <hridya@google.com>,
Christoph Hellwig <hch@lst.de>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Robin Murphy <robin.murphy@arm.com>,
Andrew Morton <akpm@linux-foundation.org>,
devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org,
linux-mm@kvack.org
Subject: [RFC][PATCH 2/4] mm: cma: Add dma_heap flag to cma structure
Date: Fri, 1 May 2020 07:39:47 +0000 [thread overview]
Message-ID: <20200501073949.120396-3-john.stultz@linaro.org> (raw)
In-Reply-To: <20200501073949.120396-1-john.stultz@linaro.org>
This patch adds a dma_heap flag on the cma structure,
along with accessors to set and read the flag.
This is then used to process and store the "linux,cma-heap"
property documented in the previous patch.
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: "Andrew F. Davis" <afd@ti.com>
Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Cc: Liam Mark <lmark@codeaurora.org>
Cc: Pratik Patel <pratikp@codeaurora.org>
Cc: Laura Abbott <labbott@redhat.com>
Cc: Brian Starkey <Brian.Starkey@arm.com>
Cc: Chenbo Feng <fengc@google.com>
Cc: Alistair Strachan <astrachan@google.com>
Cc: Sandeep Patil <sspatil@google.com>
Cc: Hridya Valsaraju <hridya@google.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Robin Murphy <robin.murphy@arm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: devicetree@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Cc: linux-mm@kvack.org
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
include/linux/cma.h | 3 +++
kernel/dma/contiguous.c | 3 +++
mm/cma.c | 11 +++++++++++
mm/cma.h | 1 +
4 files changed, 18 insertions(+)
diff --git a/include/linux/cma.h b/include/linux/cma.h
index 6ff79fefd01f..d8b8e6ce221c 100644
--- a/include/linux/cma.h
+++ b/include/linux/cma.h
@@ -25,6 +25,9 @@ extern phys_addr_t cma_get_base(const struct cma *cma);
extern unsigned long cma_get_size(const struct cma *cma);
extern const char *cma_get_name(const struct cma *cma);
+extern void __init cma_enable_dma_heap(struct cma *cma, bool enabled);
+extern bool cma_dma_heap_enabled(struct cma *cma);
+
extern int __init cma_declare_contiguous_nid(phys_addr_t base,
phys_addr_t size, phys_addr_t limit,
phys_addr_t alignment, unsigned int order_per_bit,
diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c
index 8bc6f2d670f9..f667fd51daa2 100644
--- a/kernel/dma/contiguous.c
+++ b/kernel/dma/contiguous.c
@@ -303,6 +303,7 @@ static int __init rmem_cma_setup(struct reserved_mem *rmem)
phys_addr_t mask = align - 1;
unsigned long node = rmem->fdt_node;
bool default_cma = of_get_flat_dt_prop(node, "linux,cma-default", NULL);
+ bool heap_exported = of_get_flat_dt_prop(node, "linux,cma-heap", NULL);
struct cma *cma;
int err;
@@ -332,6 +333,8 @@ static int __init rmem_cma_setup(struct reserved_mem *rmem)
if (default_cma)
dma_contiguous_set_default(cma);
+ cma_enable_dma_heap(cma, heap_exported);
+
rmem->ops = &rmem_cma_ops;
rmem->priv = cma;
diff --git a/mm/cma.c b/mm/cma.c
index 0463ad2ce06b..ec671bd8f66e 100644
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -55,6 +55,16 @@ const char *cma_get_name(const struct cma *cma)
return cma->name ? cma->name : "(undefined)";
}
+void __init cma_enable_dma_heap(struct cma *cma, bool enabled)
+{
+ cma->dma_heap = enabled;
+}
+
+bool cma_dma_heap_enabled(struct cma *cma)
+{
+ return !!cma->dma_heap;
+}
+
static unsigned long cma_bitmap_aligned_mask(const struct cma *cma,
unsigned int align_order)
{
@@ -157,6 +167,7 @@ static int __init cma_init_reserved_areas(void)
}
core_initcall(cma_init_reserved_areas);
+
/**
* cma_init_reserved_mem() - create custom contiguous area from reserved memory
* @base: Base address of the reserved area
diff --git a/mm/cma.h b/mm/cma.h
index 33c0b517733c..6fe2242c724f 100644
--- a/mm/cma.h
+++ b/mm/cma.h
@@ -13,6 +13,7 @@ struct cma {
spinlock_t mem_head_lock;
#endif
const char *name;
+ bool dma_heap;
};
extern struct cma cma_areas[MAX_CMA_AREAS];
--
2.17.1
next prev parent reply other threads:[~2020-05-01 7:40 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-01 7:39 [RFC][PATCH 0/4] Support non-default CMA regions to the dmabuf heaps interface John Stultz
2020-05-01 7:39 ` [RFC][PATCH 1/4] devicetree: bindings: Add linux,cma-heap tag for reserved memory John Stultz
2020-05-01 10:42 ` Brian Starkey
2020-05-01 18:40 ` John Stultz
2020-05-04 8:50 ` Brian Starkey
2020-05-06 16:04 ` Andrew F. Davis
2020-05-06 16:30 ` John Stultz
2020-05-06 17:35 ` Andrew F. Davis
2020-05-06 18:34 ` John Stultz
2020-05-01 7:39 ` John Stultz [this message]
2020-05-01 10:48 ` [RFC][PATCH 2/4] mm: cma: Add dma_heap flag to cma structure Brian Starkey
2020-05-01 18:42 ` John Stultz
2020-05-01 7:39 ` [RFC][PATCH 3/4] dma-buf: cma_heap: Extend logic to export CMA regions tagged with "linux,cma-heap" John Stultz
2020-05-01 10:21 ` Brian Starkey
2020-05-01 11:08 ` Robin Murphy
2020-05-01 19:01 ` John Stultz
2020-05-04 9:06 ` Brian Starkey
2020-05-12 16:37 ` Rob Herring
2020-05-13 10:44 ` Brian Starkey
2020-05-14 14:52 ` Rob Herring
2020-05-15 9:32 ` Brian Starkey
2020-05-01 7:39 ` [RFC][PATCH 4/4] example: dts: hi3660-hikey960: Add dts entries to test cma heap binding John Stultz
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=20200501073949.120396-3-john.stultz@linaro.org \
--to=john.stultz@linaro.org \
--cc=Brian.Starkey@arm.com \
--cc=afd@ti.com \
--cc=akpm@linux-foundation.org \
--cc=astrachan@google.com \
--cc=benjamin.gaignard@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=fengc@google.com \
--cc=hch@lst.de \
--cc=hridya@google.com \
--cc=labbott@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=lmark@codeaurora.org \
--cc=m.szyprowski@samsung.com \
--cc=pratikp@codeaurora.org \
--cc=robh+dt@kernel.org \
--cc=robin.murphy@arm.com \
--cc=sspatil@google.com \
--cc=sumit.semwal@linaro.org \
/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).