mirror of
https://github.com/torvalds/linux.git
synced 2025-04-09 14:45:27 +00:00
OP-TEE cleanup
- Remove a redundant custom workqueue in the OP-TEE driver. - Fix a missing description of an argument to optee_handle_rpc(). -----BEGIN PGP SIGNATURE----- iQJOBAABCgA4FiEEFV+gSSXZJY9ZyuB5LinzTIcAHJcFAmV6/wIaHGplbnMud2lr bGFuZGVyQGxpbmFyby5vcmcACgkQLinzTIcAHJezhg//alxgaOOJABnzWxBwEUc6 /gAEmt5qOt68JyeMN2f/I5XARlrmFM93QIOM7KLFNpQ1GoMxLm8kEgz6glUSfi1Z lncCD7F+egn3ix4bwvbhMMmhVE4doyg+aof4m5628mFTj7MIesFGjAgffhAP+Cla R5clf/JDohl5NKgISwZjKIIK+QtT61hzy8TvPtiPkrMcLB2G03yhv6X5M5Lkz73V m4JRlMbs/RBoKwlEgFJYTC4PTQboKLlUZ0gyfTHTTR5LQpq2aR4SMRLQcc/uMphn 1o4falN7zcCar0Is8AD92ja0Uy2J4HyC52u8nvkhIZVbnU9eP5P/vR053CwIfJMj WGogOdAFTbunp/fvjImuUbxfyOjHKfOoMGpzYCS3DiNusP8mmHyw+SctPGGFWkqQ Rd8qz11e/FmD1vq0e0Xm4TAXDWitbJDTCi/noN8X59ShXPIFsRBf6ooeNwbtwHgV fNiU8x5r0QjuV7iuEIVvBokMg883zb6njPEwiez5axblkYthxtXfgPi8cNtiA347 8s/NFtuxMiyK74TE+Wfkb+iURC/MpHDelTOXyYT3D9ZGIGF5x6rS6nOgs0+gEZ5J 19S6pPxvNs6UaDSlDta60qzGOB9WqULkI2QGDwqZ1M5PX49q+z/aM3m/Lim7FiUD Ee3FJpbSXyKNeKOX+per0Qg= =wAS6 -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmWFdOYACgkQYKtH/8kJ UicH7RAApoSj4P686Hbjph7hFISEkICUHjnQ+gk2piQ6PRXTsaBuleI/8qtbk1Fd Qv6viRmslinxrd/ghovamjlv10W/IdCv+gC7Pjg3IHWiIW379H0aVKAiT//vFQQX +ioMjcVdFnoKZuimsrsmWPGKEE/DMVTArIK6vFIS6JSOBnZiIEtMYEecV2As2icx JjaLEBJQjW91PCjsN07jnkvKu/JepuVM6sZBrdf99i8HTtjVK6CpsaxEEBwPPq/r TpS8MekJwvszbng0P5zXUIrqEslEXwJO4bkJSptcvPKGN+Whn559ItL9fMo0lQU0 d7FWzyxlKZUKU5MpUr3ZET4ukovLYzTdOnux/4qpB/Y7cQWusI1EkLvMmStoFJG5 SYJH4OwpKLLZ3Mgvqgy1Rmjrp5NkWpCKrLu2PMZ948ag8zc5g/KFJitLK0AyT1ut havT0GTQRyl1w/7Tw6z9aCepUU9gyWfjHxV6Ej6izK656fD6O+TLgk2y5Zsrx9RY Slu3UA8DijXRpp95JBmoxxLh0hxxt+8DryU9RRADa8v//6lkJ0Gr8QzO4SVmDNr/ fl0he2CmyOyd3QEV+AG2/eobVSr4/Ka0nZEiu++zr7uar68uQgsi3i5XwjcTR5SX 4VtdTjeL/Orhdr6aRqtTIO56kI6jaRG5YHmpq4A3xQJUqncnMO4= =Ae+Z -----END PGP SIGNATURE----- Merge tag 'optee-cleanup-for-v6.8' of https://git.linaro.org/people/jens.wiklander/linux-tee into soc/drivers OP-TEE cleanup - Remove a redundant custom workqueue in the OP-TEE driver. - Fix a missing description of an argument to optee_handle_rpc(). * tag 'optee-cleanup-for-v6.8' of https://git.linaro.org/people/jens.wiklander/linux-tee: optee: add missing description of RPC argument reference tee: optee: Remove redundant custom workqueue tee: optee: Fix supplicant based device enumeration Link: https://lore.kernel.org/r/20231214132237.GA3092763@rayden Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
commit
3408005e30
@ -6,3 +6,12 @@ Description:
|
||||
OP-TEE bus provides reference to registered drivers under this directory. The <uuid>
|
||||
matches Trusted Application (TA) driver and corresponding TA in secure OS. Drivers
|
||||
are free to create needed API under optee-ta-<uuid> directory.
|
||||
|
||||
What: /sys/bus/tee/devices/optee-ta-<uuid>/need_supplicant
|
||||
Date: November 2023
|
||||
KernelVersion: 6.7
|
||||
Contact: op-tee@lists.trustedfirmware.org
|
||||
Description:
|
||||
Allows to distinguish whether an OP-TEE based TA/device requires user-space
|
||||
tee-supplicant to function properly or not. This attribute will be present for
|
||||
devices which depend on tee-supplicant to be running.
|
||||
|
||||
@ -15,7 +15,6 @@
|
||||
#include <linux/string.h>
|
||||
#include <linux/tee_drv.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/workqueue.h>
|
||||
#include "optee_private.h"
|
||||
|
||||
int optee_pool_op_alloc_helper(struct tee_shm_pool *pool, struct tee_shm *shm,
|
||||
@ -112,12 +111,7 @@ int optee_open(struct tee_context *ctx, bool cap_memref_null)
|
||||
|
||||
if (!optee->scan_bus_done) {
|
||||
INIT_WORK(&optee->scan_bus_work, optee_bus_scan);
|
||||
optee->scan_bus_wq = create_workqueue("optee_bus_scan");
|
||||
if (!optee->scan_bus_wq) {
|
||||
kfree(ctxdata);
|
||||
return -ECHILD;
|
||||
}
|
||||
queue_work(optee->scan_bus_wq, &optee->scan_bus_work);
|
||||
schedule_work(&optee->scan_bus_work);
|
||||
optee->scan_bus_done = true;
|
||||
}
|
||||
}
|
||||
@ -161,10 +155,7 @@ void optee_release_supp(struct tee_context *ctx)
|
||||
struct optee *optee = tee_get_drvdata(ctx->teedev);
|
||||
|
||||
optee_release_helper(ctx, optee_close_session_helper);
|
||||
if (optee->scan_bus_wq) {
|
||||
destroy_workqueue(optee->scan_bus_wq);
|
||||
optee->scan_bus_wq = NULL;
|
||||
}
|
||||
|
||||
optee_supp_release(&optee->supp);
|
||||
}
|
||||
|
||||
|
||||
@ -60,7 +60,16 @@ static void optee_release_device(struct device *dev)
|
||||
kfree(optee_device);
|
||||
}
|
||||
|
||||
static int optee_register_device(const uuid_t *device_uuid)
|
||||
static ssize_t need_supplicant_show(struct device *dev,
|
||||
struct device_attribute *attr,
|
||||
char *buf)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static DEVICE_ATTR_RO(need_supplicant);
|
||||
|
||||
static int optee_register_device(const uuid_t *device_uuid, u32 func)
|
||||
{
|
||||
struct tee_client_device *optee_device = NULL;
|
||||
int rc;
|
||||
@ -83,6 +92,10 @@ static int optee_register_device(const uuid_t *device_uuid)
|
||||
put_device(&optee_device->dev);
|
||||
}
|
||||
|
||||
if (func == PTA_CMD_GET_DEVICES_SUPP)
|
||||
device_create_file(&optee_device->dev,
|
||||
&dev_attr_need_supplicant);
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
@ -142,7 +155,7 @@ static int __optee_enumerate_devices(u32 func)
|
||||
num_devices = shm_size / sizeof(uuid_t);
|
||||
|
||||
for (idx = 0; idx < num_devices; idx++) {
|
||||
rc = optee_register_device(&device_uuid[idx]);
|
||||
rc = optee_register_device(&device_uuid[idx], func);
|
||||
if (rc)
|
||||
goto out_shm;
|
||||
}
|
||||
|
||||
@ -199,7 +199,6 @@ struct optee_ops {
|
||||
* @pool: shared memory pool
|
||||
* @rpc_param_count: If > 0 number of RPC parameters to make room for
|
||||
* @scan_bus_done flag if device registation was already done.
|
||||
* @scan_bus_wq workqueue to scan optee bus and register optee drivers
|
||||
* @scan_bus_work workq to scan optee bus and register optee drivers
|
||||
*/
|
||||
struct optee {
|
||||
@ -218,7 +217,6 @@ struct optee {
|
||||
struct tee_shm_pool *pool;
|
||||
unsigned int rpc_param_count;
|
||||
bool scan_bus_done;
|
||||
struct workqueue_struct *scan_bus_wq;
|
||||
struct work_struct scan_bus_work;
|
||||
};
|
||||
|
||||
|
||||
@ -803,6 +803,7 @@ static void handle_rpc_func_cmd(struct tee_context *ctx, struct optee *optee,
|
||||
/**
|
||||
* optee_handle_rpc() - handle RPC from secure world
|
||||
* @ctx: context doing the RPC
|
||||
* @rpc_arg: pointer to RPC arguments if any, or NULL if none
|
||||
* @param: value of registers for the RPC
|
||||
* @call_ctx: call context. Preserved during one OP-TEE invocation
|
||||
*
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user