Merge tag 'v4.19-rc3' into next/drivers
authorOlof Johansson <olof@lixom.net>
Tue, 25 Sep 2018 18:30:47 +0000 (11:30 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 25 Sep 2018 18:30:47 +0000 (11:30 -0700)
Linux 4.19-rc3

Documentation/devicetree/bindings/soc/amlogic/amlogic,canvas.txt [new file with mode: 0644]
drivers/firmware/meson/meson_sm.c
drivers/soc/amlogic/Kconfig
drivers/soc/amlogic/Makefile
drivers/soc/amlogic/meson-canvas.c [new file with mode: 0644]
drivers/tee/optee/core.c
drivers/tee/tee_core.c
include/linux/firmware/meson/meson_sm.h
include/linux/soc/amlogic/meson-canvas.h [new file with mode: 0644]
include/linux/tee_drv.h

diff --git a/Documentation/devicetree/bindings/soc/amlogic/amlogic,canvas.txt b/Documentation/devicetree/bindings/soc/amlogic/amlogic,canvas.txt
new file mode 100644 (file)
index 0000000..436d210
--- /dev/null
@@ -0,0 +1,29 @@
+Amlogic Canvas
+================================
+
+A canvas is a collection of metadata that describes a pixel buffer.
+Those metadata include: width, height, phyaddr, wrapping, block mode
+and endianness.
+
+Many IPs within Amlogic SoCs rely on canvas indexes to read/write pixel data
+rather than use the phy addresses directly. For instance, this is the case for
+the video decoders and the display.
+
+Amlogic SoCs have 256 canvas.
+
+Device Tree Bindings:
+---------------------
+
+Video Lookup Table
+--------------------------
+
+Required properties:
+- compatible: "amlogic,canvas"
+- reg: Base physical address and size of the canvas registers.
+
+Example:
+
+canvas: video-lut@48 {
+       compatible = "amlogic,canvas";
+       reg = <0x0 0x48 0x0 0x14>;
+};
index 0ec2ca87318c06c73976fb368f382667a78d3df1..29fbc818a573de695b07206f912181570c39040b 100644 (file)
@@ -24,6 +24,7 @@
 #include <linux/printk.h>
 #include <linux/types.h>
 #include <linux/sizes.h>
+ #include <linux/slab.h>
 
 #include <linux/firmware/meson/meson_sm.h>
 
@@ -48,6 +49,7 @@ struct meson_sm_chip gxbb_chip = {
                CMD(SM_EFUSE_READ,      0x82000030),
                CMD(SM_EFUSE_WRITE,     0x82000031),
                CMD(SM_EFUSE_USER_MAX,  0x82000033),
+               CMD(SM_GET_CHIP_ID,     0x82000044),
                { /* sentinel */ },
        },
 };
@@ -214,6 +216,57 @@ int meson_sm_call_write(void *buffer, unsigned int size, unsigned int cmd_index,
 }
 EXPORT_SYMBOL(meson_sm_call_write);
 
+#define SM_CHIP_ID_LENGTH      119
+#define SM_CHIP_ID_OFFSET      4
+#define SM_CHIP_ID_SIZE                12
+
+static ssize_t serial_show(struct device *dev, struct device_attribute *attr,
+                        char *buf)
+{
+       uint8_t *id_buf;
+       int ret;
+
+       id_buf = kmalloc(SM_CHIP_ID_LENGTH, GFP_KERNEL);
+       if (!id_buf)
+               return -ENOMEM;
+
+       ret = meson_sm_call_read(id_buf, SM_CHIP_ID_LENGTH, SM_GET_CHIP_ID,
+                                0, 0, 0, 0, 0);
+       if (ret < 0) {
+               kfree(id_buf);
+               return ret;
+       }
+
+       ret = sprintf(buf, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n",
+                       id_buf[SM_CHIP_ID_OFFSET + 0],
+                       id_buf[SM_CHIP_ID_OFFSET + 1],
+                       id_buf[SM_CHIP_ID_OFFSET + 2],
+                       id_buf[SM_CHIP_ID_OFFSET + 3],
+                       id_buf[SM_CHIP_ID_OFFSET + 4],
+                       id_buf[SM_CHIP_ID_OFFSET + 5],
+                       id_buf[SM_CHIP_ID_OFFSET + 6],
+                       id_buf[SM_CHIP_ID_OFFSET + 7],
+                       id_buf[SM_CHIP_ID_OFFSET + 8],
+                       id_buf[SM_CHIP_ID_OFFSET + 9],
+                       id_buf[SM_CHIP_ID_OFFSET + 10],
+                       id_buf[SM_CHIP_ID_OFFSET + 11]);
+
+       kfree(id_buf);
+
+       return ret;
+}
+
+static DEVICE_ATTR_RO(serial);
+
+static struct attribute *meson_sm_sysfs_attributes[] = {
+       &dev_attr_serial.attr,
+       NULL,
+};
+
+static const struct attribute_group meson_sm_sysfs_attr_group = {
+       .attrs = meson_sm_sysfs_attributes,
+};
+
 static const struct of_device_id meson_sm_ids[] = {
        { .compatible = "amlogic,meson-gxbb-sm", .data = &gxbb_chip },
        { /* sentinel */ },
@@ -242,6 +295,9 @@ static int __init meson_sm_probe(struct platform_device *pdev)
        fw.chip = chip;
        pr_info("secure-monitor enabled\n");
 
+       if (sysfs_create_group(&pdev->dev.kobj, &meson_sm_sysfs_attr_group))
+               goto out_in_base;
+
        return 0;
 
 out_in_base:
index b04f6e4aedbc1ea32c2717af5555293e865fece6..2f282b47291205a8a4304e0e74d07feda4459c8b 100644 (file)
@@ -1,5 +1,12 @@
 menu "Amlogic SoC drivers"
 
+config MESON_CANVAS
+       tristate "Amlogic Meson Canvas driver"
+       depends on ARCH_MESON || COMPILE_TEST
+       default n
+       help
+         Say yes to support the canvas IP for Amlogic SoCs.
+
 config MESON_GX_SOCINFO
        bool "Amlogic Meson GX SoC Information driver"
        depends on ARCH_MESON || COMPILE_TEST
index 8fa321893928de7329173cd6651baac2f3f1a4da..0ab16d35ac36dfc9cd8af43c29f62cc3aceac279 100644 (file)
@@ -1,3 +1,4 @@
+obj-$(CONFIG_MESON_CANVAS) += meson-canvas.o
 obj-$(CONFIG_MESON_GX_SOCINFO) += meson-gx-socinfo.o
 obj-$(CONFIG_MESON_GX_PM_DOMAINS) += meson-gx-pwrc-vpu.o
 obj-$(CONFIG_MESON_MX_SOCINFO) += meson-mx-socinfo.o
diff --git a/drivers/soc/amlogic/meson-canvas.c b/drivers/soc/amlogic/meson-canvas.c
new file mode 100644 (file)
index 0000000..fce33ca
--- /dev/null
@@ -0,0 +1,185 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2018 BayLibre, SAS
+ * Copyright (C) 2015 Amlogic, Inc. All rights reserved.
+ * Copyright (C) 2014 Endless Mobile
+ */
+
+#include <linux/kernel.h>
+#include <linux/mfd/syscon.h>
+#include <linux/module.h>
+#include <linux/regmap.h>
+#include <linux/soc/amlogic/meson-canvas.h>
+#include <linux/of_address.h>
+#include <linux/of_platform.h>
+#include <linux/io.h>
+
+#define NUM_CANVAS 256
+
+/* DMC Registers */
+#define DMC_CAV_LUT_DATAL      0x00
+       #define CANVAS_WIDTH_LBIT       29
+       #define CANVAS_WIDTH_LWID       3
+#define DMC_CAV_LUT_DATAH      0x04
+       #define CANVAS_WIDTH_HBIT       0
+       #define CANVAS_HEIGHT_BIT       9
+       #define CANVAS_WRAP_BIT         22
+       #define CANVAS_BLKMODE_BIT      24
+       #define CANVAS_ENDIAN_BIT       26
+#define DMC_CAV_LUT_ADDR       0x08
+       #define CANVAS_LUT_WR_EN        BIT(9)
+       #define CANVAS_LUT_RD_EN        BIT(8)
+
+struct meson_canvas {
+       struct device *dev;
+       void __iomem *reg_base;
+       spinlock_t lock; /* canvas device lock */
+       u8 used[NUM_CANVAS];
+};
+
+static void canvas_write(struct meson_canvas *canvas, u32 reg, u32 val)
+{
+       writel_relaxed(val, canvas->reg_base + reg);
+}
+
+static u32 canvas_read(struct meson_canvas *canvas, u32 reg)
+{
+       return readl_relaxed(canvas->reg_base + reg);
+}
+
+struct meson_canvas *meson_canvas_get(struct device *dev)
+{
+       struct device_node *canvas_node;
+       struct platform_device *canvas_pdev;
+
+       canvas_node = of_parse_phandle(dev->of_node, "amlogic,canvas", 0);
+       if (!canvas_node)
+               return ERR_PTR(-ENODEV);
+
+       canvas_pdev = of_find_device_by_node(canvas_node);
+       if (!canvas_pdev)
+               return ERR_PTR(-EPROBE_DEFER);
+
+       return dev_get_drvdata(&canvas_pdev->dev);
+}
+EXPORT_SYMBOL_GPL(meson_canvas_get);
+
+int meson_canvas_config(struct meson_canvas *canvas, u8 canvas_index,
+                       u32 addr, u32 stride, u32 height,
+                       unsigned int wrap,
+                       unsigned int blkmode,
+                       unsigned int endian)
+{
+       unsigned long flags;
+
+       spin_lock_irqsave(&canvas->lock, flags);
+       if (!canvas->used[canvas_index]) {
+               dev_err(canvas->dev,
+                       "Trying to setup non allocated canvas %u\n",
+                       canvas_index);
+               spin_unlock_irqrestore(&canvas->lock, flags);
+               return -EINVAL;
+       }
+
+       canvas_write(canvas, DMC_CAV_LUT_DATAL,
+                    ((addr + 7) >> 3) |
+                    (((stride + 7) >> 3) << CANVAS_WIDTH_LBIT));
+
+       canvas_write(canvas, DMC_CAV_LUT_DATAH,
+                    ((((stride + 7) >> 3) >> CANVAS_WIDTH_LWID) <<
+                                               CANVAS_WIDTH_HBIT) |
+                    (height << CANVAS_HEIGHT_BIT) |
+                    (wrap << CANVAS_WRAP_BIT) |
+                    (blkmode << CANVAS_BLKMODE_BIT) |
+                    (endian << CANVAS_ENDIAN_BIT));
+
+       canvas_write(canvas, DMC_CAV_LUT_ADDR,
+                    CANVAS_LUT_WR_EN | canvas_index);
+
+       /* Force a read-back to make sure everything is flushed. */
+       canvas_read(canvas, DMC_CAV_LUT_DATAH);
+       spin_unlock_irqrestore(&canvas->lock, flags);
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(meson_canvas_config);
+
+int meson_canvas_alloc(struct meson_canvas *canvas, u8 *canvas_index)
+{
+       int i;
+       unsigned long flags;
+
+       spin_lock_irqsave(&canvas->lock, flags);
+       for (i = 0; i < NUM_CANVAS; ++i) {
+               if (!canvas->used[i]) {
+                       canvas->used[i] = 1;
+                       spin_unlock_irqrestore(&canvas->lock, flags);
+                       *canvas_index = i;
+                       return 0;
+               }
+       }
+       spin_unlock_irqrestore(&canvas->lock, flags);
+
+       dev_err(canvas->dev, "No more canvas available\n");
+       return -ENODEV;
+}
+EXPORT_SYMBOL_GPL(meson_canvas_alloc);
+
+int meson_canvas_free(struct meson_canvas *canvas, u8 canvas_index)
+{
+       unsigned long flags;
+
+       spin_lock_irqsave(&canvas->lock, flags);
+       if (!canvas->used[canvas_index]) {
+               dev_err(canvas->dev,
+                       "Trying to free unused canvas %u\n", canvas_index);
+               spin_unlock_irqrestore(&canvas->lock, flags);
+               return -EINVAL;
+       }
+       canvas->used[canvas_index] = 0;
+       spin_unlock_irqrestore(&canvas->lock, flags);
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(meson_canvas_free);
+
+static int meson_canvas_probe(struct platform_device *pdev)
+{
+       struct resource *res;
+       struct meson_canvas *canvas;
+       struct device *dev = &pdev->dev;
+
+       canvas = devm_kzalloc(dev, sizeof(*canvas), GFP_KERNEL);
+       if (!canvas)
+               return -ENOMEM;
+
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       canvas->reg_base = devm_ioremap_resource(dev, res);
+       if (IS_ERR(canvas->reg_base))
+               return PTR_ERR(canvas->reg_base);
+
+       canvas->dev = dev;
+       spin_lock_init(&canvas->lock);
+       dev_set_drvdata(dev, canvas);
+
+       return 0;
+}
+
+static const struct of_device_id canvas_dt_match[] = {
+       { .compatible = "amlogic,canvas" },
+       {}
+};
+MODULE_DEVICE_TABLE(of, canvas_dt_match);
+
+static struct platform_driver meson_canvas_driver = {
+       .probe = meson_canvas_probe,
+       .driver = {
+               .name = "amlogic-canvas",
+               .of_match_table = canvas_dt_match,
+       },
+};
+module_platform_driver(meson_canvas_driver);
+
+MODULE_DESCRIPTION("Amlogic Canvas driver");
+MODULE_AUTHOR("Maxime Jourdan <mjourdan@baylibre.com>");
+MODULE_LICENSE("GPL");
index e1aafe842d660bb11b1146133105f37bff24873e..34dce850067b9e9c379274ef8b3c91da4bb42ef0 100644 (file)
@@ -696,7 +696,7 @@ static int __init optee_driver_init(void)
                return -ENODEV;
 
        np = of_find_matching_node(fw_np, optee_match);
-       if (!np)
+       if (!np || !of_device_is_available(np))
                return -ENODEV;
 
        optee = optee_probe(np);
index dd46b758852aa9ba2866348e6f973da3447b3623..7b2bb4c500580099a2f6e443da6fab9e4db7ae00 100644 (file)
@@ -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;
index 37a5eaea69dde299a18855ffc99b1227513b25da..f98c20dd266ed4da026b598257728da3d067a2f0 100644 (file)
@@ -17,6 +17,7 @@ enum {
        SM_EFUSE_READ,
        SM_EFUSE_WRITE,
        SM_EFUSE_USER_MAX,
+       SM_GET_CHIP_ID,
 };
 
 struct meson_sm_firmware;
diff --git a/include/linux/soc/amlogic/meson-canvas.h b/include/linux/soc/amlogic/meson-canvas.h
new file mode 100644 (file)
index 0000000..b4dde2f
--- /dev/null
@@ -0,0 +1,65 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (C) 2018 BayLibre, SAS
+ */
+#ifndef __SOC_MESON_CANVAS_H
+#define __SOC_MESON_CANVAS_H
+
+#include <linux/kernel.h>
+
+#define MESON_CANVAS_WRAP_NONE 0x00
+#define MESON_CANVAS_WRAP_X    0x01
+#define MESON_CANVAS_WRAP_Y    0x02
+
+#define MESON_CANVAS_BLKMODE_LINEAR    0x00
+#define MESON_CANVAS_BLKMODE_32x32     0x01
+#define MESON_CANVAS_BLKMODE_64x64     0x02
+
+#define MESON_CANVAS_ENDIAN_SWAP16     0x1
+#define MESON_CANVAS_ENDIAN_SWAP32     0x3
+#define MESON_CANVAS_ENDIAN_SWAP64     0x7
+#define MESON_CANVAS_ENDIAN_SWAP128    0xf
+
+struct meson_canvas;
+
+/**
+ * meson_canvas_get() - get a canvas provider instance
+ *
+ * @dev: consumer device pointer
+ */
+struct meson_canvas *meson_canvas_get(struct device *dev);
+
+/**
+ * meson_canvas_alloc() - take ownership of a canvas
+ *
+ * @canvas: canvas provider instance retrieved from meson_canvas_get()
+ * @canvas_index: will be filled with the canvas ID
+ */
+int meson_canvas_alloc(struct meson_canvas *canvas, u8 *canvas_index);
+
+/**
+ * meson_canvas_free() - remove ownership from a canvas
+ *
+ * @canvas: canvas provider instance retrieved from meson_canvas_get()
+ * @canvas_index: canvas ID that was obtained via meson_canvas_alloc()
+ */
+int meson_canvas_free(struct meson_canvas *canvas, u8 canvas_index);
+
+/**
+ * meson_canvas_config() - configure a canvas
+ *
+ * @canvas: canvas provider instance retrieved from meson_canvas_get()
+ * @canvas_index: canvas ID that was obtained via meson_canvas_alloc()
+ * @addr: physical address to the pixel buffer
+ * @stride: width of the buffer
+ * @height: height of the buffer
+ * @wrap: undocumented
+ * @blkmode: block mode (linear, 32x32, 64x64)
+ * @endian: byte swapping (swap16, swap32, swap64, swap128)
+ */
+int meson_canvas_config(struct meson_canvas *canvas, u8 canvas_index,
+                       u32 addr, u32 stride, u32 height,
+                       unsigned int wrap, unsigned int blkmode,
+                       unsigned int endian);
+
+#endif
index a2b3dfcee0b55d231d457ea24baa5e2080585569..6cfe05893a76b31280face250abc23e7ec9caaa6 100644 (file)
@@ -453,6 +453,79 @@ static inline int tee_shm_get_id(struct tee_shm *shm)
  */
 struct tee_shm *tee_shm_get_from_id(struct tee_context *ctx, int id);
 
+/**
+ * tee_client_open_context() - Open a TEE context
+ * @start:     if not NULL, continue search after this context
+ * @match:     function to check TEE device
+ * @data:      data for match function
+ * @vers:      if not NULL, version data of TEE device of the context returned
+ *
+ * This function does an operation similar to open("/dev/teeX") in user space.
+ * A returned context must be released with tee_client_close_context().
+ *
+ * Returns a TEE context of the first TEE device matched by the match()
+ * callback or an ERR_PTR.
+ */
+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);
+
+/**
+ * tee_client_close_context() - Close a TEE context
+ * @ctx:       TEE context to close
+ *
+ * Note that all sessions previously opened with this context will be
+ * closed when this function is called.
+ */
+void tee_client_close_context(struct tee_context *ctx);
+
+/**
+ * tee_client_get_version() - Query version of TEE
+ * @ctx:       TEE context to TEE to query
+ * @vers:      Pointer to version data
+ */
+void tee_client_get_version(struct tee_context *ctx,
+                           struct tee_ioctl_version_data *vers);
+
+/**
+ * tee_client_open_session() - Open a session to a Trusted Application
+ * @ctx:       TEE context
+ * @arg:       Open session arguments, see description of
+ *             struct tee_ioctl_open_session_arg
+ * @param:     Parameters passed to the Trusted Application
+ *
+ * Returns < 0 on error else see @arg->ret for result. If @arg->ret
+ * is TEEC_SUCCESS the session identifier is available in @arg->session.
+ */
+int tee_client_open_session(struct tee_context *ctx,
+                           struct tee_ioctl_open_session_arg *arg,
+                           struct tee_param *param);
+
+/**
+ * tee_client_close_session() - Close a session to a Trusted Application
+ * @ctx:       TEE Context
+ * @session:   Session id
+ *
+ * Return < 0 on error else 0, regardless the session will not be
+ * valid after this function has returned.
+ */
+int tee_client_close_session(struct tee_context *ctx, u32 session);
+
+/**
+ * tee_client_invoke_func() - Invoke a function in a Trusted Application
+ * @ctx:       TEE Context
+ * @arg:       Invoke arguments, see description of
+ *             struct tee_ioctl_invoke_arg
+ * @param:     Parameters passed to the Trusted Application
+ *
+ * Returns < 0 on error else see @arg->ret for result.
+ */
+int tee_client_invoke_func(struct tee_context *ctx,
+                          struct tee_ioctl_invoke_arg *arg,
+                          struct tee_param *param);
+
 static inline bool tee_param_is_memref(struct tee_param *param)
 {
        switch (param->attr & TEE_IOCTL_PARAM_ATTR_TYPE_MASK) {