On Wed, Aug 25, 2021 at 05:11:00PM +0530, Sumit Garg wrote:

On Thu, 19 Aug 2021 at 16:37, Jens Wiklander [off-list ref] wrote:

quoted

Isolate the ABI based on raw SMCs. Code specific to the raw SMC ABI is
moved into smc_abi.c. This makes room for other ABIs with a clear
separation.

The driver changes to use module_init()/module_exit() instead of
module_platform_driver(). The platform_driver_register() and
platform_driver_unregister() functions called directly to keep the same
behavior. This is needed because module_platform_driver() is based on
module_driver() which can only be used once in a module.

A function optee_rpc_cmd() is factored out from the function
handle_rpc_func_cmd() to handle the ABI independent part of RPC
processing.

This patch is not supposed to change the driver behavior, it's only a
matter of reorganizing the code.

Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
---
 drivers/tee/optee/Makefile        |    6 +-
 drivers/tee/optee/call.c          |  339 +-------
 drivers/tee/optee/core.c          |  688 +--------------
 drivers/tee/optee/optee_private.h |  103 ++-
 drivers/tee/optee/rpc.c           |  217 +----
 drivers/tee/optee/shm_pool.c      |   89 --
 drivers/tee/optee/shm_pool.h      |   14 -
 drivers/tee/optee/smc_abi.c       | 1299 +++++++++++++++++++++++++++++
 8 files changed, 1439 insertions(+), 1316 deletions(-)
 delete mode 100644 drivers/tee/optee/shm_pool.c
 delete mode 100644 drivers/tee/optee/shm_pool.h
 create mode 100644 drivers/tee/optee/smc_abi.c

Apart from minor comments below including one related to rebase, this
looks good to me. So feel free to add:

Reviewed-by: Sumit Garg <redacted>

quoted

diff --git a/drivers/tee/optee/Makefile b/drivers/tee/optee/Makefile
index 3aa33ea9e6a6..e92f77462f40 100644
--- a/drivers/tee/optee/Makefile
+++ b/drivers/tee/optee/Makefile

@@ -4,8 +4,10 @@ optee-objs += core.o
 optee-objs += call.o
 optee-objs += rpc.o
 optee-objs += supp.o
-optee-objs += shm_pool.o
 optee-objs += device.o

+optee-smc-abi-y = smc_abi.o
+optee-objs += $(optee-ffa-abi-y)

Did you mean optee-smc-abi-y here?

Yes, I'll fix, thanks.

[snip]

quoted

index d767eebf30bd..000000000000

--- a/drivers/tee/optee/shm_pool.c
+++ /dev/null

@@ -1,89 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright (c) 2015, Linaro Limited
- * Copyright (c) 2017, EPAM Systems
- */
-#include <linux/device.h>
-#include <linux/dma-buf.h>
-#include <linux/genalloc.h>
-#include <linux/slab.h>
-#include <linux/tee_drv.h>
-#include "optee_private.h"
-#include "optee_smc.h"
-#include "shm_pool.h"
-
-static int pool_op_alloc(struct tee_shm_pool_mgr *poolm,
-                        struct tee_shm *shm, size_t size)
-{
-       unsigned int order = get_order(size);
-       struct page *page;
-       int rc = 0;
-
-       page = alloc_pages(GFP_KERNEL | __GFP_ZERO, order);
-       if (!page)
-               return -ENOMEM;
-
-       shm->kaddr = page_address(page);
-       shm->paddr = page_to_phys(page);
-       shm->size = PAGE_SIZE << order;
-
-       if (shm->flags & TEE_SHM_DMA_BUF) {

I guess this series needs to be rebased on top of mainline, since now
we have TEE_SHM_PRIV flag here [1]?

[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/tee/optee/shm_pool.c

Right, I'll take care of that in the next patchset.

[snip]

quoted

--- /dev/null
+++ b/drivers/tee/optee/smc_abi.c

@@ -0,0 +1,1299 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2015-2021, Linaro Limited
+ * Copyright (c) 2016, EPAM Systems
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/arm-smccc.h>
+#include <linux/errno.h>
+#include <linux/io.h>
+#include <linux/sched.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_platform.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/tee_drv.h>
+#include <linux/types.h>
+#include <linux/workqueue.h>
+#include "optee_private.h"
+#include "optee_smc.h"
+#include "optee_rpc_cmd.h"
+#define CREATE_TRACE_POINTS
+#include "optee_trace.h"
+
+/*
+ * This file implement the SMC ABI used when communicating with secure world
+ * OP-TEE OS via raw SMCs.
+ * This file is divided into the follow sections:

s/follow/following/

I'll fix.

Thanks,
Jens

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel