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

Commit e7c4819c authored by Sumit Garg's avatar Sumit Garg Committed by Greg Kroah-Hartman
Browse files

tee: optee: Fix missing devices unregister during optee_remove 



commit 7f565d0ead264329749c0da488de9c8dfa2f18ce upstream.

When OP-TEE driver is built as a module, OP-TEE client devices
registered on TEE bus during probe should be unregistered during
optee_remove. So implement optee_unregister_devices() accordingly.

Fixes: c3fa24af ("tee: optee: add TEE bus device enumeration support")
Reported-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Signed-off-by: default avatarSumit Garg <sumit.garg@linaro.org>
Signed-off-by: default avatarJens Wiklander <jens.wiklander@linaro.org>
[SG: backport to 5.4, dev name s/optee-ta/optee-clnt/]
Signed-off-by: default avatarSumit Garg <sumit.garg@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b1e9b4e0

drivers/tee/optee/core.c

+3 −0
Original line number Diff line number Diff line
@@ -582,6 +582,9 @@ static struct optee *optee_probe(struct device_node *np) 
	if (sec_caps & OPTEE_SMC_SEC_CAP_DYNAMIC_SHM)

		pool = optee_config_dyn_shm();



	/* Unregister OP-TEE specific client devices on TEE bus */

	optee_unregister_devices();



	/*

	 * If dynamic shared memory is not available or failed - try static one

	 */

drivers/tee/optee/device.c

+22 −0
Original line number Diff line number Diff line
@@ -65,6 +65,13 @@ static int get_devices(struct tee_context *ctx, u32 session, 
	return 0;

}



static void optee_release_device(struct device *dev)

{

	struct tee_client_device *optee_device = to_tee_client_device(dev);



	kfree(optee_device);

}



static int optee_register_device(const uuid_t *device_uuid, u32 device_id)

{

	struct tee_client_device *optee_device = NULL;
@@ -75,6 +82,7 @@ static int optee_register_device(const uuid_t *device_uuid, u32 device_id) 
		return -ENOMEM;



	optee_device->dev.bus = &tee_bus_type;

	optee_device->dev.release = optee_release_device;

	dev_set_name(&optee_device->dev, "optee-clnt%u", device_id);

	uuid_copy(&optee_device->id.uuid, device_uuid);
@@ -158,3 +166,17 @@ int optee_enumerate_devices(void) 


	return rc;

}



static int __optee_unregister_device(struct device *dev, void *data)

{

	if (!strncmp(dev_name(dev), "optee-clnt", strlen("optee-clnt")))

		device_unregister(dev);



	return 0;

}



void optee_unregister_devices(void)

{

	bus_for_each_dev(&tee_bus_type, NULL, NULL,

			 __optee_unregister_device);

}

drivers/tee/optee/optee_private.h

+1 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ void optee_fill_pages_list(u64 *dst, struct page **pages, int num_pages, 
			   size_t page_offset);



int optee_enumerate_devices(void);

void optee_unregister_devices(void);



/*

 * Small helpers