Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce42b240 authored by Jens Wiklander's avatar Jens Wiklander Committed by Victor Chong
Browse files

BACKPORT: tee: add start argument to shm_register callback 



Adds a start argument to the shm_register callback to allow the callback
to check memory type of the passed pages.

Change-Id: Ic6062db0cfc7485adae4df949e87577f9d13e4d5
Signed-off-by: default avatarJens Wiklander <jens.wiklander@linaro.org>
(cherry picked from commit 95ffe4ca43877eea176d7e95aa0d38bbdc3d2903)
Signed-off-by: default avatarVictor Chong <victor.chong@linaro.org>
parent 451b1b75

drivers/tee/optee/call.c

+4 −2
Original line number Diff line number Diff line
@@ -536,7 +536,8 @@ void optee_free_pages_list(void *list, size_t num_entries) 
}



int optee_shm_register(struct tee_context *ctx, struct tee_shm *shm,

		       struct page **pages, size_t num_pages)

		       struct page **pages, size_t num_pages,

		       unsigned long start)

{

	struct tee_shm *shm_arg = NULL;

	struct optee_msg_arg *msg_arg;
@@ -606,7 +607,8 @@ int optee_shm_unregister(struct tee_context *ctx, struct tee_shm *shm) 
}



int optee_shm_register_supp(struct tee_context *ctx, struct tee_shm *shm,

			    struct page **pages, size_t num_pages)

			    struct page **pages, size_t num_pages,

			    unsigned long start)

{

	/*

	 * We don't want to register supplicant memory in OP-TEE.

drivers/tee/optee/optee_private.h

+4 −2
Original line number Diff line number Diff line
@@ -162,11 +162,13 @@ void optee_enable_shm_cache(struct optee *optee); 
void optee_disable_shm_cache(struct optee *optee);



int optee_shm_register(struct tee_context *ctx, struct tee_shm *shm,

		       struct page **pages, size_t num_pages);

		       struct page **pages, size_t num_pages,

		       unsigned long start);

int optee_shm_unregister(struct tee_context *ctx, struct tee_shm *shm);



int optee_shm_register_supp(struct tee_context *ctx, struct tee_shm *shm,

			    struct page **pages, size_t num_pages);

			    struct page **pages, size_t num_pages,

			    unsigned long start);

int optee_shm_unregister_supp(struct tee_context *ctx, struct tee_shm *shm);



int optee_from_msg_param(struct tee_param *params, size_t num_params,

drivers/tee/tee_shm.c

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, 
	}



	rc = teedev->desc->ops->shm_register(ctx, shm, shm->pages,

					     shm->num_pages);

					     shm->num_pages, start);

	if (rc) {

		ret = ERR_PTR(rc);

		goto err;

include/linux/tee_drv.h

+2 −1
Original line number Diff line number Diff line
@@ -108,7 +108,8 @@ struct tee_driver_ops { 
	int (*supp_send)(struct tee_context *ctx, u32 ret, u32 num_params,

			 struct tee_param *param);

	int (*shm_register)(struct tee_context *ctx, struct tee_shm *shm,

			    struct page **pages, size_t num_pages);

			    struct page **pages, size_t num_pages,

			    unsigned long start);

	int (*shm_unregister)(struct tee_context *ctx, struct tee_shm *shm);

};