Skip to content

Commit 08b67ff

Browse files
committed
Merge tag 'optee-update-for-6.20' of git://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee into soc/drivers
OP-TEE update for 6.20 - A micro optimization by making a local array static const - Update OP-TEE mailing list as moderated - Update an outdated comment for cmd_alloc_suppl() * tag 'optee-update-for-6.20' of git://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee: optee: make read-only array attr static const MAINTAINERS: Mark the OP-TEE mailing list moderated optee: update outdated comment Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 06e981a + 94ea706 commit 08b67ff

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

MAINTAINERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19510,14 +19510,14 @@ F: drivers/net/phy/ncn*
1951019510

1951119511
OP-TEE DRIVER
1951219512
M: Jens Wiklander <jens.wiklander@linaro.org>
19513-
L: op-tee@lists.trustedfirmware.org
19513+
L: op-tee@lists.trustedfirmware.org (moderated for non-subscribers)
1951419514
S: Maintained
1951519515
F: Documentation/ABI/testing/sysfs-bus-optee-devices
1951619516
F: drivers/tee/optee/
1951719517

1951819518
OP-TEE RANDOM NUMBER GENERATOR (RNG) DRIVER
1951919519
M: Sumit Garg <sumit.garg@kernel.org>
19520-
L: op-tee@lists.trustedfirmware.org
19520+
L: op-tee@lists.trustedfirmware.org (moderated for non-subscribers)
1952119521
S: Maintained
1952219522
F: drivers/char/hw_random/optee-rng.c
1952319523

@@ -25616,7 +25616,7 @@ F: include/media/i2c/tw9910.h
2561625616
TEE SUBSYSTEM
2561725617
M: Jens Wiklander <jens.wiklander@linaro.org>
2561825618
R: Sumit Garg <sumit.garg@kernel.org>
25619-
L: op-tee@lists.trustedfirmware.org
25619+
L: op-tee@lists.trustedfirmware.org (moderated for non-subscribers)
2562025620
S: Maintained
2562125621
F: Documentation/ABI/testing/sysfs-class-tee
2562225622
F: Documentation/driver-api/tee.rst

drivers/tee/optee/rpc.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ static void handle_rpc_func_cmd_i2c_transfer(struct tee_context *ctx,
4343
struct i2c_msg msg = { };
4444
size_t i;
4545
int ret = -EOPNOTSUPP;
46-
u8 attr[] = {
46+
static const u8 attr[] = {
4747
TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INPUT,
4848
TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INPUT,
4949
TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INOUT,
@@ -247,8 +247,8 @@ void optee_rpc_cmd_free_suppl(struct tee_context *ctx, struct tee_shm *shm)
247247
param.u.value.c = 0;
248248

249249
/*
250-
* Match the tee_shm_get_from_id() in cmd_alloc_suppl() as secure
251-
* world has released its reference.
250+
* Match the tee_shm_get_from_id() in optee_rpc_cmd_alloc_suppl()
251+
* as secure world has released its reference.
252252
*
253253
* It's better to do this before sending the request to supplicant
254254
* as we'd like to let the process doing the initial allocation to

0 commit comments

Comments
 (0)