Merge branch 'for-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu

[linux.git] / drivers / tee / tee_core.c

diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c
index dd46b758852aa9ba2866348e6f973da3447b3623..7b2bb4c500580099a2f6e443da6fab9e4db7ae00 100644 (file)
--- a/drivers/tee/tee_core.c
+++ b/drivers/tee/tee_core.c
@@ -38,15 +38,13 @@ static DEFINE_SPINLOCK(driver_lock);
 static struct class *tee_class;
 static dev_t tee_devt;
 
-static int tee_open(struct inode *inode, struct file *filp)
+static struct tee_context *teedev_open(struct tee_device *teedev)
 {
        int rc;
-       struct tee_device *teedev;
        struct tee_context *ctx;
 
-       teedev = container_of(inode->i_cdev, struct tee_device, cdev);
        if (!tee_device_get(teedev))
-               return -EINVAL;
+               return ERR_PTR(-EINVAL);
 
        ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
        if (!ctx) {
@@ -57,16 +55,16 @@ static int tee_open(struct inode *inode, struct file *filp)
        kref_init(&ctx->refcount);
        ctx->teedev = teedev;
        INIT_LIST_HEAD(&ctx->list_shm);
-       filp->private_data = ctx;
        rc = teedev->desc->ops->open(ctx);
        if (rc)
                goto err;
 
-       return 0;
+       return ctx;
 err:
        kfree(ctx);
        tee_device_put(teedev);
-       return rc;
+       return ERR_PTR(rc);
+
 }
 
 void teedev_ctx_get(struct tee_context *ctx)
@@ -100,6 +98,18 @@ static void teedev_close_context(struct tee_context *ctx)
        teedev_ctx_put(ctx);
 }
 
+static int tee_open(struct inode *inode, struct file *filp)
+{
+       struct tee_context *ctx;
+
+       ctx = teedev_open(container_of(inode->i_cdev, struct tee_device, cdev));
+       if (IS_ERR(ctx))
+               return PTR_ERR(ctx);
+
+       filp->private_data = ctx;
+       return 0;
+}
+
 static int tee_release(struct inode *inode, struct file *filp)
 {
        teedev_close_context(filp->private_data);
@@ -928,6 +938,95 @@ void *tee_get_drvdata(struct tee_device *teedev)
 }
 EXPORT_SYMBOL_GPL(tee_get_drvdata);
 
+struct match_dev_data {
+       struct tee_ioctl_version_data *vers;
+       const void *data;
+       int (*match)(struct tee_ioctl_version_data *, const void *);
+};
+
+static int match_dev(struct device *dev, const void *data)
+{
+       const struct match_dev_data *match_data = data;
+       struct tee_device *teedev = container_of(dev, struct tee_device, dev);
+
+       teedev->desc->ops->get_version(teedev, match_data->vers);
+       return match_data->match(match_data->vers, match_data->data);
+}
+
+struct tee_context *
+tee_client_open_context(struct tee_context *start,
+                       int (*match)(struct tee_ioctl_version_data *,
+                                    const void *),
+                       const void *data, struct tee_ioctl_version_data *vers)
+{
+       struct device *dev = NULL;
+       struct device *put_dev = NULL;
+       struct tee_context *ctx = NULL;
+       struct tee_ioctl_version_data v;
+       struct match_dev_data match_data = { vers ? vers : &v, data, match };
+
+       if (start)
+               dev = &start->teedev->dev;
+
+       do {
+               dev = class_find_device(tee_class, dev, &match_data, match_dev);
+               if (!dev) {
+                       ctx = ERR_PTR(-ENOENT);
+                       break;
+               }
+
+               put_device(put_dev);
+               put_dev = dev;
+
+               ctx = teedev_open(container_of(dev, struct tee_device, dev));
+       } while (IS_ERR(ctx) && PTR_ERR(ctx) != -ENOMEM);
+
+       put_device(put_dev);
+       return ctx;
+}
+EXPORT_SYMBOL_GPL(tee_client_open_context);
+
+void tee_client_close_context(struct tee_context *ctx)
+{
+       teedev_close_context(ctx);
+}
+EXPORT_SYMBOL_GPL(tee_client_close_context);
+
+void tee_client_get_version(struct tee_context *ctx,
+                           struct tee_ioctl_version_data *vers)
+{
+       ctx->teedev->desc->ops->get_version(ctx->teedev, vers);
+}
+EXPORT_SYMBOL_GPL(tee_client_get_version);
+
+int tee_client_open_session(struct tee_context *ctx,
+                           struct tee_ioctl_open_session_arg *arg,
+                           struct tee_param *param)
+{
+       if (!ctx->teedev->desc->ops->open_session)
+               return -EINVAL;
+       return ctx->teedev->desc->ops->open_session(ctx, arg, param);
+}
+EXPORT_SYMBOL_GPL(tee_client_open_session);
+
+int tee_client_close_session(struct tee_context *ctx, u32 session)
+{
+       if (!ctx->teedev->desc->ops->close_session)
+               return -EINVAL;
+       return ctx->teedev->desc->ops->close_session(ctx, session);
+}
+EXPORT_SYMBOL_GPL(tee_client_close_session);
+
+int tee_client_invoke_func(struct tee_context *ctx,
+                          struct tee_ioctl_invoke_arg *arg,
+                          struct tee_param *param)
+{
+       if (!ctx->teedev->desc->ops->invoke_func)
+               return -EINVAL;
+       return ctx->teedev->desc->ops->invoke_func(ctx, arg, param);
+}
+EXPORT_SYMBOL_GPL(tee_client_invoke_func);
+
 static int __init tee_init(void)
 {
        int rc;