Commit 66eb6df7 authored by Andrew Davis's avatar Andrew Davis Committed by Jens Wiklander
Browse files

tee: remove tee_shm_va2pa() and tee_shm_pa2va() 



We should not need to index into SHMs based on absolute VA/PA.
These functions are not used and this kind of usage should not be
encouraged anyway. Remove these functions.

Signed-off-by: default avatarAndrew Davis <afd@ti.com>
Reviewed-by: default avatarSumit Garg <sumit.garg@linaro.org>
Signed-off-by: default avatarJens Wiklander <jens.wiklander@linaro.org>
parent 31231092

drivers/tee/tee_shm.c

+0 −50
Original line number Diff line number Diff line
@@ -414,56 +414,6 @@ void tee_shm_free(struct tee_shm *shm) 
}

EXPORT_SYMBOL_GPL(tee_shm_free);



/**

 * tee_shm_va2pa() - Get physical address of a virtual address

 * @shm:	Shared memory handle

 * @va:		Virtual address to tranlsate

 * @pa:		Returned physical address

 * @returns 0 on success and < 0 on failure

 */

int tee_shm_va2pa(struct tee_shm *shm, void *va, phys_addr_t *pa)

{

	if (!shm->kaddr)

		return -EINVAL;

	/* Check that we're in the range of the shm */

	if ((char *)va < (char *)shm->kaddr)

		return -EINVAL;

	if ((char *)va >= ((char *)shm->kaddr + shm->size))

		return -EINVAL;



	return tee_shm_get_pa(

			shm, (unsigned long)va - (unsigned long)shm->kaddr, pa);

}

EXPORT_SYMBOL_GPL(tee_shm_va2pa);



/**

 * tee_shm_pa2va() - Get virtual address of a physical address

 * @shm:	Shared memory handle

 * @pa:		Physical address to tranlsate

 * @va:		Returned virtual address

 * @returns 0 on success and < 0 on failure

 */

int tee_shm_pa2va(struct tee_shm *shm, phys_addr_t pa, void **va)

{

	if (!shm->kaddr)

		return -EINVAL;

	/* Check that we're in the range of the shm */

	if (pa < shm->paddr)

		return -EINVAL;

	if (pa >= (shm->paddr + shm->size))

		return -EINVAL;



	if (va) {

		void *v = tee_shm_get_va(shm, pa - shm->paddr);



		if (IS_ERR(v))

			return PTR_ERR(v);

		*va = v;

	}

	return 0;

}

EXPORT_SYMBOL_GPL(tee_shm_pa2va);



/**

 * tee_shm_get_va() - Get virtual address of a shared memory plus an offset

 * @shm:	Shared memory handle

include/linux/tee_drv.h

+0 −18
Original line number Diff line number Diff line
@@ -298,24 +298,6 @@ void tee_shm_free(struct tee_shm *shm); 
 */

void tee_shm_put(struct tee_shm *shm);



/**

 * tee_shm_va2pa() - Get physical address of a virtual address

 * @shm:	Shared memory handle

 * @va:		Virtual address to tranlsate

 * @pa:		Returned physical address

 * @returns 0 on success and < 0 on failure

 */

int tee_shm_va2pa(struct tee_shm *shm, void *va, phys_addr_t *pa);



/**

 * tee_shm_pa2va() - Get virtual address of a physical address

 * @shm:	Shared memory handle

 * @pa:		Physical address to tranlsate

 * @va:		Returned virtual address

 * @returns 0 on success and < 0 on failure

 */

int tee_shm_pa2va(struct tee_shm *shm, phys_addr_t pa, void **va);



/**

 * tee_shm_get_va() - Get virtual address of a shared memory plus an offset

 * @shm:	Shared memory handle