Commit 924e3226 authored by Jens Wiklander's avatar Jens Wiklander
Browse files

optee: add optee_pool_op_free_helper() 



Adds a common helper function to free a tee_shm allocated using the
helper function optee_pool_op_alloc_helper().

Reviewed-by: default avatarSumit Garg <sumit.garg@linaro.org>
Signed-off-by: default avatarJens Wiklander <jens.wiklander@linaro.org>
parent 5d41f1b3

drivers/tee/optee/core.c

+10 −0
Original line number Diff line number Diff line
@@ -69,6 +69,16 @@ int optee_pool_op_alloc_helper(struct tee_shm_pool *pool, struct tee_shm *shm, 
	return rc;

}



void optee_pool_op_free_helper(struct tee_shm_pool *pool, struct tee_shm *shm,

			       int (*shm_unregister)(struct tee_context *ctx,

						     struct tee_shm *shm))

{

	if (shm_unregister)

		shm_unregister(shm->ctx, shm);

	free_pages((unsigned long)shm->kaddr, get_order(shm->size));

	shm->kaddr = NULL;

}



static void optee_bus_scan(struct work_struct *work)

{

	WARN_ON(optee_enumerate_devices(PTA_CMD_GET_DEVICES_SUPP));

drivers/tee/optee/ffa_abi.c

+1 −3
Original line number Diff line number Diff line
@@ -379,9 +379,7 @@ static int pool_ffa_op_alloc(struct tee_shm_pool *pool, 
static void pool_ffa_op_free(struct tee_shm_pool *pool,

			     struct tee_shm *shm)

{

	optee_ffa_shm_unregister(shm->ctx, shm);

	free_pages((unsigned long)shm->kaddr, get_order(shm->size));

	shm->kaddr = NULL;

	optee_pool_op_free_helper(pool, shm, optee_ffa_shm_unregister);

}



static void pool_ffa_op_destroy_pool(struct tee_shm_pool *pool)

drivers/tee/optee/optee_private.h

+3 −0
Original line number Diff line number Diff line
@@ -236,6 +236,9 @@ int optee_pool_op_alloc_helper(struct tee_shm_pool *pool, struct tee_shm *shm, 
						   struct page **pages,

						   size_t num_pages,

						   unsigned long start));

void optee_pool_op_free_helper(struct tee_shm_pool *pool, struct tee_shm *shm,

			       int (*shm_unregister)(struct tee_context *ctx,

						     struct tee_shm *shm));





void optee_remove_common(struct optee *optee);

drivers/tee/optee/smc_abi.c

+3 −4
Original line number Diff line number Diff line
@@ -558,10 +558,9 @@ static void pool_op_free(struct tee_shm_pool *pool, 
			 struct tee_shm *shm)

{

	if (!(shm->flags & TEE_SHM_PRIV))

		optee_shm_unregister(shm->ctx, shm);



	free_pages((unsigned long)shm->kaddr, get_order(shm->size));

	shm->kaddr = NULL;

		optee_pool_op_free_helper(pool, shm, optee_shm_unregister);

	else

		optee_pool_op_free_helper(pool, shm, NULL);

}



static void pool_op_destroy_pool(struct tee_shm_pool *pool)