Unverified Commit 728c0d29 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tee-cleanup-for-v5.19' of... 

Merge tag 'tee-cleanup-for-v5.19' of https://git.linaro.org/people/jens.wiklander/linux-tee into arm/drivers

TEE cleanup

Removes the old and unused TEE_IOCTL_SHM_* flags
Removes unused the unused tee_shm_va2pa() and tee_shm_pa2va() functions

* tag 'tee-cleanup-for-v5.19' of https://git.linaro.org/people/jens.wiklander/linux-tee:
  tee: remove flags TEE_IOCTL_SHM_MAPPED and TEE_IOCTL_SHM_DMA_BUF
  tee: remove tee_shm_va2pa() and tee_shm_pa2va()

Link: https://lore.kernel.org/r/20220506070328.GA1344495@jade


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 7ad7ab90 d8fc1c7c

drivers/tee/tee_core.c

+0 −2
Original line number Diff line number Diff line
@@ -302,7 +302,6 @@ static int tee_ioctl_shm_alloc(struct tee_context *ctx, 
		return PTR_ERR(shm);



	data.id = shm->id;

	data.flags = shm->flags;

	data.size = shm->size;



	if (copy_to_user(udata, &data, sizeof(data)))
@@ -339,7 +338,6 @@ tee_ioctl_shm_register(struct tee_context *ctx, 
		return PTR_ERR(shm);



	data.id = shm->id;

	data.flags = shm->flags;

	data.length = shm->size;



	if (copy_to_user(udata, &data, sizeof(data)))

drivers/tee/tee_shm.c

+0 −50
Original line number Diff line number Diff line
@@ -429,56 +429,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

include/uapi/linux/tee.h

+0 −4
Original line number Diff line number Diff line
@@ -42,10 +42,6 @@ 
#define TEE_IOC_MAGIC	0xa4

#define TEE_IOC_BASE	0



/* Flags relating to shared memory */

#define TEE_IOCTL_SHM_MAPPED	0x1	/* memory mapped in normal world */

#define TEE_IOCTL_SHM_DMA_BUF	0x2	/* dma-buf handle on shared memory */



#define TEE_MAX_ARG_SIZE	1024



#define TEE_GEN_CAP_GP		(1 << 0)/* GlobalPlatform compliant TEE */