drop queue-4.19/tee-add-tee_shm_alloc_kernel_buf.patch

diff --git a/queue-4.19/series b/queue-4.19/series
index 4813d18bc374bdb264f6a61b1e04eea766085ec1..cdaed57054fb18c3108f160ac2b69649e7986159 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -33,7 +33,6 @@ scripts-tracing-fix-the-bug-that-can-t-parse-raw_trace_func.patch
 tracing-histogram-give-calculation-hist_fields-a-size.patch
 tracing-histogram-rename-cpu-to-common_cpu.patch
 optee-clear-stale-cache-entries-during-initialization.patch
-tee-add-tee_shm_alloc_kernel_buf.patch
 staging-rtl8723bs-fix-a-resource-leak-in-sd_int_dpc.patch
 media-rtl28xxu-fix-zero-length-control-request.patch
 pipe-increase-minimum-default-pipe-size-to-2-pages.patch

diff --git a/queue-4.19/tee-add-tee_shm_alloc_kernel_buf.patch b/queue-4.19/tee-add-tee_shm_alloc_kernel_buf.patch
deleted file mode 100644 (file)
index b92c4bb..0000000
--- a/queue-4.19/tee-add-tee_shm_alloc_kernel_buf.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From dc7019b7d0e188d4093b34bd0747ed0d668c63bf Mon Sep 17 00:00:00 2001
-From: Jens Wiklander <jens.wiklander@linaro.org>
-Date: Mon, 14 Jun 2021 17:33:14 -0500
-Subject: tee: add tee_shm_alloc_kernel_buf()
-
-From: Jens Wiklander <jens.wiklander@linaro.org>
-
-commit dc7019b7d0e188d4093b34bd0747ed0d668c63bf upstream.
-
-Adds a new function tee_shm_alloc_kernel_buf() to allocate shared memory
-from a kernel driver. This function can later be made more lightweight
-by unnecessary dma-buf export.
-
-Cc: stable@vger.kernel.org
-Reviewed-by: Tyler Hicks <tyhicks@linux.microsoft.com>
-Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
-Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/tee/tee_shm.c   |   18 ++++++++++++++++++
- include/linux/tee_drv.h |    1 +
- 2 files changed, 19 insertions(+)
-
---- a/drivers/tee/tee_shm.c
-+++ b/drivers/tee/tee_shm.c
-@@ -228,6 +228,24 @@ struct tee_shm *tee_shm_priv_alloc(struc
- }
- EXPORT_SYMBOL_GPL(tee_shm_priv_alloc);
- 
-+/**
-+ * tee_shm_alloc_kernel_buf() - Allocate shared memory for kernel buffer
-+ * @ctx:      Context that allocates the shared memory
-+ * @size:     Requested size of shared memory
-+ *
-+ * The returned memory registered in secure world and is suitable to be
-+ * passed as a memory buffer in parameter argument to
-+ * tee_client_invoke_func(). The memory allocated is later freed with a
-+ * call to tee_shm_free().
-+ *
-+ * @returns a pointer to 'struct tee_shm'
-+ */
-+struct tee_shm *tee_shm_alloc_kernel_buf(struct tee_context *ctx, size_t size)
-+{
-+      return tee_shm_alloc(ctx, size, TEE_SHM_MAPPED | TEE_SHM_DMA_BUF);
-+}
-+EXPORT_SYMBOL_GPL(tee_shm_alloc_kernel_buf);
-+
- struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr,
-                                size_t length, u32 flags)
- {
---- a/include/linux/tee_drv.h
-+++ b/include/linux/tee_drv.h
-@@ -317,6 +317,7 @@ void *tee_get_drvdata(struct tee_device
-  * @returns a pointer to 'struct tee_shm'
-  */
- struct tee_shm *tee_shm_alloc(struct tee_context *ctx, size_t size, u32 flags);
-+struct tee_shm *tee_shm_alloc_kernel_buf(struct tee_context *ctx, size_t size);
- 
- /**
-  * tee_shm_priv_alloc() - Allocate shared memory privately