From: Yong Wu <yong.wu@mediatek.com>
To: Rob Herring <robh+dt@kernel.org>,
Sumit Semwal <sumit.semwal@linaro.org>,
<christian.koenig@amd.com>,
Matthias Brugger <matthias.bgg@gmail.com>
Cc: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Conor Dooley <conor+dt@kernel.org>,
Benjamin Gaignard <benjamin.gaignard@collabora.com>,
Brian Starkey <Brian.Starkey@arm.com>,
John Stultz <jstultz@google.com>, <tjmercier@google.com>,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com>,
Yong Wu <yong.wu@mediatek.com>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <linux-media@vger.kernel.org>,
<dri-devel@lists.freedesktop.org>,
<linaro-mm-sig@lists.linaro.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-mediatek@lists.infradead.org>,
<jianjiao.zeng@mediatek.com>, <kuohong.wang@mediatek.com>
Subject: [PATCH 4/9] dma-buf: heaps: Initialise MediaTek secure heap
Date: Mon, 11 Sep 2023 10:30:33 +0800 [thread overview]
Message-ID: <20230911023038.30649-5-yong.wu@mediatek.com> (raw)
In-Reply-To: <20230911023038.30649-1-yong.wu@mediatek.com>
Initialise a mtk_svp heap. Currently just add a null heap, Prepare for
the later patches.
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
---
drivers/dma-buf/heaps/Kconfig | 8 ++
drivers/dma-buf/heaps/Makefile | 1 +
drivers/dma-buf/heaps/mtk_secure_heap.c | 99 +++++++++++++++++++++++++
3 files changed, 108 insertions(+)
create mode 100644 drivers/dma-buf/heaps/mtk_secure_heap.c
diff --git a/drivers/dma-buf/heaps/Kconfig b/drivers/dma-buf/heaps/Kconfig
index a5eef06c4226..729c0cf3eb7c 100644
--- a/drivers/dma-buf/heaps/Kconfig
+++ b/drivers/dma-buf/heaps/Kconfig
@@ -12,3 +12,11 @@ config DMABUF_HEAPS_CMA
Choose this option to enable dma-buf CMA heap. This heap is backed
by the Contiguous Memory Allocator (CMA). If your system has these
regions, you should say Y here.
+
+config DMABUF_HEAPS_MTK_SECURE
+ bool "DMA-BUF MediaTek Secure Heap"
+ depends on DMABUF_HEAPS && TEE
+ help
+ Choose this option to enable dma-buf MediaTek secure heap for Secure
+ Video Path. This heap is backed by TEE client interfaces. If in
+ doubt, say N.
diff --git a/drivers/dma-buf/heaps/Makefile b/drivers/dma-buf/heaps/Makefile
index 974467791032..df559dbe33fe 100644
--- a/drivers/dma-buf/heaps/Makefile
+++ b/drivers/dma-buf/heaps/Makefile
@@ -1,3 +1,4 @@
# SPDX-License-Identifier: GPL-2.0
obj-$(CONFIG_DMABUF_HEAPS_SYSTEM) += system_heap.o
obj-$(CONFIG_DMABUF_HEAPS_CMA) += cma_heap.o
+obj-$(CONFIG_DMABUF_HEAPS_MTK_SECURE) += mtk_secure_heap.o
diff --git a/drivers/dma-buf/heaps/mtk_secure_heap.c b/drivers/dma-buf/heaps/mtk_secure_heap.c
new file mode 100644
index 000000000000..bbf1c8dce23e
--- /dev/null
+++ b/drivers/dma-buf/heaps/mtk_secure_heap.c
@@ -0,0 +1,99 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * DMABUF mtk_secure_heap exporter
+ *
+ * Copyright (C) 2023 MediaTek Inc.
+ */
+
+#include <linux/dma-buf.h>
+#include <linux/dma-heap.h>
+#include <linux/err.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+
+/*
+ * MediaTek secure (chunk) memory type
+ *
+ * @KREE_MEM_SEC_CM_TZ: static chunk memory carved out for trustzone.
+ */
+enum kree_mem_type {
+ KREE_MEM_SEC_CM_TZ = 1,
+};
+
+struct mtk_secure_heap_buffer {
+ struct dma_heap *heap;
+ size_t size;
+};
+
+struct mtk_secure_heap {
+ const char *name;
+ const enum kree_mem_type mem_type;
+};
+
+static struct dma_buf *
+mtk_sec_heap_allocate(struct dma_heap *heap, size_t size,
+ unsigned long fd_flags, unsigned long heap_flags)
+{
+ struct mtk_secure_heap_buffer *sec_buf;
+ DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
+ struct dma_buf *dmabuf;
+ int ret;
+
+ sec_buf = kzalloc(sizeof(*sec_buf), GFP_KERNEL);
+ if (!sec_buf)
+ return ERR_PTR(-ENOMEM);
+
+ sec_buf->size = size;
+ sec_buf->heap = heap;
+
+ exp_info.exp_name = dma_heap_get_name(heap);
+ exp_info.size = sec_buf->size;
+ exp_info.flags = fd_flags;
+ exp_info.priv = sec_buf;
+
+ dmabuf = dma_buf_export(&exp_info);
+ if (IS_ERR(dmabuf)) {
+ ret = PTR_ERR(dmabuf);
+ goto err_free_buf;
+ }
+
+ return dmabuf;
+
+err_free_buf:
+ kfree(sec_buf);
+ return ERR_PTR(ret);
+}
+
+static const struct dma_heap_ops mtk_sec_heap_ops = {
+ .allocate = mtk_sec_heap_allocate,
+};
+
+static struct mtk_secure_heap mtk_sec_heap[] = {
+ {
+ .name = "mtk_svp",
+ .mem_type = KREE_MEM_SEC_CM_TZ,
+ },
+};
+
+static int mtk_sec_heap_init(void)
+{
+ struct mtk_secure_heap *sec_heap = mtk_sec_heap;
+ struct dma_heap_export_info exp_info;
+ struct dma_heap *heap;
+ unsigned int i;
+
+ for (i = 0; i < ARRAY_SIZE(mtk_sec_heap); i++, sec_heap++) {
+ exp_info.name = sec_heap->name;
+ exp_info.ops = &mtk_sec_heap_ops;
+ exp_info.priv = (void *)sec_heap;
+
+ heap = dma_heap_add(&exp_info);
+ if (IS_ERR(heap))
+ return PTR_ERR(heap);
+ }
+ return 0;
+}
+
+module_init(mtk_sec_heap_init);
+MODULE_DESCRIPTION("MediaTek Secure Heap Driver");
+MODULE_LICENSE("GPL");
--
2.25.1
next prev parent reply other threads:[~2023-09-11 2:31 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-11 2:30 [PATCH 0/9] dma-buf: heaps: Add MediaTek secure heap Yong Wu
2023-09-11 2:30 ` [PATCH 1/9] dma-buf: heaps: Deduplicate docs and adopt common format Yong Wu
2023-09-11 9:36 ` Christian König
2023-09-11 23:51 ` T.J. Mercier
2023-09-11 2:30 ` [PATCH 2/9] dma-heap: Add proper kref handling on dma-buf heaps Yong Wu
2023-09-11 9:48 ` Christian König
2023-09-22 18:19 ` T.J. Mercier
2023-09-11 2:30 ` [PATCH 3/9] dma-heap: Provide accessors so that in-kernel drivers can allocate dmabufs from specific heaps Yong Wu
2023-09-11 10:13 ` Christian König
2023-09-11 18:29 ` John Stultz
2023-09-12 7:06 ` Christian König
2023-09-12 8:52 ` Yong Wu (吴勇)
2023-09-12 14:46 ` Christian König
2023-09-12 14:58 ` Nicolas Dufresne
2023-09-13 8:30 ` Christian König
2023-09-12 14:50 ` Nicolas Dufresne
2023-09-11 16:12 ` Nicolas Dufresne
2023-09-12 8:47 ` Yong Wu (吴勇)
2023-09-12 15:05 ` Nicolas Dufresne
2023-09-18 10:46 ` Yong Wu (吴勇)
2023-09-11 2:30 ` Yong Wu [this message]
2023-09-11 8:05 ` [PATCH 4/9] dma-buf: heaps: Initialise MediaTek secure heap kernel test robot
2023-09-27 14:42 ` Joakim Bech
2023-10-19 4:45 ` Vijayanand Jitta
2023-10-20 9:59 ` Yong Wu (吴勇)
2023-10-26 4:48 ` Vijayanand Jitta
2023-10-27 7:47 ` Yong Wu (吴勇)
2023-10-30 8:06 ` Vijayanand Jitta
2023-09-11 2:30 ` [PATCH 5/9] dma-buf: heaps: mtk_sec_heap: Initialise tee session Yong Wu
2023-09-11 9:29 ` AngeloGioacchino Del Regno
2023-09-11 10:15 ` Christian König
2023-09-12 6:17 ` Yong Wu (吴勇)
2023-09-12 9:32 ` AngeloGioacchino Del Regno
2023-09-25 12:49 ` Yong Wu (吴勇)
2023-09-27 13:46 ` Joakim Bech
2023-09-27 15:17 ` Benjamin Gaignard
2023-09-27 18:56 ` Jeffrey Kardatzke
2023-09-28 8:30 ` Benjamin Gaignard
2023-09-28 17:48 ` Jeffrey Kardatzke
2023-09-29 6:54 ` Benjamin Gaignard
2023-10-13 19:10 ` Jeffrey Kardatzke
2023-09-27 18:54 ` Jeffrey Kardatzke
2023-09-13 13:35 ` kernel test robot
2023-09-11 2:30 ` [PATCH 6/9] dma-buf: heaps: mtk_sec_heap: Add tee service call for buffer allocating/freeing Yong Wu
2023-09-14 10:18 ` kernel test robot
2023-09-27 14:37 ` Joakim Bech
2023-09-28 5:24 ` Yong Wu (吴勇)
2023-10-19 4:45 ` Vijayanand Jitta
2023-10-20 10:01 ` Yong Wu (吴勇)
2023-09-11 2:30 ` [PATCH 7/9] dma-buf: heaps: mtk_sec_heap: Add dma_ops Yong Wu
2023-09-11 2:30 ` [PATCH 8/9] dt-bindings: reserved-memory: MediaTek: Add reserved memory for SVP Yong Wu
2023-09-11 15:44 ` Rob Herring
2023-09-12 6:16 ` Yong Wu (吴勇)
2023-09-12 8:28 ` Krzysztof Kozlowski
2023-09-12 10:13 ` Robin Murphy
[not found] ` <20230912155338.GA842444-robh@kernel.org>
2023-09-12 16:05 ` Robin Murphy
2023-09-18 10:47 ` Yong Wu (吴勇)
2023-09-19 22:15 ` Jeffrey Kardatzke
2023-10-12 6:54 ` Yong Wu (吴勇)
2023-10-12 7:07 ` Krzysztof Kozlowski
2023-10-12 11:15 ` Yong Wu (吴勇)
2023-10-19 4:46 ` Vijayanand Jitta
2023-10-20 9:50 ` Yong Wu (吴勇)
2023-11-01 5:50 ` Jaskaran Singh
2023-11-06 5:56 ` Yong Wu (吴勇)
2023-11-20 8:20 ` Jaskaran Singh
2023-09-11 2:30 ` [PATCH 9/9] dma_buf: heaps: mtk_sec_heap: Add a new CMA heap Yong Wu
2023-09-11 9:33 ` AngeloGioacchino Del Regno
2023-10-19 4:44 ` [PATCH 0/9] dma-buf: heaps: Add MediaTek secure heap Vijayanand Jitta
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=20230911023038.30649-5-yong.wu@mediatek.com \
--to=yong.wu@mediatek.com \
--cc=Brian.Starkey@arm.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=benjamin.gaignard@collabora.com \
--cc=christian.koenig@amd.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=jianjiao.zeng@mediatek.com \
--cc=jstultz@google.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=kuohong.wang@mediatek.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=matthias.bgg@gmail.com \
--cc=robh+dt@kernel.org \
--cc=sumit.semwal@linaro.org \
--cc=tjmercier@google.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).