Merge tag 'pinctrl-v5.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[linux-2.6-microblaze.git] / include / linux / tee_drv.h

diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h
index 3ebfea0..a1f0346 100644 (file)
--- a/include/linux/tee_drv.h
+++ b/include/linux/tee_drv.h
@@ -197,7 +197,11 @@ int tee_session_calc_client_uuid(uuid_t *uuid, u32 connection_method,
  * @num_pages: number of locked pages
  * @dmabuf:    dmabuf used to for exporting to user space
  * @flags:     defined by TEE_SHM_* in tee_drv.h
- * @id:                unique id of a shared memory object on this device
+ * @id:                unique id of a shared memory object on this device, shared
+ *             with user space
+ * @sec_world_id:
+ *             secure world assigned id of this shared memory object, not
+ *             used by all drivers
  *
  * This pool is only supposed to be accessed directly from the TEE
  * subsystem and from drivers that implements their own shm pool manager.
@@ -213,6 +217,7 @@ struct tee_shm {
        struct dma_buf *dmabuf;
        u32 flags;
        int id;
+       u64 sec_world_id;
 };
 
 /**